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

Commit 185eb31c authored by Brian King's avatar Brian King Committed by James Bottomley
Browse files

[SCSI] ipr: Add new PCI-E IDs to device table 



Adds support for some new PCI-E ipr adapters.

Signed-off-by: default avatarBrian King <brking@linux.vnet.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 7d2267bb

drivers/scsi/ipr.c

+10 −0
Original line number Diff line number Diff line
@@ -7557,6 +7557,13 @@ static struct pci_device_id ipr_pci_table[] __devinitdata = { 
	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN,

	      PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_575C, 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_574E, 0, 0, 0 },

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

	      PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B7, 0, 0,

	      IPR_USE_LONG_TRANSOP_TIMEOUT },
@@ -7570,6 +7577,9 @@ 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 },

	{ }

};

MODULE_DEVICE_TABLE(pci, ipr_pci_table);

drivers/scsi/ipr.h

+5 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
#define IPR_NUM_BASE_CMD_BLKS				100



#define PCI_DEVICE_ID_IBM_OBSIDIAN_E	0x0339

#define PCI_DEVICE_ID_IBM_SCAMP_E		0x034A



#define IPR_SUBS_DEV_ID_2780	0x0264

#define IPR_SUBS_DEV_ID_5702	0x0266
@@ -69,8 +70,12 @@ 
#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