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

Commit 989e43c7 authored by Sreekanth Reddy's avatar Sreekanth Reddy Committed by Martin K. Petersen
Browse files

mpt3sas: Added OEM Gen2 PnP ID branding names 



Added OEM Gen2 PnP ID branding names from mpt2sas driver.

Signed-off-by: default avatarSreekanth Reddy <Sreekanth.Reddy@avagotech.com>
Acked-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 146b16c8

drivers/scsi/mpt3sas/mpt3sas_base.c

+221 −105
Original line number Diff line number Diff line
@@ -2508,18 +2508,76 @@ mpt3sas_base_put_smid_default(struct MPT3SAS_ADAPTER *ioc, u16 smid) 
}



/**

 * _base_display_intel_branding - Display branding string

 * _base_display_OEMs_branding - Display branding string

 * @ioc: per adapter object

 *

 * Return nothing.

 */

static void

_base_display_intel_branding(struct MPT3SAS_ADAPTER *ioc)

_base_display_OEMs_branding(struct MPT3SAS_ADAPTER *ioc)

{

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

		return;



	switch (ioc->pdev->subsystem_vendor) {

	case PCI_VENDOR_ID_INTEL:

		switch (ioc->pdev->device) {

		case MPI2_MFGPAGE_DEVID_SAS2008:

			switch (ioc->pdev->subsystem_device) {

			case MPT2SAS_INTEL_RMS2LL080_SSDID:

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

				    MPT2SAS_INTEL_RMS2LL080_BRANDING);

				break;

			case MPT2SAS_INTEL_RMS2LL040_SSDID:

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

				    MPT2SAS_INTEL_RMS2LL040_BRANDING);

				break;

			case MPT2SAS_INTEL_SSD910_SSDID:

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

				    MPT2SAS_INTEL_SSD910_BRANDING);

				break;

			default:

				pr_info(MPT3SAS_FMT

				 "Intel(R) Controller: Subsystem ID: 0x%X\n",

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

				break;

			}

		case MPI2_MFGPAGE_DEVID_SAS2308_2:

			switch (ioc->pdev->subsystem_device) {

			case MPT2SAS_INTEL_RS25GB008_SSDID:

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

				    MPT2SAS_INTEL_RS25GB008_BRANDING);

				break;

			case MPT2SAS_INTEL_RMS25JB080_SSDID:

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

				    MPT2SAS_INTEL_RMS25JB080_BRANDING);

				break;

			case MPT2SAS_INTEL_RMS25JB040_SSDID:

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

				    MPT2SAS_INTEL_RMS25JB040_BRANDING);

				break;

			case MPT2SAS_INTEL_RMS25KB080_SSDID:

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

				    MPT2SAS_INTEL_RMS25KB080_BRANDING);

				break;

			case MPT2SAS_INTEL_RMS25KB040_SSDID:

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

				    MPT2SAS_INTEL_RMS25KB040_BRANDING);

				break;

			case MPT2SAS_INTEL_RMS25LB040_SSDID:

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

				    MPT2SAS_INTEL_RMS25LB040_BRANDING);

				break;

			case MPT2SAS_INTEL_RMS25LB080_SSDID:

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

				    MPT2SAS_INTEL_RMS25LB080_BRANDING);

				break;

			default:

				pr_info(MPT3SAS_FMT

				 "Intel(R) Controller: Subsystem ID: 0x%X\n",

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

				break;

			}

		case MPI25_MFGPAGE_DEVID_SAS3008:

			switch (ioc->pdev->subsystem_device) {

			case MPT3SAS_INTEL_RMS3JC080_SSDID:
@@ -2552,23 +2610,46 @@ _base_display_intel_branding(struct MPT3SAS_ADAPTER *ioc) 
			 ioc->name, ioc->pdev->subsystem_device);

			break;

		}

}







