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

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

mpt3sas: Added support for customer specific branding 



"VendorID"   "DeviceID"  "SubsystemVendor ID"   "SubsystemDevice ID"  Cisco Branding String
0x1000         0x97           0x1137                 0x154           Cisco 9300-8i 12Gbps SAS HBA
0x1000         0x97           0x1137                 0x155           Cisco 12G Modular SAS Pass through Controller
0x1000         0x97           0x1137                 0x156           UCS C3X60 12G SAS Pass through Controller

Signed-off-by: default avatarSreekanth Reddy <Sreekanth.Reddy@avagotech.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent 62f5c74c

drivers/scsi/mpt3sas/mpt3sas_base.c

+27 −2
Original line number Diff line number Diff line
@@ -2415,9 +2415,34 @@ _base_display_cisco_branding(struct MPT3SAS_ADAPTER *ioc) 
	switch (ioc->pdev->device) {

	case MPI25_MFGPAGE_DEVID_SAS3008:

		switch (ioc->pdev->subsystem_device) {

		case MPT3SAS_CISCO_12G_HBA_SSDID:

		case MPT3SAS_CISCO_12G_8E_HBA_SSDID:

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

				MPT3SAS_CISCO_12G_HBA_BRANDING);

				MPT3SAS_CISCO_12G_8E_HBA_BRANDING);

			break;

		case MPT3SAS_CISCO_12G_8I_HBA_SSDID:

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

				MPT3SAS_CISCO_12G_8I_HBA_BRANDING);

			break;

		case MPT3SAS_CISCO_12G_AVILA_HBA_SSDID:

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

				MPT3SAS_CISCO_12G_AVILA_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;

	case MPI25_MFGPAGE_DEVID_SAS3108_1:

		switch (ioc->pdev->subsystem_device) {

		case MPT3SAS_CISCO_12G_AVILA_HBA_SSDID:

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

			MPT3SAS_CISCO_12G_AVILA_HBA_BRANDING);

			break;

		case MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_SSDID:

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

			MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_BRANDING);

			break;

		default:

			pr_info(MPT3SAS_FMT

drivers/scsi/mpt3sas/mpt3sas_base.h

+12 −4
Original line number Diff line number Diff line
@@ -165,13 +165,21 @@ 
/*

 * Cisco HBA branding

 */

#define MPT3SAS_CISCO_12G_HBA_BRANDING       \

#define MPT3SAS_CISCO_12G_8E_HBA_BRANDING		\

		"Cisco 9300-8E 12G SAS HBA"



#define MPT3SAS_CISCO_12G_8I_HBA_BRANDING		\

		"Cisco 9300-8i 12G SAS HBA"

#define MPT3SAS_CISCO_12G_AVILA_HBA_BRANDING	\

		"Cisco 12G Modular SAS Pass through Controller"

#define MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_BRANDING		\

		"UCS C3X60 12G SAS Pass through Controller"

/*

 * Cisco HBA SSSDIDs

 */

 #define MPT3SAS_CISCO_12G_HBA_SSDID  0x14C

#define MPT3SAS_CISCO_12G_8E_HBA_SSDID  0x14C

#define MPT3SAS_CISCO_12G_8I_HBA_SSDID  0x154

#define MPT3SAS_CISCO_12G_AVILA_HBA_SSDID  0x155

#define MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_SSDID  0x156



/*

 * status bits for ioc->diag_buffer_status