[PATCH] IB/ipath: support more models of InfiniPath hardware

We do a few more explicit checks for specific models, and now also support the
old PathScale serial number style, or new QLogic style.

This is backwards compatible with previous versions of software and hardware.
That is, older software will see a plausible serial number and correct GUID
when used with a new board, while newer software will correctly handle an
older board.

Signed-off-by: Mike Albaugh <mike.albaugh@qlogic.com>
Signed-off-by: Dave Olson <dave.olson@qlogic.com>
Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>
Cc: "Michael S. Tsirkin" <mst@mellanox.co.il>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 5 insertions, 2 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_kernel.h b/drivers/infiniband/hw/ipath/ipath_kernel.h
index fe3c862e23b5..00a6bbdbe957 100644
--- a/drivers/infiniband/hw/ipath/ipath_kernel.h
+++ b/drivers/infiniband/hw/ipath/ipath_kernel.h
@@ -491,8 +491,11 @@ struct ipath_devdata {
         u16 ipath_lid;
         /* list of pkeys programmed; 0 if not set */
         u16 ipath_pkeys[4];
-        /* ASCII serial number, from flash */
-        u8 ipath_serial[12];
+        /*
+         * ASCII serial number, from flash, large enough for original
+         * all digit strings, and longer QLogic serial number format
+         */
+        u8 ipath_serial[16];
         /* human readable board version */
         u8 ipath_boardversion[80];
         /* chip major rev, from ipath_revision */