Greg - I don't have any experience dealing with a mixture of 32-bit user space
and a 64-bit kernel, is this the correct thing to do?
On 31/10/13 23:47, Aaron Sierra wrote:
> This patch updates the vme_master and vme_slave structures to use
> types with well defined size and to prevent the compiler from
> inserting padding (between enable and vme_addr for one).
>
> The original vme_master and vme_slave structs would be different
> sizes and have different layouts depending on whether they were built
> for a 32-bit or 64-bit system.
>
> On x86 it is possible to have a 32-bit userspace and a 64-bit kernel.
> In this type of environment, the userspace and kernel vme_user APIs
> would disagree and prevent ioctls from executing (based on ioctl
> signatures from _IOR and _IOW).
>
> Signed-off-by: Aaron Sierra <asierra@xxxxxxxxxxx>
> ---
> drivers/staging/vme/devices/vme_user.c | 1 +
> drivers/staging/vme/devices/vme_user.h | 26 +++++++++++++-------------
> 2 files changed, 14 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
> index da7f759..e69f0cd 100644
> --- a/drivers/staging/vme/devices/vme_user.c
> +++ b/drivers/staging/vme/devices/vme_user.c
> @@ -147,6 +147,7 @@ static const struct file_operations vme_user_fops = {
> .write = vme_user_write,
> .llseek = vme_user_llseek,
> .unlocked_ioctl = vme_user_unlocked_ioctl,
> + .compat_ioctl = vme_user_unlocked_ioctl,
> };
>
>
> diff --git a/drivers/staging/vme/devices/vme_user.h b/drivers/staging/vme/devices/vme_user.h
> index 7d24cd6..6726a42 100644
> --- a/drivers/staging/vme/devices/vme_user.h
> +++ b/drivers/staging/vme/devices/vme_user.h
> @@ -6,13 +6,13 @@
> /*
> * VMEbus Master Window Configuration Structure
> */
> -struct vme_master {
> - int enable; /* State of Window */
> - unsigned long long vme_addr; /* Starting Address on the VMEbus */
> - unsigned long long size; /* Window Size */
> - u32 aspace; /* Address Space */
> - u32 cycle; /* Cycle properties */
> - u32 dwidth; /* Maximum Data Width */
> +struct __attribute__((__packed__)) vme_master {
> + u32 enable; /* State of Window */
> + u64 vme_addr; /* Starting Address on the VMEbus */
> + u64 size; /* Window Size */
> + u32 aspace; /* Address Space */
> + u32 cycle; /* Cycle properties */
> + u32 dwidth; /* Maximum Data Width */
> #if 0
> char prefetchEnable; /* Prefetch Read Enable State */
> int prefetchSize; /* Prefetch Read Size (Cache Lines) */
> @@ -30,12 +30,12 @@ struct vme_master {
>
>
> /* VMEbus Slave Window Configuration Structure */
> -struct vme_slave {
> - int enable; /* State of Window */
> - unsigned long long vme_addr; /* Starting Address on the VMEbus */
> - unsigned long long size; /* Window Size */
> - u32 aspace; /* Address Space */
> - u32 cycle; /* Cycle properties */
> +struct __attribute__((__packed__)) vme_slave {
> + u32 enable; /* State of Window */
> + u64 vme_addr; /* Starting Address on the VMEbus */
> + u64 size; /* Window Size */
> + u32 aspace; /* Address Space */
> + u32 cycle; /* Cycle properties */
> #if 0
> char wrPostEnable; /* Write Post State */
> char rmwLock; /* Lock PCI during RMW Cycles */
>
--
Martyn Welch (Lead Software Engineer) | Registered in England and Wales
GE Intelligent Platforms | (3828642) at 100 Barbirolli Square
T +44(0)1327322748 | Manchester, M2 3AB
E martyn.welch@xxxxxx | VAT:GB 927559189
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
