Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[SCSI] mpt2sas: Adding support for customer specific branding

Browse source 
Signed-off-by: Kashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Kashyap, Desai 2011-06-14 10:57:31 +05:30 • committed by James Bottomley
parent 7821578caa
commit ab3e5f60d1
2 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/scsi/mpt2sas/mpt2sas_base.c
View file

@ -1740,9 +1740,11 @@ _base_display_dell_branding(struct MPT2SAS_ADAPTER *ioc)
static void static void
_base_display_intel_branding(struct MPT2SAS_ADAPTER *ioc) _base_display_intel_branding(struct MPT2SAS_ADAPTER *ioc)
{ {
if (ioc->pdev->subsystem_vendor == PCI_VENDOR_ID_INTEL && if (ioc->pdev->subsystem_vendor != PCI_VENDOR_ID_INTEL)
ioc->pdev->device == MPI2_MFGPAGE_DEVID_SAS2008) { return;
switch (ioc->pdev->device) {
case MPI2_MFGPAGE_DEVID_SAS2008:
switch (ioc->pdev->subsystem_device) { switch (ioc->pdev->subsystem_device) {
case MPT2SAS_INTEL_RMS2LL080_SSDID: case MPT2SAS_INTEL_RMS2LL080_SSDID:
printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
@ -1752,7 +1754,20 @@ _base_display_intel_branding(struct MPT2SAS_ADAPTER *ioc)
printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
MPT2SAS_INTEL_RMS2LL040_BRANDING); MPT2SAS_INTEL_RMS2LL040_BRANDING);
break; break;
default:
break;
} }
case MPI2_MFGPAGE_DEVID_SAS2308_2:
switch (ioc->pdev->subsystem_device) {
case MPT2SAS_INTEL_RS25GB008_SSDID:
printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,
MPT2SAS_INTEL_RS25GB008_BRANDING);
break;
default:
break;
}
default:
break;
} }
} }

3
drivers/scsi/mpt2sas/mpt2sas_base.h
View file

@ -161,12 +161,15 @@
"Intel Integrated RAID Module RMS2LL080" "Intel Integrated RAID Module RMS2LL080"
#define MPT2SAS_INTEL_RMS2LL040_BRANDING \ #define MPT2SAS_INTEL_RMS2LL040_BRANDING \
"Intel Integrated RAID Module RMS2LL040" "Intel Integrated RAID Module RMS2LL040"
#define MPT2SAS_INTEL_RS25GB008_BRANDING \
"Intel(R) RAID Controller RS25GB008"
/* /*
* Intel HBA SSDIDs * Intel HBA SSDIDs
*/ */
#define MPT2SAS_INTEL_RMS2LL080_SSDID 0x350E #define MPT2SAS_INTEL_RMS2LL080_SSDID 0x350E
#define MPT2SAS_INTEL_RMS2LL040_SSDID 0x350F #define MPT2SAS_INTEL_RMS2LL040_SSDID 0x350F
#define MPT2SAS_INTEL_RS25GB008_SSDID 0x3000
/* /*