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

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

[SCSI] mpt2sas : Added customer specific display support 



Added Vendor specific branding message support.

Signed-off-by: default avatarKashyap Desai <kashyap.desai@lsi.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 12d23384

drivers/scsi/mpt2sas/mpt2sas_base.c

+49 −0
Original line number Diff line number Diff line
@@ -1747,6 +1747,54 @@ _base_display_intel_branding(struct MPT2SAS_ADAPTER *ioc) 
	}

}



/**

 * _base_display_hp_branding - Display branding string

 * @ioc: per adapter object

 *

 * Return nothing.

 */

static void

_base_display_hp_branding(struct MPT2SAS_ADAPTER *ioc)

{

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

		return;



	switch (ioc->pdev->device) {

	case MPI2_MFGPAGE_DEVID_SAS2004:

		switch (ioc->pdev->subsystem_device) {

		case MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_SSDID:

			printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,

			    MPT2SAS_HP_DAUGHTER_2_4_INTERNAL_BRANDING);

			break;

		default:

			break;

		}

	case MPI2_MFGPAGE_DEVID_SAS2308_2:

		switch (ioc->pdev->subsystem_device) {

		case MPT2SAS_HP_2_4_INTERNAL_SSDID:

			printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,

			    MPT2SAS_HP_2_4_INTERNAL_BRANDING);

			break;

		case MPT2SAS_HP_2_4_EXTERNAL_SSDID:

			printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,

			    MPT2SAS_HP_2_4_EXTERNAL_BRANDING);

			break;

		case MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_SSDID:

			printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,

			    MPT2SAS_HP_1_4_INTERNAL_1_4_EXTERNAL_BRANDING);

			break;

		case MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_SSDID:

			printk(MPT2SAS_INFO_FMT "%s\n", ioc->name,

			    MPT2SAS_HP_EMBEDDED_2_4_INTERNAL_BRANDING);

			break;

		default:

			break;

		}

	default:

		break;

	}

}



/**

 * _base_display_ioc_capabilities - Disply IOC's capabilities.

 * @ioc: per adapter object
@@ -1778,6 +1826,7 @@ _base_display_ioc_capabilities(struct MPT2SAS_ADAPTER *ioc) 


	_base_display_dell_branding(ioc);

	_base_display_intel_branding(ioc);

	_base_display_hp_branding(ioc);



	printk(MPT2SAS_INFO_FMT "Protocol=(", ioc->name);

drivers/scsi/mpt2sas/mpt2sas_base.h

+20 −0
Original line number Diff line number Diff line
@@ -168,6 +168,26 @@ 
#define MPT2SAS_INTEL_RMS2LL080_SSDID          0x350E

#define MPT2SAS_INTEL_RMS2LL040_SSDID          0x350F





/*

 * 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



/*

 * per target private data

 */