Add ioc32 compat layer for XGI DRM.

6 files changed, 159 insertions, 5 deletions

diff --git a/linux-core/Makefile.kernel b/linux-core/Makefile.kernel
index ac77941e6..b282bd052 100644
--- a/linux-core/Makefile.kernel
+++ b/linux-core/Makefile.kernel
@@ -48,6 +48,7 @@ mga-objs    += mga_ioc32.o
 r128-objs   += r128_ioc32.o
 i915-objs   += i915_ioc32.o
 nouveau-objs += nouveau_ioc32.o
+xgi-objs    += xgi_ioc32.o
 endif
 
 obj-m			+= drm.o
@@ -64,4 +65,4 @@ obj-$(CONFIG_DRM_VIA)   += via.o
 obj-$(CONFIG_DRM_MACH64)+= mach64.o
 obj-$(CONFIG_DRM_NV)    += nv.o
 obj-$(CONFIG_DRM_NOUVEAU) += nouveau.o
-obj-$(CONFIG_DRM_XGI)   += xgi.o
\ No newline at end of file
+obj-$(CONFIG_DRM_XGI)   += xgi.o
diff --git a/linux-core/xgi_drv.c b/linux-core/xgi_drv.c
index 84547f62f..bc6873a9b 100644
--- a/linux-core/xgi_drv.c
+++ b/linux-core/xgi_drv.c
@@ -48,7 +48,7 @@ static struct drm_fence_driver xgi_fence_driver = {
 	.has_irq = xgi_fence_has_irq
 };
 
