diff options
author | Sreekanth Reddy <Sreekanth.Reddy@lsi.com> | 2013-02-01 11:19:30 -0500 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2013-02-24 03:48:15 -0500 |
commit | 7887ea7f942770c2146dbcdfa2a85aa8de93df31 (patch) | |
tree | ac74a72d1daf5a64dea0340331780cef0af1f898 /drivers/scsi | |
parent | bfae7820b87c61c5065338b55405b304d9890085 (diff) |
[SCSI] mpt2sas: Add support for OEM specific controller
Defined SSDID & HW vendor brand strings. Added entries for SSDID within the
function that prints the brand string.
Signed-off-by: Sreekanth Reddy <Sreekanth.Reddy@lsi.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_base.c | 8 | ||||
-rw-r--r-- | drivers/scsi/mpt2sas/mpt2sas_base.h | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c index 5e24e7e73714..bcb23d28b3e8 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.c +++ b/drivers/scsi/mpt2sas/mpt2sas_base.c | |||
@@ -2023,6 +2023,14 @@ _base_display_intel_branding(struct MPT2SAS_ADAPTER *ioc) | |||
2023 | printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, | 2023 | printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, |
2024 | MPT2SAS_INTEL_RMS25KB040_BRANDING); | 2024 | MPT2SAS_INTEL_RMS25KB040_BRANDING); |
2025 | break; | 2025 | break; |
2026 | case MPT2SAS_INTEL_RMS25LB040_SSDID: | ||
2027 | printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, | ||
2028 | MPT2SAS_INTEL_RMS25LB040_BRANDING); | ||
2029 | break; | ||
2030 | case MPT2SAS_INTEL_RMS25LB080_SSDID: | ||
2031 | printk(MPT2SAS_INFO_FMT "%s\n", ioc->name, | ||
2032 | MPT2SAS_INTEL_RMS25LB080_BRANDING); | ||
2033 | break; | ||
2026 | default: | 2034 | default: |
2027 | break; | 2035 | break; |
2028 | } | 2036 | } |
diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h b/drivers/scsi/mpt2sas/mpt2sas_base.h index c6ee7aad7501..4caaac13682f 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.h +++ b/drivers/scsi/mpt2sas/mpt2sas_base.h | |||
@@ -165,6 +165,10 @@ | |||
165 | "Intel(R) Integrated RAID Module RMS25KB080" | 165 | "Intel(R) Integrated RAID Module RMS25KB080" |
166 | #define MPT2SAS_INTEL_RMS25KB040_BRANDING \ | 166 | #define MPT2SAS_INTEL_RMS25KB040_BRANDING \ |
167 | "Intel(R) Integrated RAID Module RMS25KB040" | 167 | "Intel(R) Integrated RAID Module RMS25KB040" |
168 | #define MPT2SAS_INTEL_RMS25LB040_BRANDING \ | ||
169 | "Intel(R) Integrated RAID Module RMS25LB040" | ||
170 | #define MPT2SAS_INTEL_RMS25LB080_BRANDING \ | ||
171 | "Intel(R) Integrated RAID Module RMS25LB080" | ||
168 | #define MPT2SAS_INTEL_RMS2LL080_BRANDING \ | 172 | #define MPT2SAS_INTEL_RMS2LL080_BRANDING \ |
169 | "Intel Integrated RAID Module RMS2LL080" | 173 | "Intel Integrated RAID Module RMS2LL080" |
170 | #define MPT2SAS_INTEL_RMS2LL040_BRANDING \ | 174 | #define MPT2SAS_INTEL_RMS2LL040_BRANDING \ |
@@ -180,6 +184,8 @@ | |||
180 | #define MPT2SAS_INTEL_RMS25JB040_SSDID 0x3517 | 184 | #define MPT2SAS_INTEL_RMS25JB040_SSDID 0x3517 |
181 | #define MPT2SAS_INTEL_RMS25KB080_SSDID 0x3518 | 185 | #define MPT2SAS_INTEL_RMS25KB080_SSDID 0x3518 |
182 | #define MPT2SAS_INTEL_RMS25KB040_SSDID 0x3519 | 186 | #define MPT2SAS_INTEL_RMS25KB040_SSDID 0x3519 |
187 | #define MPT2SAS_INTEL_RMS25LB040_SSDID 0x351A | ||
188 | #define MPT2SAS_INTEL_RMS25LB080_SSDID 0x351B | ||
183 | #define MPT2SAS_INTEL_RMS2LL080_SSDID 0x350E | 189 | #define MPT2SAS_INTEL_RMS2LL080_SSDID 0x350E |
184 | #define MPT2SAS_INTEL_RMS2LL040_SSDID 0x350F | 190 | #define MPT2SAS_INTEL_RMS2LL040_SSDID 0x350F |
185 | #define MPT2SAS_INTEL_RS25GB008_SSDID 0x3000 | 191 | #define MPT2SAS_INTEL_RS25GB008_SSDID 0x3000 |