Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab3e5f60 authored by Kashyap, Desai's avatar Kashyap, Desai Committed by James Bottomley
Browse files

[SCSI] mpt2sas: Adding support for customer specific branding 



Signed-off-by: default avatarKashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 7821578c

drivers/scsi/mpt2sas/mpt2sas_base.c

+17 −2
Original line number Diff line number Diff line
@@ -1740,9 +1740,11 @@ _base_display_dell_branding(struct MPT2SAS_ADAPTER *ioc) 
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) {

	if (ioc->pdev->subsystem_vendor != PCI_VENDOR_ID_INTEL)

		return;



	switch (ioc->pdev->device) {

	case MPI2_MFGPAGE_DEVID_SAS2008:

		switch (ioc->pdev->subsystem_device) {

		case MPT2SAS_INTEL_RMS2LL080_SSDID:

			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,

			    MPT2SAS_INTEL_RMS2LL040_BRANDING);

			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;

	}

}

drivers/scsi/mpt2sas/mpt2sas_base.h

+3 −0
Original line number Diff line number Diff line
@@ -161,12 +161,15 @@ 
				"Intel Integrated RAID Module RMS2LL080"

#define MPT2SAS_INTEL_RMS2LL040_BRANDING	\

				"Intel Integrated RAID Module RMS2LL040"

#define MPT2SAS_INTEL_RS25GB008_BRANDING       \

				"Intel(R) RAID Controller RS25GB008"



/*

 * Intel HBA SSDIDs

 */

#define MPT2SAS_INTEL_RMS2LL080_SSDID          0x350E

#define MPT2SAS_INTEL_RMS2LL040_SSDID          0x350F

#define MPT2SAS_INTEL_RS25GB008_SSDID          0x3000





/*