[SCSI] megaraid_{mm,mbox}: a fix on "kernel unaligned access address" issue

There was an issue in the data structure defined by megaraid driver
casuing "kernel unaligned access.." messages to be displayed during
IOCTL on IA64 platform.

The issue has been reported/fixed by Sakurai Hiroomi
[sakurai_hiro@soft.fujitsu.com].

Signed-Off By: Seokmann Ju <seokmann.ju@lsil.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

4 files changed, 62 insertions, 3 deletions

diff --git a/Documentation/scsi/ChangeLog.megaraid b/Documentation/scsi/ChangeLog.megaraid
index 0edb048b2ea4..a056bbe67c7e 100644
--- a/Documentation/scsi/ChangeLog.megaraid
+++ b/Documentation/scsi/ChangeLog.megaraid
@@ -66,6 +66,61 @@ Older Version	: 2.20.4.8 (scsi module), 2.20.2.6 (cmm module)
         Fix: MegaRAID F/W has fixed the problem and being process of release,
         soon. Meanwhile, driver will filter out the request.
 
+3.      One of member in the data structure of the driver leads unaligne
+        issue on 64-bit platform.
+        Customer reporeted "kernel unaligned access addrss" issue when
+        application communicates with MegaRAID HBA driver.
+        Root Cause: in uioc_t structure, one of member had misaligned and it
+        led system to display the error message.
+        Fix: A patch submitted to community from following folk.
+
+        > -----Original Message-----
+        > From: linux-scsi-owner@vger.kernel.org
+        > [mailto:linux-scsi-owner@vger.kernel.org] On Behalf Of Sakurai Hiroomi
+        > Sent: Wednesday, July 12, 2006 4:20 AM
+        > To: linux-scsi@vger.kernel.org; linux-kernel@vger.kernel.org
+        > Subject: Re: Help: strange messages from kernel on IA64 platform
+        >
+        > Hi,
+        >
+        > I saw same message.
+        >
+        > When GAM(Global Array Manager) is started, The following
+        > message output.
+        > kernel: kernel unaligned access to 0xe0000001fe1080d4,
+        > ip=0xa000000200053371
+        >
+        > The uioc structure used by ioctl is defined by packed,
+        > the allignment of each member are disturbed.
+        > In a 64 bit structure, the allignment of member doesn't fit 64 bit
+        > boundary. this causes this messages.
+        > In a 32 bit structure, we don't see the message because the allinment
+        > of member fit 32 bit boundary even if packed is specified.
+        >
+        > patch
+        > I Add 32 bit dummy member to fit 64 bit boundary. I tested.
+        > We confirmed this patch fix the problem by IA64 server.
+        >
+        > **************************************************************
+        > ****************
+        > --- linux-2.6.9/drivers/scsi/megaraid/megaraid_ioctl.h.orig
+        > 2006-04-03 17:13:03.000000000 +0900
+        > +++ linux-2.6.9/drivers/scsi/megaraid/megaraid_ioctl.h
+        > 2006-04-03 17:14:09.000000000 +0900
+        > @@ -132,6 +132,10 @@
+        >  /* Driver Data: */
+        >          void __user *           user_data;
+        >          uint32_t                user_data_len;
+        > +
+        > +        /* 64bit alignment */
+        > +        uint32_t                pad_0xBC;
+        > +
+        >          mraid_passthru_t        __user *user_pthru;
+        >
+        >          mraid_passthru_t        *pthru32;
+        > **************************************************************
+        > ****************
+
 Release Date    : Mon Apr 11 12:27:22 EST 2006 - Seokmann Ju <sju@lsil.com>
 Current Version : 2.20.4.8 (scsi module), 2.20.2.6 (cmm module)
 Older Version   : 2.20.4.7 (scsi module), 2.20.2.6 (cmm module)
diff --git a/drivers/scsi/megaraid/megaraid_ioctl.h b/drivers/scsi/megaraid/megaraid_ioctl.h
index bdaee144a1c3..b8aa34202ec3 100644
--- a/drivers/scsi/megaraid/megaraid_ioctl.h
+++ b/drivers/scsi/megaraid/megaraid_ioctl.h
@@ -132,6 +132,10 @@ typedef struct uioc {
 /* Driver Data: */
         void __user *           user_data;
         uint32_t                user_data_len;
+
+        /* 64bit alignment */
+        uint32_t                pad_for_64bit_align;
+
         mraid_passthru_t        __user *user_pthru;
 
         mraid_passthru_t        *pthru32;
diff --git a/drivers/scsi/megaraid/megaraid_mm.c b/drivers/scsi/megaraid/megaraid_mm.c
index e8f534fb336b..d85b9a8f1b8d 100644
--- a/drivers/scsi/megaraid/megaraid_mm.c
+++ b/drivers/scsi/megaraid/megaraid_mm.c
@@ -10,7 +10,7 @@
  *         2 of the License, or (at your option) any later version.
  *
  * FILE         : megaraid_mm.c
- * Version      : v2.20.2.6 (Mar 7 2005)
+ * Version      : v2.20.2.7 (Jul 16 2006)
  *
  * Common management module
  */
diff --git a/drivers/scsi/megaraid/megaraid_mm.h b/drivers/scsi/megaraid/megaraid_mm.h
index 3d9e67d6849d..c8762b2b8ed1 100644
--- a/drivers/scsi/megaraid/megaraid_mm.h
+++ b/drivers/scsi/megaraid/megaraid_mm.h
@@ -27,9 +27,9 @@
 #include "megaraid_ioctl.h"
 
 
-#define LSI_COMMON_MOD_VERSION  "2.20.2.6"
+#define LSI_COMMON_MOD_VERSION  "2.20.2.7"
 #define LSI_COMMON_MOD_EXT_VERSION      \
-                "(Release Date: Mon Mar 7 00:01:03 EST 2005)"
+                "(Release Date: Sun Jul 16 00:01:03 EST 2006)"
 
 
 #define LSI_DBGLVL                      dbglevel