Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / drivers / scsi / mpt2sas / mpt2sas_base.c

diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index a91f5143ceac3eb7cbfec5b4fad6f588bd5834b1..f3da592f7bccc204fc08d901e9fabbd2c1eb6ee7 100644 (file)
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -636,6 +636,14 @@ _base_unmask_interrupts(struct MPT2SAS_ADAPTER *ioc)
 static irqreturn_t
 _base_interrupt(int irq, void *bus_id)
 {
+       union reply_descriptor {
+               u64 word;
+               struct {
+                       u32 low;
+                       u32 high;
+               } u;
+       };
+       union reply_descriptor rd;
        u32 post_index, post_index_next, completed_cmds;
        u8 request_desript_type;
        u16 smid;
@@ -656,7 +664,8 @@ _base_interrupt(int irq, void *bus_id)
 
        completed_cmds = 0;
        do {
-               if (ioc->reply_post_free[post_index].Words == ~0ULL)
+               rd.word = ioc->reply_post_free[post_index].Words;
+               if (rd.u.low == UINT_MAX || rd.u.high == UINT_MAX)
                        goto out;
                reply = 0;
                cb_idx = 0xFF;
@@ -721,7 +730,7 @@ _base_interrupt(int irq, void *bus_id)
        for (i = 0 ; i < completed_cmds; i++) {
                post_index = post_index_next;
                /* poison the reply post descriptor */
-               ioc->reply_post_free[post_index_next].Words = ~0ULL;
+               ioc->reply_post_free[post_index_next].Words = ULLONG_MAX;
                post_index_next = (post_index ==
                    (ioc->reply_post_queue_depth - 1))
                    ? 0 : post_index + 1;
@@ -1386,6 +1395,64 @@ mpt2sas_base_put_smid_target_assist(struct MPT2SAS_ADAPTER *ioc, u16 smid,
            &ioc->scsi_lookup_lock);
 }
 
+/**
+ * _base_display_dell_branding - Disply branding string
+ * @ioc: per adapter object
+ *
+ * Return nothing.
+ */
+static void
+_base_display_dell_branding(struct MPT2SAS_ADAPTER *ioc)
+{
+       char dell_branding[MPT2SAS_DELL_BRANDING_SIZE];
+
+       if (ioc->pdev->subsystem_vendor != PCI_VENDOR_ID_DELL)
+               return;
+
+       memset(dell_branding, 0, MPT2SAS_DELL_BRANDING_SIZE);
+       switch (ioc->pdev->subsystem_device) {
+       case MPT2SAS_DELL_6GBPS_SAS_HBA_SSDID:
+               strncpy(dell_branding, MPT2SAS_DELL_6GBPS_SAS_HBA_BRANDING,
+                   MPT2SAS_DELL_BRANDING_SIZE - 1);
+               break;
+       case MPT2SAS_DELL_PERC_H200_ADAPTER_SSDID:
+               strncpy(dell_branding, MPT2SAS_DELL_PERC_H200_ADAPTER_BRANDING,
+                   MPT2SAS_DELL_BRANDING_SIZE - 1);
+               break;
+       case MPT2SAS_DELL_PERC_H200_INTEGRATED_SSDID:
+               strncpy(dell_branding,
+                   MPT2SAS_DELL_PERC_H200_INTEGRATED_BRANDING,
+                   MPT2SAS_DELL_BRANDING_SIZE - 1);
+               break;
+       case MPT2SAS_DELL_PERC_H200_MODULAR_SSDID:
+               strncpy(dell_branding,
+                   MPT2SAS_DELL_PERC_H200_MODULAR_BRANDING,
+                   MPT2SAS_DELL_BRANDING_SIZE - 1);
+               break;
+       case MPT2SAS_DELL_PERC_H200_EMBEDDED_SSDID:
+               strncpy(dell_branding,
+                   MPT2SAS_DELL_PERC_H200_EMBEDDED_BRANDING,
+                   MPT2SAS_DELL_BRANDING_SIZE - 1);
+               break;
+       case MPT2SAS_DELL_PERC_H200_SSDID:
+               strncpy(dell_branding, MPT2SAS_DELL_PERC_H200_BRANDING,
+                   MPT2SAS_DELL_BRANDING_SIZE - 1);
+               break;
+       case MPT2SAS_DELL_6GBPS_SAS_SSDID:
+               strncpy(dell_branding, MPT2SAS_DELL_6GBPS_SAS_BRANDING,
+                   MPT2SAS_DELL_BRANDING_SIZE - 1);
+               break;
+       default:
+               sprintf(dell_branding, "0x%4X", ioc->pdev->subsystem_device);
+               break;
+       }
+
+       printk(MPT2SAS_INFO_FMT "%s: Vendor(0x%04X), Device(0x%04X),"
+           " SSVID(0x%04X), SSDID(0x%04X)\n", ioc->name, dell_branding,
+           ioc->pdev->vendor, ioc->pdev->device, ioc->pdev->subsystem_vendor,
+           ioc->pdev->subsystem_device);
+}
+
 /**
  * _base_display_ioc_capabilities - Disply IOC's capabilities.
  * @ioc: per adapter object
@@ -1427,6 +1494,8 @@ _base_display_ioc_capabilities(struct MPT2SAS_ADAPTER *ioc)
                i++;
        }
 
+       _base_display_dell_branding(ioc);
+
        i = 0;
        printk("), ");
        printk("Capabilities=(");
@@ -3068,7 +3137,7 @@ _base_make_ioc_operational(struct MPT2SAS_ADAPTER *ioc, u8 VF_ID,
 
        /* initialize Reply Post Free Queue */
        for (i = 0; i < ioc->reply_post_queue_depth; i++)
-               ioc->reply_post_free[i].Words = ~0ULL;
+               ioc->reply_post_free[i].Words = ULLONG_MAX;
 
        r = _base_send_ioc_init(ioc, VF_ID, sleep_flag);
        if (r)