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

Commit 6362beea authored by Mike Miller's avatar Mike Miller Committed by Jens Axboe
Browse files

cciss: fix PCI IDs for new Smart Array controllers 



cciss: fix PCI IDs for new controllers

This patch fixes the botched up PCI IDs of new controllers. Please consider
this patch for inclusion.

Signed-off-by: default avatarMike Miller <mike.miller@hp.com>
Signed-off-by: default avatarJens Axboe <jaxboe@fusionio.com>
parent 5dbfe7ae

drivers/block/cciss.c

+12 −10
Original line number Diff line number Diff line
@@ -105,11 +105,12 @@ static const struct pci_device_id cciss_pci_device_id[] = { 
	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3249},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x324A},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x324B},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3250},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3251},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3252},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3253},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSE,     0x103C, 0x3254},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3350},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3351},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3352},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3353},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3354},

	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3355},

	{0,}

};
@@ -149,11 +150,12 @@ static struct board_type products[] = { 
	{0x3249103C, "Smart Array P812", &SA5_access},

	{0x324A103C, "Smart Array P712m", &SA5_access},

	{0x324B103C, "Smart Array P711m", &SA5_access},

	{0x3250103C, "Smart Array", &SA5_access},

	{0x3251103C, "Smart Array", &SA5_access},

	{0x3252103C, "Smart Array", &SA5_access},

	{0x3253103C, "Smart Array", &SA5_access},

	{0x3254103C, "Smart Array", &SA5_access},

	{0x3350103C, "Smart Array", &SA5_access},

	{0x3351103C, "Smart Array", &SA5_access},

	{0x3352103C, "Smart Array", &SA5_access},

	{0x3353103C, "Smart Array", &SA5_access},

	{0x3354103C, "Smart Array", &SA5_access},

	{0x3355103C, "Smart Array", &SA5_access},

};



/* How long to wait (in milliseconds) for board to go into simple mode */

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -739,6 +739,7 @@ 
#define PCI_DEVICE_ID_HP_CISSC		0x3230

#define PCI_DEVICE_ID_HP_CISSD		0x3238

#define PCI_DEVICE_ID_HP_CISSE		0x323a

#define PCI_DEVICE_ID_HP_CISSF		0x323b

#define PCI_DEVICE_ID_HP_ZX2_IOC	0x4031



#define PCI_VENDOR_ID_PCTECH		0x1042