/**

 * _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;



		break;

	case PCI_VENDOR_ID_DELL:

		switch (ioc->pdev->device) {

		case MPI2_MFGPAGE_DEVID_SAS2008:

			switch (ioc->pdev->subsystem_device) {

			case MPT2SAS_DELL_6GBPS_SAS_HBA_SSDID:

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

				 MPT2SAS_DELL_6GBPS_SAS_HBA_BRANDING);

				break;

			case MPT2SAS_DELL_PERC_H200_ADAPTER_SSDID:

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

				 MPT2SAS_DELL_PERC_H200_ADAPTER_BRANDING);

				break;

			case MPT2SAS_DELL_PERC_H200_INTEGRATED_SSDID:

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

				 MPT2SAS_DELL_PERC_H200_INTEGRATED_BRANDING);

				break;

			case MPT2SAS_DELL_PERC_H200_MODULAR_SSDID:

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

				 MPT2SAS_DELL_PERC_H200_MODULAR_BRANDING);

				break;

			case MPT2SAS_DELL_PERC_H200_EMBEDDED_SSDID:

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

				 MPT2SAS_DELL_PERC_H200_EMBEDDED_BRANDING);

				break;

			case MPT2SAS_DELL_PERC_H200_SSDID:

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

				 MPT2SAS_DELL_PERC_H200_BRANDING);

				break;

			case MPT2SAS_DELL_6GBPS_SAS_SSDID:

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

				 MPT2SAS_DELL_6GBPS_SAS_BRANDING);

				break;

			default:

				pr_info(MPT3SAS_FMT

				   "Dell 6Gbps HBA: Subsystem ID: 0x%X\n",

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

				break;

			}

			break;

		case MPI25_MFGPAGE_DEVID_SAS3008:

			switch (ioc->pdev->subsystem_device) {

			case MPT3SAS_DELL_12G_HBA_SSDID:
@@ -2577,31 +2658,19 @@ _base_display_dell_branding(struct MPT3SAS_ADAPTER *ioc) 
				break;

			default:

				pr_info(MPT3SAS_FMT

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

			   ioc->pdev->subsystem_device);

				   "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,

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

			   ioc->pdev->subsystem_device);

			break;

		}

}



/**

 * _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;



		break;

	case PCI_VENDOR_ID_CISCO:

		switch (ioc->pdev->device) {

		case MPI25_MFGPAGE_DEVID_SAS3008:

			switch (ioc->pdev->subsystem_device) {
@@ -2632,7 +2701,8 @@ _base_display_cisco_branding(struct MPT3SAS_ADAPTER *ioc) 
				break;

			case MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_SSDID:

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

			MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_BRANDING);

				MPT3SAS_CISCO_12G_COLUSA_MEZZANINE_HBA_BRANDING

				);

				break;

			default:

				pr_info(MPT3SAS_FMT
@@ -2643,10 +2713,58 @@ _base_display_cisco_branding(struct MPT3SAS_ADAPTER *ioc) 
			break;

		default:

			pr_info(MPT3SAS_FMT

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

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

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

			break;

		}

		break;

	case MPT2SAS_HP_3PAR_SSVID:

		switch (ioc->pdev->device) {

		case MPI2_MFGPAGE_DEVID_SAS2004:

			switch (ioc->pdev->subsystem_device) {

			case MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_SSDID:

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

				    MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_BRANDING);

				break;

			default:

				pr_info(MPT3SAS_FMT

				   "HP 6Gbps SAS HBA: Subsystem ID: 0x%X\n",

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

				break;

			}

		case MPI2_MFGPAGE_DEVID_SAS2308_2:

			switch (ioc->pdev->subsystem_device) {

			case MPT2SAS_HP_2_4_INTERNAL_SSDID:

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

				    MPT2SAS_HP_2_4_INTERNAL_BRANDING);

				break;

			case MPT2SAS_HP_2_4_EXTERNAL_SSDID:

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

				    MPT2SAS_HP_2_4_EXTERNAL_BRANDING);

				break;

			case MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_SSDID:

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

				 MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_BRANDING);

				break;

			case MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_SSDID:

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

				    MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_BRANDING);

				break;

			default:

				pr_info(MPT3SAS_FMT

				   "HP 6Gbps SAS HBA: Subsystem ID: 0x%X\n",

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

				break;

			}

		default:

			pr_info(MPT3SAS_FMT

			   "HP SAS HBA: Subsystem ID: 0x%X\n",

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

			break;

		}

	default:

		break;

	}

}



/**
@@ -2678,9 +2796,7 @@ _base_display_ioc_capabilities(struct MPT3SAS_ADAPTER *ioc) 
	   (bios_version & 0x0000FF00) >> 8,

	    bios_version & 0x000000FF);



	_base_display_intel_branding(ioc);

	_base_display_dell_branding(ioc);

	_base_display_cisco_branding(ioc);

	_base_display_OEMs_branding(ioc);



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

drivers/scsi/mpt3sas/mpt3sas_base.h

+84 −9
Original line number Diff line number Diff line
@@ -158,6 +158,27 @@ 
/*

 * Intel HBA branding

 */

#define MPT2SAS_INTEL_RMS25JB080_BRANDING    \

	"Intel(R) Integrated RAID Module RMS25JB080"

#define MPT2SAS_INTEL_RMS25JB040_BRANDING    \

	"Intel(R) Integrated RAID Module RMS25JB040"

#define MPT2SAS_INTEL_RMS25KB080_BRANDING    \

	"Intel(R) Integrated RAID Module RMS25KB080"

#define MPT2SAS_INTEL_RMS25KB040_BRANDING    \

	"Intel(R) Integrated RAID Module RMS25KB040"

#define MPT2SAS_INTEL_RMS25LB040_BRANDING	\

	"Intel(R) Integrated RAID Module RMS25LB040"