-static int xgi_bootstrap(struct drm_device *, void *, struct drm_file *);
+int xgi_bootstrap(struct drm_device *, void *, struct drm_file *);
 
 static struct drm_ioctl_desc xgi_ioctls[] = {
 	DRM_IOCTL_DEF(DRM_XGI_BOOTSTRAP, xgi_bootstrap, DRM_AUTH|DRM_MASTER|DRM_ROOT_ONLY),
@@ -97,6 +97,9 @@ static struct drm_driver driver = {
 		.mmap = drm_mmap,
 		.poll = drm_poll,
 		.fasync = drm_fasync,
+#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
+		.compat_ioctl = xgi_compat_ioctl,
+#endif
 	},
 
 	.pci_driver = {
diff --git a/linux-core/xgi_drv.h b/linux-core/xgi_drv.h
index 88ade64d4..a68dc03b3 100644
--- a/linux-core/xgi_drv.h
+++ b/linux-core/xgi_drv.h
@@ -35,10 +35,10 @@
 
 #define DRIVER_NAME		"xgi"
 #define DRIVER_DESC		"XGI XP5 / XP10 / XG47"
-#define DRIVER_DATE		"20070906"
+#define DRIVER_DATE		"20070918"
 
 #define DRIVER_MAJOR		1
-#define DRIVER_MINOR		0
+#define DRIVER_MINOR		1
 #define DRIVER_PATCHLEVEL	0
 
 #include "xgi_cmdlist.h"
@@ -78,6 +78,9 @@ struct xgi_info {
 	unsigned next_sequence;
 };
 
+extern long xgi_compat_ioctl(struct file *filp, unsigned int cmd,
+	unsigned long arg);
+
 extern int xgi_fb_heap_init(struct xgi_info * info);
 
 extern int xgi_alloc(struct xgi_info * info, struct xgi_mem_alloc * alloc,
diff --git a/linux-core/xgi_fb.c b/linux-core/xgi_fb.c
index 40f39fbcb..2e2d0094b 100644
--- a/linux-core/xgi_fb.c
+++ b/linux-core/xgi_fb.c
@@ -65,6 +65,13 @@ int xgi_alloc(struct xgi_info * info, struct xgi_mem_alloc * alloc,
 		alloc->hw_addr = alloc->offset;
 		alloc->index = block->user_hash.key;
 
+		if (block->user_hash.key != (unsigned long) alloc->index) {
+			DRM_ERROR("%s truncated handle %lx for pool %d "
+				  "offset %x\n",
+				  __func__, block->user_hash.key,
+				  alloc->location, alloc->offset);
+		}
+
 		if (alloc->location == XGI_MEMLOC_NON_LOCAL) {
 			alloc->hw_addr += info->pcie.base;
 		}
diff --git a/linux-core/xgi_ioc32.c b/linux-core/xgi_ioc32.c
new file mode 100644
index 000000000..c54044fa6
--- /dev/null
+++ b/linux-core/xgi_ioc32.c
@@ -0,0 +1,140 @@
+/*
+ * (C) Copyright IBM Corporation 2007
+ * Copyright (C) Paul Mackerras 2005.
+ * All Rights Reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * on the rights to use, copy, modify, merge, publish, distribute, sub
+ * license, and/or sell copies of the Software, and to permit persons to whom
+ * the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS AND/OR THEIR SUPPLIERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *
+ * Authors:
+ *    Ian Romanick <idr@us.ibm.com>
+ */
+
+#include <linux/compat.h>
+
+#include "drmP.h"
+#include "drm.h"
+
+#include "xgi_drm.h"
+
+/* This is copied from drm_ioc32.c.
+ */
+struct drm_map32 {
+	u32 offset;		/**< Requested physical address (0 for SAREA)*/
+	u32 size;		/**< Requested physical size (bytes) */
+	enum drm_map_type type;	/**< Type of memory to map */
+	enum drm_map_flags flags;	/**< Flags */
+	u32 handle;		/**< User-space: "Handle" to pass to mmap() */
+	int mtrr;		/**< MTRR slot used */
+};
+	
+struct drm32_xgi_bootstrap {
+	struct drm_map32 gart;
+};
+
+
+extern int xgi_bootstrap(struct drm_device *, void *, struct drm_file *);
+
+static int compat_xgi_bootstrap(struct file *filp, unsigned int cmd,
+				unsigned long arg)
+{
+	struct drm32_xgi_bootstrap __user *const argp = (void __user *)arg;
+	struct drm32_xgi_bootstrap bs32;
+	struct xgi_bootstrap __user *bs;
+	int err;
+	void *handle;
+
+
+	if (copy_from_user(&bs32, argp, sizeof(bs32))) {
+		return -EFAULT;
+	}
+
+	bs = compat_alloc_user_space(sizeof(*bs));
+	if (!access_ok(VERIFY_WRITE, bs, sizeof(*bs))) {
+		return -EFAULT;
+	}
+
+	if (__put_user(bs32.gart.offset, &bs->gart.offset)
+	    || __put_user(bs32.gart.size, &bs->gart.size)
+	    || __put_user(bs32.gart.type, &bs->gart.type)
+	    || __put_user(bs32.gart.flags, &bs->gart.flags)) {
+		return -EFAULT;
+	}
+
+	err = drm_ioctl(filp->f_dentry->d_inode, filp, XGI_IOCTL_BOOTSTRAP,
+			(unsigned long)bs);
+	if (err) {
+		return err;
+	}
+
+	if (__get_user(bs32.gart.offset, &bs->gart.offset)
+	    || __get_user(bs32.gart.mtrr, &bs->gart.mtrr)
+	    || __get_user(handle, &bs->gart.handle)) {
+		return -EFAULT;
+	}
+
+	bs32.gart.handle = (unsigned long)handle;
+	if (bs32.gart.handle != (unsigned long)handle && printk_ratelimit()) {
+		printk(KERN_ERR "%s truncated handle %p for type %d "
+		       "offset %x\n",
+		       __func__, handle, bs32.gart.type, bs32.gart.offset);
+	}
+
+	if (copy_to_user(argp, &bs32, sizeof(bs32))) {
+		return -EFAULT;
+	}
+
+	return 0;
+}
+
+
+drm_ioctl_compat_t *xgi_compat_ioctls[] = {
+	[DRM_XGI_BOOTSTRAP] = compat_xgi_bootstrap,
+};
+
+/**
+ * Called whenever a 32-bit process running under a 64-bit kernel
+ * performs an ioctl on /dev/dri/card<n>.
+ *
+ * \param filp file pointer.
+ * \param cmd command.
+ * \param arg user argument.
+ * \return zero on success or negative number on failure.
+ */
+long xgi_compat_ioctl(struct file *filp, unsigned int cmd,
+		      unsigned long arg)
+{
+	const unsigned int nr = DRM_IOCTL_NR(cmd);
+	drm_ioctl_compat_t *fn = NULL;
+	int ret;
+
+	if (nr < DRM_COMMAND_BASE)
+		return drm_compat_ioctl(filp, cmd, arg);
+
+	if (nr < DRM_COMMAND_BASE + DRM_ARRAY_SIZE(xgi_compat_ioctls))
+		fn = xgi_compat_ioctls[nr - DRM_COMMAND_BASE];
+
+	lock_kernel();
+	ret = (fn != NULL)
+		? (*fn)(filp, cmd, arg)
+		: drm_ioctl(filp->f_dentry->d_inode, filp, cmd, arg);
+	unlock_kernel();
+
+	return ret;
+}
diff --git a/shared-core/xgi_drm.h b/shared-core/xgi_drm.h
index d8715df50..de0fb5326 100644
--- a/shared-core/xgi_drm.h
+++ b/shared-core/xgi_drm.h
@@ -90,7 +90,7 @@ struct xgi_mem_alloc {
 	 * 
 	 * See also DRM_XGI_FREE ioctl.
 	 */
-	unsigned long index;
+	__u32 index;
 };
 
 enum xgi_batch_type {