[SCSI] mpt2sas: Add support for Customer specific branding messages

Add support for Customer specific branding messages when device driver loads,
based on specific customer subsystem vendor and device Ids

Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index b2a817055b8b40c8868df1fd2e5a1708b91da023..a08e1beaa03cfd9453a312af1dfa00b67c95a0f3 100644 (file)
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -1724,6 +1724,31 @@ _base_display_dell_branding(struct MPT2SAS_ADAPTER *ioc)
            ioc->pdev->subsystem_device);
 }
 
+/**
+ * _base_display_intel_branding - Display branding string
+ * @ioc: per adapter object
+ *
+ * Return nothing.
+ */
+static void
+_base_display_intel_branding(struct MPT2SAS_ADAPTER *ioc)
+{
+       if (ioc->pdev->subsystem_vendor == PCI_VENDOR_ID_INTEL &&
+           ioc->pdev->device == MPI2_MFGPAGE_DEVID_SAS2008) {
+
+               switch (ioc->pdev->subsystem_device) {
+               case MPT2SAS_INTEL_RMS2LL080_SSDID:
+                       printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
+                           MPT2SAS_INTEL_RMS2LL080_BRANDING);
+                       break;
+               case MPT2SAS_INTEL_RMS2LL040_SSDID:
+                       printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
+                           MPT2SAS_INTEL_RMS2LL040_BRANDING);
+                       break;
+               }
+       }
+}
+
 /**
  * _base_display_ioc_capabilities - Disply IOC's capabilities.
  * @ioc: per adapter object
@@ -1754,6 +1779,7 @@ _base_display_ioc_capabilities(struct MPT2SAS_ADAPTER *ioc)
            ioc->bios_pg3.BiosVersion & 0x000000FF);
 
        _base_display_dell_branding(ioc);
+       _base_display_intel_branding(ioc);
 
        printk(MPT2SAS_INFO_FMT "Protocol=(", ioc->name);
 

diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h
index 283568c6fb049728c432774185a6b2f70000e37f..82579fbca9e36d4de76c4e2b8f51a1f527f0f540 100644 (file)
--- a/drivers/scsi/mpt2sas/mpt2sas_base.h
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.h
@@ -153,6 +153,20 @@
 #define MPT2SAS_DELL_PERC_H200_SSDID               0x1F21
 #define MPT2SAS_DELL_6GBPS_SAS_SSDID               0x1F22
 
+/*
+ * Intel HBA branding
+ */
+#define MPT2SAS_INTEL_RMS2LL080_BRANDING       \
+                               "Intel Integrated RAID Module RMS2LL080"
+#define MPT2SAS_INTEL_RMS2LL040_BRANDING       \
+                               "Intel Integrated RAID Module RMS2LL040"
+
+/*
+ * Intel HBA SSDIDs
+ */
+#define MPT2SAS_INTEL_RMS2LL080_SSDID          0x350E
+#define MPT2SAS_INTEL_RMS2LL040_SSDID          0x350F
+
 /*
  * per target private data
  */