#define MPT2SAS_INTEL_RMS25LB080_BRANDING	\

	"Intel(R) Integrated RAID Module RMS25LB080"

#define MPT2SAS_INTEL_RMS2LL080_BRANDING	\

	"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"

#define MPT2SAS_INTEL_SSD910_BRANDING          \

	"Intel(R) SSD 910 Series"



#define MPT3SAS_INTEL_RMS3JC080_BRANDING       \

	"Intel(R) Integrated RAID Module RMS3JC080"

#define MPT3SAS_INTEL_RS3GC008_BRANDING       \
@@ -170,6 +191,17 @@ 
/*

 * Intel HBA SSDIDs

 */

#define MPT2SAS_INTEL_RMS25JB080_SSDID		0x3516

#define MPT2SAS_INTEL_RMS25JB040_SSDID		0x3517

#define MPT2SAS_INTEL_RMS25KB080_SSDID		0x3518

#define MPT2SAS_INTEL_RMS25KB040_SSDID		0x3519

#define MPT2SAS_INTEL_RMS25LB040_SSDID		0x351A

#define MPT2SAS_INTEL_RMS25LB080_SSDID		0x351B

#define MPT2SAS_INTEL_RMS2LL080_SSDID		0x350E

#define MPT2SAS_INTEL_RMS2LL040_SSDID		0x350F

#define MPT2SAS_INTEL_RS25GB008_SSDID		0x3000

#define MPT2SAS_INTEL_SSD910_SSDID		0x3700



#define MPT3SAS_INTEL_RMS3JC080_SSDID		0x3521

#define MPT3SAS_INTEL_RS3GC008_SSDID		0x3522

#define MPT3SAS_INTEL_RS3FC044_SSDID		0x3523
@@ -178,12 +210,30 @@ 
/*

 * Dell HBA branding

 */

#define MPT2SAS_DELL_BRANDING_SIZE                 32



#define MPT2SAS_DELL_6GBPS_SAS_HBA_BRANDING        "Dell 6Gbps SAS HBA"

#define MPT2SAS_DELL_PERC_H200_ADAPTER_BRANDING    "Dell PERC H200 Adapter"

#define MPT2SAS_DELL_PERC_H200_INTEGRATED_BRANDING "Dell PERC H200 Integrated"

#define MPT2SAS_DELL_PERC_H200_MODULAR_BRANDING    "Dell PERC H200 Modular"

#define MPT2SAS_DELL_PERC_H200_EMBEDDED_BRANDING   "Dell PERC H200 Embedded"

#define MPT2SAS_DELL_PERC_H200_BRANDING            "Dell PERC H200"

#define MPT2SAS_DELL_6GBPS_SAS_BRANDING            "Dell 6Gbps SAS"



#define MPT3SAS_DELL_12G_HBA_BRANDING       \

	"Dell 12Gbps HBA"



/*

 * Dell HBA SSDIDs

 */

#define MPT2SAS_DELL_6GBPS_SAS_HBA_SSDID	0x1F1C

#define MPT2SAS_DELL_PERC_H200_ADAPTER_SSDID	0x1F1D

#define MPT2SAS_DELL_PERC_H200_INTEGRATED_SSDID	0x1F1E

#define MPT2SAS_DELL_PERC_H200_MODULAR_SSDID	0x1F1F

#define MPT2SAS_DELL_PERC_H200_EMBEDDED_SSDID	0x1F20

#define MPT2SAS_DELL_PERC_H200_SSDID		0x1F21

#define MPT2SAS_DELL_6GBPS_SAS_SSDID		0x1F22



#define MPT3SAS_DELL_12G_HBA_SSDID		0x1F46



/*
@@ -212,6 +262,31 @@ 
#define MPT3_DIAG_BUFFER_IS_RELEASED	(0x02)

#define MPT3_DIAG_BUFFER_IS_DIAG_RESET	(0x04)



/*

 * HP HBA branding

 */

#define MPT2SAS_HP_3PAR_SSVID                0x1590



#define MPT2SAS_HP_2_4_INTERNAL_BRANDING	\

	"HP H220 Host Bus Adapter"

#define MPT2SAS_HP_2_4_EXTERNAL_BRANDING	\

	"HP H221 Host Bus Adapter"

#define MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_BRANDING	\

	"HP H222 Host Bus Adapter"

#define MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_BRANDING	\

	"HP H220i Host Bus Adapter"

#define MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_BRANDING	\

	"HP H210i Host Bus Adapter"



/*

 * HO HBA SSDIDs

 */

#define MPT2SAS_HP_2_4_INTERNAL_SSDID			0x0041

#define MPT2SAS_HP_2_4_EXTERNAL_SSDID			0x0042

#define MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_SSDID	0x0043

#define MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_SSDID		0x0044

#define MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_SSDID		0x0046



/*

 * Combined Reply Queue constants,

 * There are twelve Supplemental Reply Post Host Index Registers