Skip to contentSkip to conversation

cciss: fix PCI IDs for new Smart Array controllers

PATCH In review Mike Miller 2 participants 3 messages Oct 18, 2010

Subsystems (3)
SCSI Block layer PCI
lore
Share & tools
lore

Mike Miller

author
#0 lore raw

PATCH 1/1 cciss: fix PCI IDs for new Smart Array controllers

Patch 1 of 1
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 Mike Miller <[email protected]>
drivers/block/cciss.c +12 -10
index 5e4fadc..48c4af1 100644
@@ -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
index 10d3330..0a5dcb5 100644
@@ -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
#1 lore raw
Quoted 6 lines · On Mon, 18 Oct 2010 13:53:07 -0500 Mike Miller <[email protected]> wrote:

Patch 1 of 1
cciss: fix PCI IDs for new controllers

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

What was botched up about it?

What are the runtime effects of this change?

author
#2 lore raw
Quoted 16 lines

-----Original Message-----
From: Andrew Morton [mailto:[email protected]]
Sent: Monday, October 18, 2010 2:56 PM
To: Miller, Mike (OS Dev)
Cc: Jens Axboe; LKML; LKML-scsi
Subject: Re: [PATCH 1/1] cciss: fix PCI IDs for new Smart Array controllers

Quoted 3 lines · On Mon, 18 Oct 2010 13:53:07 -0500 Mike Miller <[email protected]> wrote:

Patch 1 of 1
cciss: fix PCI IDs for new controllers

Quoted 8 lines
Quoted 3 lines

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

What was botched up about it?

What are the runtime effects of this change?

The PCI subsystem ID's were wrong. They were 3250 to 3254. They should have been 335x. I also added another new controller that just popped up.

The runtime effects are the boards will not be recognized without this fix.

-- mikem