aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorKashyap, Desai <kashyap.desai@lsi.com>2011-01-04 01:06:37 -0500
committerJames Bottomley <James.Bottomley@suse.de>2011-01-24 10:32:22 -0500
commitfb396bec76187aae1a0eaf5b7f21327b8cb34fec (patch)
tree3da6cb2aac41f474accd6d0d649fd720e9b28569 /drivers
parent9af05d90e91026838330a2bf86a6692c86f3c4e7 (diff)
[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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_base.c26
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_base.h14
2 files changed, 40 insertions, 0 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c
index b2a817055b8b..a08e1beaa03c 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
@@ -1725,6 +1725,31 @@ _base_display_dell_branding(struct MPT2SAS_ADAPTER *ioc)
1725} 1725}
1726 1726
1727/** 1727/**
1728 * _base_display_intel_branding - Display branding string
1729 * @ioc: per adapter object
1730 *
1731 * Return nothing.
1732 */
1733static void
1734_base_display_intel_branding(struct MPT2SAS_ADAPTER *ioc)
1735{
1736 if (ioc->pdev->subsystem_vendor == PCI_VENDOR_ID_INTEL &&
1737 ioc->pdev->device == MPI2_MFGPAGE_DEVID_SAS2008) {
1738
1739 switch (ioc->pdev->subsystem_device) {
1740 case MPT2SAS_INTEL_RMS2LL080_SSDID:
1741 printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
1742 MPT2SAS_INTEL_RMS2LL080_BRANDING);
1743 break;
1744 case MPT2SAS_INTEL_RMS2LL040_SSDID:
1745 printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
1746 MPT2SAS_INTEL_RMS2LL040_BRANDING);
1747 break;
1748 }
1749 }
1750}
1751
1752/**
1728 * _base_display_ioc_capabilities - Disply IOC's capabilities. 1753 * _base_display_ioc_capabilities - Disply IOC's capabilities.
1729 * @ioc: per adapter object 1754 * @ioc: per adapter object
1730 * 1755 *
@@ -1754,6 +1779,7 @@ _base_display_ioc_capabilities(struct MPT2SAS_ADAPTER *ioc)
1754 ioc->bios_pg3.BiosVersion & 0x000000FF); 1779 ioc->bios_pg3.BiosVersion & 0x000000FF);
1755 1780
1756 _base_display_dell_branding(ioc); 1781 _base_display_dell_branding(ioc);
1782 _base_display_intel_branding(ioc);
1757 1783
1758 printk(MPT2SAS_INFO_FMT "Protocol=(", ioc->name); 1784 printk(MPT2SAS_INFO_FMT "Protocol=(", ioc->name);
1759 1785
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h
index 283568c6fb04..82579fbca9e3 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_base.h
+++ b/drivers/scsi/mpt2sas/mpt2sas_base.h
@@ -154,6 +154,20 @@
154#define MPT2SAS_DELL_6GBPS_SAS_SSDID 0x1F22 154#define MPT2SAS_DELL_6GBPS_SAS_SSDID 0x1F22
155 155
156/* 156/*
157 * Intel HBA branding
158 */
159#define MPT2SAS_INTEL_RMS2LL080_BRANDING \
160 "Intel Integrated RAID Module RMS2LL080"
161#define MPT2SAS_INTEL_RMS2LL040_BRANDING \
162 "Intel Integrated RAID Module RMS2LL040"
163
164/*
165 * Intel HBA SSDIDs
166 */
167#define MPT2SAS_INTEL_RMS2LL080_SSDID 0x350E
168#define MPT2SAS_INTEL_RMS2LL040_SSDID 0x350F
169
170/*
157 * per target private data 171 * per target private data
158 */ 172 */
159#define MPT_TARGET_FLAGS_RAID_COMPONENT 0x01 173#define MPT_TARGET_FLAGS_RAID_COMPONENT 0x01