Commit d7b4627f authored by Wayne Boyer's avatar Wayne Boyer Committed by James Bottomley
Browse files

[SCSI] ipr: adds PCI ID definitions for new adapters 



This patch adds the PCI ID definitions for new adapters based on the next
generation 64 bit IOA PCI interface chip.  New entries have been added to the
ipr_pci_table[] array for the adapters and to the ipr_chip[] array for the new
versions of the chip.

Older entries have been removed for cards that did not ship.

Signed-off-by: default avatarWayne Boyer <wayneb@linux.vnet.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 5aa3a333

drivers/scsi/ipr.c

+19 −7
Original line number Diff line number Diff line
@@ -178,7 +178,9 @@ static const struct ipr_chip_t ipr_chip[] = { 
	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN, IPR_USE_LSI, IPR_SIS32, &ipr_chip_cfg[0] },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E, IPR_USE_MSI, IPR_SIS32, &ipr_chip_cfg[0] },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_SNIPE, IPR_USE_LSI, IPR_SIS32, &ipr_chip_cfg[1] },

	{ PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP, IPR_USE_LSI, IPR_SIS32, &ipr_chip_cfg[1] }

	{ PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP, IPR_USE_LSI, IPR_SIS32, &ipr_chip_cfg[1] },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2, IPR_USE_MSI, IPR_SIS64, &ipr_chip_cfg[2] },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2, IPR_USE_MSI, IPR_SIS64, &ipr_chip_cfg[2] }

};



static int ipr_max_bus_speeds [] = {
@@ -8824,9 +8826,6 @@ static struct pci_device_id ipr_pci_table[] __devinitdata = { 
	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,

	      PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_574E, 0, 0,

	      IPR_USE_LONG_TRANSOP_TIMEOUT },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,

	      PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575D, 0, 0,

	      IPR_USE_LONG_TRANSOP_TIMEOUT },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,

	      PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B3, 0, 0, 0 },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN_E,
@@ -8842,9 +8841,22 @@ static struct pci_device_id ipr_pci_table[] __devinitdata = { 
	{ PCI_VENDOR_ID_ADAPTEC2, PCI_DEVICE_ID_ADAPTEC2_SCAMP,

		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_572F, 0, 0,

		IPR_USE_LONG_TRANSOP_TIMEOUT },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_SCAMP_E,

		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_574D, 0, 0,

		IPR_USE_LONG_TRANSOP_TIMEOUT },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,

		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B5, 0, 0, 0 },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,

		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_574D, 0, 0, 0 },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,

		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B2, 0, 0, 0 },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2,

		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B4, 0, 0, 0 },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2,

		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B1, 0, 0, 0 },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2,

		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57C6, 0, 0, 0 },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2,

		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575D, 0, 0, 0 },

	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2,

		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57CE, 0, 0, 0 },

	{ }

};

MODULE_DEVICE_TABLE(pci, ipr_pci_table);

drivers/scsi/ipr.h

+16 −5
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ 
/*

 * Literals

 */

#define IPR_DRIVER_VERSION "2.4.3"

#define IPR_DRIVER_DATE "(June 10, 2009)"

#define IPR_DRIVER_VERSION "2.5.0"

#define IPR_DRIVER_DATE "(February 11, 2010)"



/*

 * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding
@@ -55,7 +55,9 @@ 
#define IPR_NUM_BASE_CMD_BLKS				100



#define PCI_DEVICE_ID_IBM_OBSIDIAN_E	0x0339

#define PCI_DEVICE_ID_IBM_SCAMP_E		0x034A



#define PCI_DEVICE_ID_IBM_CROC_FPGA_E2          0x033D

#define PCI_DEVICE_ID_IBM_CROC_ASIC_E2          0x034A



#define IPR_SUBS_DEV_ID_2780	0x0264

#define IPR_SUBS_DEV_ID_5702	0x0266
@@ -70,15 +72,24 @@ 
#define IPR_SUBS_DEV_ID_572A	0x02C1

#define IPR_SUBS_DEV_ID_572B	0x02C2

#define IPR_SUBS_DEV_ID_572F	0x02C3

#define IPR_SUBS_DEV_ID_574D	0x030B

#define IPR_SUBS_DEV_ID_574E	0x030A

#define IPR_SUBS_DEV_ID_575B	0x030D

#define IPR_SUBS_DEV_ID_575C	0x0338

#define IPR_SUBS_DEV_ID_575D	0x033E

#define IPR_SUBS_DEV_ID_57B3	0x033A

#define IPR_SUBS_DEV_ID_57B7	0x0360

#define IPR_SUBS_DEV_ID_57B8	0x02C2



#define IPR_SUBS_DEV_ID_57B4    0x033B

#define IPR_SUBS_DEV_ID_57B2    0x035F

#define IPR_SUBS_DEV_ID_57C6    0x0357



#define IPR_SUBS_DEV_ID_57B5    0x033C

#define IPR_SUBS_DEV_ID_57CE    0x035E

#define IPR_SUBS_DEV_ID_57B1    0x0355



#define IPR_SUBS_DEV_ID_574D    0x0356

#define IPR_SUBS_DEV_ID_575D    0x035D



#define IPR_NAME				"ipr"



/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE