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

Commit 38e4141e authored by Sreekanth Reddy's avatar Sreekanth Reddy Committed by James Bottomley
Browse files

mpt3sas: Add branding string support for OEM custom HBA 



Add the following OEM's branding to the mpt3sas driver.

"VendorID"   "DeviceID"  "SubsystemVendor ID"   "SubsystemDevice ID"  Cisco Branding String
0x1000         0x97         SVID = 0x1137             0x014C          Cisco 9300-8E 12G SAS HBA

Signed-off-by: default avatarSreekanth Reddy <Sreekanth.Reddy@avagotech.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent fb84dfc4

drivers/scsi/mpt3sas/mpt3sas_base.c

+34 −0
Original line number Diff line number Diff line
@@ -2400,6 +2400,39 @@ _base_display_dell_branding(struct MPT3SAS_ADAPTER *ioc) 
	}

}



/**

 * _base_display_cisco_branding - Display branding string

 * @ioc: per adapter object

 *

 * Return nothing.

 */

static void

_base_display_cisco_branding(struct MPT3SAS_ADAPTER *ioc)

{

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

		return;



	switch (ioc->pdev->device) {

	case MPI25_MFGPAGE_DEVID_SAS3008:

		switch (ioc->pdev->subsystem_device) {

		case MPT3SAS_CISCO_12G_HBA_SSDID:

			pr_info(MPT3SAS_FMT "%s\n", ioc->name,

				MPT3SAS_CISCO_12G_HBA_BRANDING);

			break;

		default:

			pr_info(MPT3SAS_FMT

			  "Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n",

			  ioc->name, ioc->pdev->subsystem_device);

			break;

		}

		break;

	default:

		 pr_info(MPT3SAS_FMT

			"Cisco 12Gbps SAS HBA: Subsystem ID: 0x%X\n",

			ioc->name, ioc->pdev->subsystem_device);

		break;

	}

}



/**

 * _base_display_ioc_capabilities - Disply IOC's capabilities.
@@ -2432,6 +2465,7 @@ _base_display_ioc_capabilities(struct MPT3SAS_ADAPTER *ioc) 


	_base_display_intel_branding(ioc);

	_base_display_dell_branding(ioc);

	_base_display_cisco_branding(ioc);



	pr_info(MPT3SAS_FMT "Protocol=(", ioc->name);

drivers/scsi/mpt3sas/mpt3sas_base.h

+11 −0
Original line number Diff line number Diff line
@@ -162,6 +162,17 @@ 
 */

#define MPT3SAS_DELL_12G_HBA_SSDID	0x1F46



/*

 * Cisco HBA branding

 */

#define MPT3SAS_CISCO_12G_HBA_BRANDING       \

	"Cisco 9300-8E 12G SAS HBA"



/*

 * Cisco HBA SSSDIDs

 */

 #define MPT3SAS_CISCO_12G_HBA_SSDID  0x14C



/*

 * status bits for ioc->diag_buffer_status

 */