Commit 5da61410 authored by Anil Ravindranath's avatar Anil Ravindranath Committed by James Bottomley
Browse files

[SCSI] pmcraid: disable msix and expand device config entry 



Firmware requires a larger configuration entry size than the driver
currently allows, and MSI-X pretty much doesn't work with current FW,
so disable it for now.

Signed-off-by: default avatarAnil Ravindranath <anil_ravindranath@pmc-sierra.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent c7a841f3

drivers/scsi/pmcraid.c

+3 −1
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ 
static unsigned int pmcraid_debug_log;

static unsigned int pmcraid_disable_aen;

static unsigned int pmcraid_log_level = IOASC_LOG_LEVEL_MUST;

static unsigned int pmcraid_enable_msix;



/*

 * Data structures to support multiple adapters by the LLD.
@@ -4691,7 +4692,8 @@ pmcraid_register_interrupt_handler(struct pmcraid_instance *pinstance) 
	int rc;

	struct pci_dev *pdev = pinstance->pdev;



	if (pci_find_capability(pdev, PCI_CAP_ID_MSIX)) {

	if ((pmcraid_enable_msix) &&

		(pci_find_capability(pdev, PCI_CAP_ID_MSIX))) {

		int num_hrrq = PMCRAID_NUM_MSIX_VECTORS;

		struct msix_entry entries[PMCRAID_NUM_MSIX_VECTORS];

		int i;

drivers/scsi/pmcraid.h

+2 −4
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
 */

#define PMCRAID_DRIVER_NAME		"PMC MaxRAID"

#define PMCRAID_DEVFILE			"pmcsas"

#define PMCRAID_DRIVER_VERSION		"2.0.3"

#define PMCRAID_DRIVER_VERSION		"1.0.3"

#define PMCRAID_DRIVER_DATE		__DATE__



#define PMCRAID_FW_VERSION_1		0x002
@@ -333,11 +333,9 @@ struct pmcraid_config_table_entry { 
	__u8  lun[PMCRAID_LUN_LEN];

} __attribute__((packed, aligned(4)));



/* extended configuration table sizes are of 64 bytes in size */

#define PMCRAID_CFGTE_EXT_SIZE	32

/* extended configuration table sizes are also of 32 bytes in size */

struct pmcraid_config_table_entry_ext {

	struct pmcraid_config_table_entry cfgte;

	__u8  cfgte_ext[PMCRAID_CFGTE_EXT_SIZE];

};



/* resource types (config_table_entry.resource_type values) */