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

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

mpt3sas: Add branding string support for OEM's HBA 



Added the following Dell branding to the mpt3sas driver.

"VendorID"   "DeviceID"  "SubsystemVendor ID"  "SubsystemDevice ID"  Dell Branding String
0x1000        0x0097          0x1028                 0x1F46            DELL 12Gbps HBA

Signed-off-by: default avatarSreekanth Reddy <Sreekanth.Reddy@avagotech.com>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarJames Bottomley <JBottomley@Odin.com>
parent 35c319b4

drivers/scsi/mpt3sas/mpt3sas_base.c

+36 −0
Original line number Diff line number Diff line
@@ -2366,6 +2366,41 @@ _base_display_intel_branding(struct MPT3SAS_ADAPTER *ioc) 






/**

 * _base_display_dell_branding - Display branding string

 * @ioc: per adapter object

 *

 * Return nothing.

 */

static void

_base_display_dell_branding(struct MPT3SAS_ADAPTER *ioc)

{

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

		return;



	switch (ioc->pdev->device) {

	case MPI25_MFGPAGE_DEVID_SAS3008:

		switch (ioc->pdev->subsystem_device) {

		case MPT3SAS_DELL_12G_HBA_SSDID:

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

				MPT3SAS_DELL_12G_HBA_BRANDING);

			break;

		default:

			pr_info(MPT3SAS_FMT

			   "Dell 12Gbps HBA: Subsystem ID: 0x%X\n", ioc->name,

			   ioc->pdev->subsystem_device);

			break;

		}

		break;

	default:

		pr_info(MPT3SAS_FMT

			"Dell 12Gbps HBA: Subsystem ID: 0x%X\n", ioc->name,

			ioc->pdev->subsystem_device);

		break;

	}

}





/**

 * _base_display_ioc_capabilities - Disply IOC's capabilities.

 * @ioc: per adapter object
@@ -2396,6 +2431,7 @@ _base_display_ioc_capabilities(struct MPT3SAS_ADAPTER *ioc) 
	    bios_version & 0x000000FF);



	_base_display_intel_branding(ioc);

	_base_display_dell_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
@@ -151,6 +151,17 @@ 
#define MPT3SAS_INTEL_RS3FC044_SSDID	0x3523

#define MPT3SAS_INTEL_RS3UC080_SSDID    0x3524



/*

 * Dell HBA branding

 */

#define MPT3SAS_DELL_12G_HBA_BRANDING       \

	"Dell 12Gbps HBA"



/*

 * Dell HBA SSDIDs

 */

#define MPT3SAS_DELL_12G_HBA_SSDID	0x1F46



/*

 * status bits for ioc->diag_buffer_status

 */