Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=aa7c79abd154ed9aba4c19b861d439ef6af35d3a
Commit:     aa7c79abd154ed9aba4c19b861d439ef6af35d3a
Parent:     20bed343142bfaf08765e35aaefa56dc5cc287db
Author:     Dave Olson <[EMAIL PROTECTED]>
AuthorDate: Thu Aug 16 18:10:43 2007 -0700
Committer:  Roland Dreier <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 20:58:49 2007 -0700

    IB/ipath: Fix QHT7040 serial number check
    
    Remove all the OEM and bringup boards, and complain and fail
    initialization if one is found.  QHT7040 with GPIO rework (128ywwuuuu)
    is OK, older 112ywwuuuu is no longer supported). The check that had been
    added was failing both the 112 and 128 series.
    
    Signed-off-by: Dave Olson <[EMAIL PROTECTED]>
    Signed-off-by: Roland Dreier <[EMAIL PROTECTED]>
---
 drivers/infiniband/hw/ipath/ipath_iba6110.c |   44 +++++++++-----------------
 1 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/drivers/infiniband/hw/ipath/ipath_iba6110.c 
b/drivers/infiniband/hw/ipath/ipath_iba6110.c
index df42a1e..ddbebe4 100644
--- a/drivers/infiniband/hw/ipath/ipath_iba6110.c
+++ b/drivers/infiniband/hw/ipath/ipath_iba6110.c
@@ -631,56 +631,35 @@ static int ipath_ht_boardname(struct ipath_devdata *dd, 
char *name,
 {
        char *n = NULL;
        u8 boardrev = dd->ipath_boardrev;
-       int ret;
+       int ret = 0;
 
        switch (boardrev) {
-       case 4:         /* Ponderosa is one of the bringup boards */
-               n = "Ponderosa";
-               break;
        case 5:
                /*
                 * original production board; two production levels, with
                 * different serial number ranges.   See ipath_ht_early_init() 
for
                 * case where we enable IPATH_GPIO_INTR for later serial # 
range.
+                * Original 112* serial number is no longer supported.
                 */
                n = "InfiniPath_QHT7040";
                break;
-       case 6:
-               n = "OEM_Board_3";
-               break;
        case 7:
                /* small form factor production board */
                n = "InfiniPath_QHT7140";
                break;
-       case 8:
-               n = "LS/X-1";
-               break;
-       case 9:         /* Comstock bringup test board */
-               n = "Comstock";
-               break;
-       case 10:
-               n = "OEM_Board_2";
-               break;
-       case 11:
-               n = "InfiniPath_HT-470"; /* obsoleted */
-               break;
-       case 12:
-               n = "OEM_Board_4";
-               break;
        default:                /* don't know, just print the number */
                ipath_dev_err(dd, "Don't yet know about board "
                              "with ID %u\n", boardrev);
                snprintf(name, namelen, "Unknown_InfiniPath_QHT7xxx_%u",
                         boardrev);
+               ret = 1;
                break;
        }
        if (n)
                snprintf(name, namelen, "%s", n);
 
-       if (dd->ipath_boardrev != 6 && dd->ipath_boardrev != 7 &&
-           dd->ipath_boardrev != 11) {
+       if (ret) {
                ipath_dev_err(dd, "Unsupported InfiniPath board %s!\n", name);
-               ret = 1;
                goto bail;
        }
        if (dd->ipath_majrev != 3 || (dd->ipath_minrev < 2 ||
@@ -1554,10 +1533,17 @@ static int ipath_ht_early_init(struct ipath_devdata *dd)
                 * can use GPIO interrupts.  They have serial #'s starting
                 * with 128, rather than 112.
                 */
-               dd->ipath_flags |= IPATH_GPIO_INTR;
-       } else
-               ipath_dev_err(dd, "Unsupported InfiniPath serial "
-                             "number %.16s!\n", dd->ipath_serial);
+               if (dd->ipath_serial[0] == '1' &&
+                   dd->ipath_serial[1] == '2' &&
+                   dd->ipath_serial[2] == '8')
+                       dd->ipath_flags |= IPATH_GPIO_INTR;
+               else {
+                       ipath_dev_err(dd, "Unsupported InfiniPath board "
+                               "(serial number %.16s)!\n",
+                               dd->ipath_serial);
+                       return 1;
+               }
+       }
 
        if (dd->ipath_minrev >= 4) {
                /* Rev4+ reports extra errors via internal GPIO pins */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to