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

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

[SCSI] mpt fusion: Add separate msi enable disable for FC,SPI,SAS 



Added support for MSI enable/disable for different buses FC,SPI,SAS
instead of having single MSI enable/disable feature.

Signed-off-by: default avatarKashyap Desai <kadesai@lsi.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent fd7a2533

drivers/message/fusion/mptbase.c

+37 −13
Original line number Diff line number Diff line
@@ -79,9 +79,22 @@ MODULE_VERSION(my_VERSION); 
/*

 *  cmd line parameters

 */

static int mpt_msi_enable = -1;

module_param(mpt_msi_enable, int, 0);

MODULE_PARM_DESC(mpt_msi_enable, " MSI Support Enable (default=0)");



static int mpt_msi_enable_spi;

module_param(mpt_msi_enable_spi, int, 0);

MODULE_PARM_DESC(mpt_msi_enable_spi, " Enable MSI Support for SPI \

		controllers (default=0)");



static int mpt_msi_enable_fc;

module_param(mpt_msi_enable_fc, int, 0);

MODULE_PARM_DESC(mpt_msi_enable_fc, " Enable MSI Support for FC \

		controllers (default=0)");



static int mpt_msi_enable_sas;

module_param(mpt_msi_enable_sas, int, 1);

MODULE_PARM_DESC(mpt_msi_enable_sas, " Enable MSI Support for SAS \

		controllers (default=1)");





static int mpt_channel_mapping;

module_param(mpt_channel_mapping, int, 0);
@@ -91,7 +104,9 @@ static int mpt_debug_level; 
static int mpt_set_debug_level(const char *val, struct kernel_param *kp);

module_param_call(mpt_debug_level, mpt_set_debug_level, param_get_int,

		  &mpt_debug_level, 0600);

MODULE_PARM_DESC(mpt_debug_level, " debug level - refer to mptdebug.h - (default=0)");

MODULE_PARM_DESC(mpt_debug_level, " debug level - refer to mptdebug.h \

	- (default=0)");





#ifdef MFCNT

static int mfcounter = 0;
@@ -1751,16 +1766,25 @@ mpt_attach(struct pci_dev *pdev, const struct pci_device_id *id) 
		ioc->bus_type = SAS;

	}



	if (mpt_msi_enable == -1) {

		/* Enable on SAS, disable on FC and SPI */

		if (ioc->bus_type == SAS)

			ioc->msi_enable = 1;

		else

			ioc->msi_enable = 0;

	} else

		/* follow flag: 0 - disable; 1 - enable */

		ioc->msi_enable = mpt_msi_enable;



	switch (ioc->bus_type) {



	case SAS:

		ioc->msi_enable = mpt_msi_enable_sas;

		break;



	case SPI:

		ioc->msi_enable = mpt_msi_enable_spi;

		break;



	case FC:

		ioc->msi_enable = mpt_msi_enable_fc;

		break;



	default:

		ioc->msi_enable = 0;

		break;

	}

	if (ioc->errata_flag_1064)

		pci_disable_io_access(pdev);