scsi: hpsa, add all PCI ID's that HP has in svn

PATCH In review Mike Miller 3 participants 6 messages Jan 16, 2014 – Jan 17, 2014

Subsystems (2)

SCSI Hewlett-packard smart array RAID driver (hpsa)

lore

Share & tools

lore

Mike Miller

author

2014-01-16 19:52 UTC #0 lore raw

PATCH 1/1 scsi: hpsa, add all PCI ID's that HP has in svn

From: Mike Miller <[email protected]>

This patch has every ID we have in our svn repository. Some controllers were cancelled, others added, now the cancelled ones are back. Apparently the debate rages on about which controllers are cancelled, which are not, whatever. Please accept this patch. It is dependent upon the patches I sent yesterday.
This patch made/tested against kernel-3.13.0-rc8

Signed-off-by Mike Miller <[email protected]>

---
 drivers/scsi/hpsa.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

drivers/scsi/hpsa.c +12 -0

index 348b207..3affec5 100644
@@ -100,6 +100,7 @@ static const struct pci_device_id hpsa_pci_device_id[] = {
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3354},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3355},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3356},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1920},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1921},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1922},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1923},

@@ -108,15 +109,19 @@ static const struct pci_device_id hpsa_pci_device_id[] = {
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1926},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1928},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1929},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x192A},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21BD},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21BE},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21BF},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21C0},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21C2},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21C3},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21C4},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21C5},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21C6},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21C7},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21C8},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21C9},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21CA},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21CB},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21CC},

@@ -149,22 +154,29 @@ static struct board_type products[] = {
 	{0x3354103C, "Smart Array P420i", &SA5_access},
 	{0x3355103C, "Smart Array P220i", &SA5_access},
 	{0x3356103C, "Smart Array P721m", &SA5_access},
+	{0x1920103C, "Smart Array P430i", &SA5_access},
 	{0x1921103C, "Smart Array P830i", &SA5_access},
 	{0x1922103C, "Smart Array P430", &SA5_access},
 	{0x1923103C, "Smart Array P431", &SA5_access},
 	{0x1924103C, "Smart Array P830", &SA5_access},
+	{0x1925103C, "Smart Array P831", &SA5_access},
 	{0x1926103C, "Smart Array P731m", &SA5_access},
 	{0x1928103C, "Smart Array P230i", &SA5_access},
 	{0x1929103C, "Smart Array P530", &SA5_access},
+	{0x192A103C, "Smart Array P531", &SA5_access},
 	{0x21BD103C, "Smart Array", &SA5_access},
 	{0x21BE103C, "Smart Array", &SA5_access},
 	{0x21BF103C, "Smart Array", &SA5_access},
 	{0x21C0103C, "Smart Array", &SA5_access},
+	{0x21C1103C, "Smart Array", &SA5_access},
 	{0x21C2103C, "Smart Array", &SA5_access},
 	{0x21C3103C, "Smart Array", &SA5_access},
+	{0x21C4103C, "Smart Array", &SA5_access},
 	{0x21C5103C, "Smart Array", &SA5_access},
+	{0x21C6103C, "Smart Array", &SA5_access},
 	{0x21C7103C, "Smart Array", &SA5_access},
 	{0x21C8103C, "Smart Array", &SA5_access},
+	{0x21C9103C, "Smart Array", &SA5_access},
 	{0x21CA103C, "Smart Array", &SA5_access},
 	{0x21CB103C, "Smart Array", &SA5_access},
 	{0x21CC103C, "Smart Array", &SA5_access},

Tomas Henzl

2014-01-17 15:13 UTC #1 lore raw

Quoted 55 lines · Mike Miller

From: Mike Miller <[email protected]>

Signed-off-by Mike Miller <[email protected]>

---
 drivers/scsi/hpsa.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

drivers/scsi/hpsa.c +6 -0

index 348b207..3affec5 100644
@@ -100,6 +100,7 @@ static const struct pci_device_id hpsa_pci_device_id[] = {
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3354},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3355},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C, 0x3356},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1920},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1921},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1922},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1923},

@@ -108,15 +109,19 @@ static const struct pci_device_id hpsa_pci_device_id[] = {
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1926},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1928},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x1929},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C, 0x192A},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21BD},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21BE},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21BF},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21C0},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21C2},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21C3},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21C4},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21C5},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21C6},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21C7},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21C8},
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21C9},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21CA},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21CB},
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C, 0x21CC},

@@ -149,22 +154,29 @@ static struct board_type products[] = {
 	{0x3354103C, "Smart Array P420i", &SA5_access},
 	{0x3355103C, "Smart Array P220i", &SA5_access},
 	{0x3356103C, "Smart Array P721m", &SA5_access},
+	{0x1920103C, "Smart Array P430i", &SA5_access},
 	{0x1921103C, "Smart Array P830i", &SA5_access},
 	{0x1922103C, "Smart Array P430", &SA5_access},
 	{0x1923103C, "Smart Array P431", &SA5_access},
 	{0x1924103C, "Smart Array P830", &SA5_access},

drivers/scsi/hpsa.c static struct board_type products[] = { · line 171

Quoted 10 lines

drivers/scsi/hpsa.c +3 -0

+	{0x1925103C, "Smart Array P831", &SA5_access},
 	{0x1926103C, "Smart Array P731m", &SA5_access},
 	{0x1928103C, "Smart Array P230i", &SA5_access},
 	{0x1929103C, "Smart Array P530", &SA5_access},
+	{0x192A103C, "Smart Array P531", &SA5_access},
 	{0x21BD103C, "Smart Array", &SA5_access},
 	{0x21BE103C, "Smart Array", &SA5_access},
 	{0x21BF103C, "Smart Array", &SA5_access},
 	{0x21C0103C, "Smart Array", &SA5_access},
+	{0x21C1103C, "Smart Array", &SA5_access},

I think that both tables should be in sync - but there is no 0x21c1 in hpsa_pci_device_id (and the 0x1925), could you clarify that?

Thanks, Tomas

Quoted 15 lines

drivers/scsi/hpsa.c +3 -1

 	{0x21C2103C, "Smart Array", &SA5_access},
 	{0x21C3103C, "Smart Array", &SA5_access},
+	{0x21C4103C, "Smart Array", &SA5_access},
 	{0x21C5103C, "Smart Array", &SA5_access},
+	{0x21C6103C, "Smart Array", &SA5_access},
 	{0x21C7103C, "Smart Array", &SA5_access},
 	{0x21C8103C, "Smart Array", &SA5_access},
+	{0x21C9103C, "Smart Array", &SA5_access},
 	{0x21CA103C, "Smart Array", &SA5_access},
 	{0x21CB103C, "Smart Array", &SA5_access},
 	{0x21CC103C, "Smart Array", &SA5_access},
--

To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Miller, Mike (OS Dev)

author

2014-01-17 15:17 UTC #2 lore raw

Quoted 107 lines

-----Original Message-----
From: Tomas Henzl [mailto:[email protected]]
Sent: Friday, January 17, 2014 9:14 AM
To: Miller, Mike (OS Dev); Andrew Morton; James E. J. Bottomley
Cc: LKML; LKML-scsi; [email protected]; Stephen M. Cameron
Subject: Re: [PATCH 1/1] scsi: hpsa, add all PCI ID's that HP has in svn
drivers/scsi/hpsa.c static const struct pci_device_id
Quoted 19 lines · Mike Miller
From: Mike Miller <[email protected]>
This patch has every ID we have in our svn repository. Some controllers were cancelled, others added, now the cancelled ones are back. Apparently the debate rages on about which controllers are cancelled, which are not, whatever. Please accept this patch. It is dependent upon the patches I sent yesterday.
This patch made/tested against kernel-3.13.0-rc8
Signed-off-by Mike Miller <[email protected]>
---
 drivers/scsi/hpsa.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
drivers/scsi/hpsa.c index renamed from drivers/scsi/hpsa.c +0 -0
348b207..3affec5 100644
drivers/scsi/hpsa.c +0 -0
@@ -100,6 +100,7 @@ static const struct pci_device_id
hpsa_pci_device_id[] = {
drivers/scsi/hpsa.c static const struct pci_device_id · line 100
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C,
0x3354},
drivers/scsi/hpsa.c static const struct pci_device_id · line 101
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C,
0x3355},
drivers/scsi/hpsa.c static const struct pci_device_id · line 102
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C,
0x3356},
drivers/scsi/hpsa.c static const struct pci_device_id · line 103
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1920},
drivers/scsi/hpsa.c static const struct pci_device_id · line 104
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1921},
drivers/scsi/hpsa.c static const struct pci_device_id · line 105
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1922},
drivers/scsi/hpsa.c static const struct pci_device_id · line 106
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1923},
drivers/scsi/hpsa.c static const struct pci_device_id
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
@@ -108,15 +109,19 @@ static const struct pci_device_id
hpsa_pci_device_id[] = {
drivers/scsi/hpsa.c static const struct pci_device_id · line 109
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1926},
drivers/scsi/hpsa.c static const struct pci_device_id · line 110
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1928},
drivers/scsi/hpsa.c static const struct pci_device_id · line 111
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1929},
drivers/scsi/hpsa.c static const struct pci_device_id · line 112
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x192A},
drivers/scsi/hpsa.c static const struct pci_device_id · line 113
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21BD},
drivers/scsi/hpsa.c static const struct pci_device_id · line 114
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21BE},
drivers/scsi/hpsa.c static const struct pci_device_id · line 115
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21BF},
drivers/scsi/hpsa.c static const struct pci_device_id · line 116
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C0},
drivers/scsi/hpsa.c static const struct pci_device_id · line 117
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C2},
drivers/scsi/hpsa.c static const struct pci_device_id · line 118
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C3},
drivers/scsi/hpsa.c static const struct pci_device_id · line 119
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C4},
drivers/scsi/hpsa.c static const struct pci_device_id · line 120
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C5},
drivers/scsi/hpsa.c static const struct pci_device_id · line 121
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C6},
drivers/scsi/hpsa.c static const struct pci_device_id · line 122
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C7},
drivers/scsi/hpsa.c static const struct pci_device_id · line 123
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C8},
drivers/scsi/hpsa.c static const struct pci_device_id · line 124
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C9},
drivers/scsi/hpsa.c static const struct pci_device_id · line 125
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21CA},
drivers/scsi/hpsa.c static const struct pci_device_id · line 126
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21CB},
drivers/scsi/hpsa.c static const struct pci_device_id · line 127
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21CC},
Quoted 9 lines
drivers/scsi/hpsa.c +1 -0
@@ -149,22 +154,29 @@ static struct board_type products[] = {
 	{0x3354103C, "Smart Array P420i", &SA5_access},
 	{0x3355103C, "Smart Array P220i", &SA5_access},
 	{0x3356103C, "Smart Array P721m", &SA5_access},
+	{0x1920103C, "Smart Array P430i", &SA5_access},
 	{0x1921103C, "Smart Array P830i", &SA5_access},
 	{0x1922103C, "Smart Array P430", &SA5_access},
 	{0x1923103C, "Smart Array P431", &SA5_access},
 	{0x1924103C, "Smart Array P830", &SA5_access},
drivers/scsi/hpsa.c static struct board_type products[] = { · line 171
Quoted 10 lines
drivers/scsi/hpsa.c +3 -0
+	{0x1925103C, "Smart Array P831", &SA5_access},
 	{0x1926103C, "Smart Array P731m", &SA5_access},
 	{0x1928103C, "Smart Array P230i", &SA5_access},
 	{0x1929103C, "Smart Array P530", &SA5_access},
+	{0x192A103C, "Smart Array P531", &SA5_access},
 	{0x21BD103C, "Smart Array", &SA5_access},
 	{0x21BE103C, "Smart Array", &SA5_access},
 	{0x21BF103C, "Smart Array", &SA5_access},
 	{0x21C0103C, "Smart Array", &SA5_access},
+	{0x21C1103C, "Smart Array", &SA5_access},
I think that both tables should be in sync - but there is no 0x21c1 in hpsa_pci_device_id (and the 0x1925), could you clarify that?

Quoted 1 line

Thanks, Tomas

Crap. It seems like these menial tasks get the better of me. I'll correct and resubmit.

-- mikem

Quoted 17 lines

Quoted 13 lines
drivers/scsi/hpsa.c +3 -1
 	{0x21C2103C, "Smart Array", &SA5_access},
 	{0x21C3103C, "Smart Array", &SA5_access},
+	{0x21C4103C, "Smart Array", &SA5_access},
 	{0x21C5103C, "Smart Array", &SA5_access},
+	{0x21C6103C, "Smart Array", &SA5_access},
 	{0x21C7103C, "Smart Array", &SA5_access},
 	{0x21C8103C, "Smart Array", &SA5_access},
+	{0x21C9103C, "Smart Array", &SA5_access},
 	{0x21CA103C, "Smart Array", &SA5_access},
 	{0x21CB103C, "Smart Array", &SA5_access},
 	{0x21CC103C, "Smart Array", &SA5_access},
--
Quoted 2 lines
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected] More
majordomo
Quoted 1 line
info at http://vger.kernel.org/majordomo-info.html

Hannes Reinecke

2014-01-17 15:31 UTC #3 lore raw

Quoted 107 lines · Mike (OS Dev)

Quoted 107 lines
-----Original Message-----
From: Tomas Henzl [mailto:[email protected]]
Sent: Friday, January 17, 2014 9:14 AM
To: Miller, Mike (OS Dev); Andrew Morton; James E. J. Bottomley
Cc: LKML; LKML-scsi; [email protected]; Stephen M. Cameron
Subject: Re: [PATCH 1/1] scsi: hpsa, add all PCI ID's that HP has in svn
drivers/scsi/hpsa.c static const struct pci_device_id
Quoted 19 lines · Mike Miller
From: Mike Miller <[email protected]>
This patch has every ID we have in our svn repository. Some controllers were cancelled, others added, now the cancelled ones are back. Apparently the debate rages on about which controllers are cancelled, which are not, whatever. Please accept this patch. It is dependent upon the patches I sent yesterday.
This patch made/tested against kernel-3.13.0-rc8
Signed-off-by Mike Miller <[email protected]>
---
 drivers/scsi/hpsa.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
drivers/scsi/hpsa.c index renamed from drivers/scsi/hpsa.c +0 -0
348b207..3affec5 100644
drivers/scsi/hpsa.c +0 -0
@@ -100,6 +100,7 @@ static const struct pci_device_id
hpsa_pci_device_id[] = {
drivers/scsi/hpsa.c static const struct pci_device_id · line 100
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C,
0x3354},
drivers/scsi/hpsa.c static const struct pci_device_id · line 101
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C,
0x3355},
drivers/scsi/hpsa.c static const struct pci_device_id · line 102
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C,
0x3356},
drivers/scsi/hpsa.c static const struct pci_device_id · line 103
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1920},
drivers/scsi/hpsa.c static const struct pci_device_id · line 104
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1921},
drivers/scsi/hpsa.c static const struct pci_device_id · line 105
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1922},
drivers/scsi/hpsa.c static const struct pci_device_id · line 106
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1923},
drivers/scsi/hpsa.c static const struct pci_device_id
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
@@ -108,15 +109,19 @@ static const struct pci_device_id
hpsa_pci_device_id[] = {
drivers/scsi/hpsa.c static const struct pci_device_id · line 109
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1926},
drivers/scsi/hpsa.c static const struct pci_device_id · line 110
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1928},
drivers/scsi/hpsa.c static const struct pci_device_id · line 111
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1929},
drivers/scsi/hpsa.c static const struct pci_device_id · line 112
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x192A},
drivers/scsi/hpsa.c static const struct pci_device_id · line 113
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21BD},
drivers/scsi/hpsa.c static const struct pci_device_id · line 114
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21BE},
drivers/scsi/hpsa.c static const struct pci_device_id · line 115
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21BF},
drivers/scsi/hpsa.c static const struct pci_device_id · line 116
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C0},
drivers/scsi/hpsa.c static const struct pci_device_id · line 117
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C2},
drivers/scsi/hpsa.c static const struct pci_device_id · line 118
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C3},
drivers/scsi/hpsa.c static const struct pci_device_id · line 119
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C4},
drivers/scsi/hpsa.c static const struct pci_device_id · line 120
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C5},
drivers/scsi/hpsa.c static const struct pci_device_id · line 121
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C6},
drivers/scsi/hpsa.c static const struct pci_device_id · line 122
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C7},
drivers/scsi/hpsa.c static const struct pci_device_id · line 123
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C8},
drivers/scsi/hpsa.c static const struct pci_device_id · line 124
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C9},
drivers/scsi/hpsa.c static const struct pci_device_id · line 125
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21CA},
drivers/scsi/hpsa.c static const struct pci_device_id · line 126
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21CB},
drivers/scsi/hpsa.c static const struct pci_device_id · line 127
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21CC},
Quoted 9 lines
drivers/scsi/hpsa.c +1 -0
@@ -149,22 +154,29 @@ static struct board_type products[] = {
 	{0x3354103C, "Smart Array P420i", &SA5_access},
 	{0x3355103C, "Smart Array P220i", &SA5_access},
 	{0x3356103C, "Smart Array P721m", &SA5_access},
+	{0x1920103C, "Smart Array P430i", &SA5_access},
 	{0x1921103C, "Smart Array P830i", &SA5_access},
 	{0x1922103C, "Smart Array P430", &SA5_access},
 	{0x1923103C, "Smart Array P431", &SA5_access},
 	{0x1924103C, "Smart Array P830", &SA5_access},
drivers/scsi/hpsa.c static struct board_type products[] = { · line 171
Quoted 10 lines
drivers/scsi/hpsa.c +3 -0
+	{0x1925103C, "Smart Array P831", &SA5_access},
 	{0x1926103C, "Smart Array P731m", &SA5_access},
 	{0x1928103C, "Smart Array P230i", &SA5_access},
 	{0x1929103C, "Smart Array P530", &SA5_access},
+	{0x192A103C, "Smart Array P531", &SA5_access},
 	{0x21BD103C, "Smart Array", &SA5_access},
 	{0x21BE103C, "Smart Array", &SA5_access},
 	{0x21BF103C, "Smart Array", &SA5_access},
 	{0x21C0103C, "Smart Array", &SA5_access},
+	{0x21C1103C, "Smart Array", &SA5_access},
I think that both tables should be in sync - but there is no 0x21c1 in hpsa_pci_device_id (and the 0x1925), could you clarify that?

Quoted 4 lines

Quoted 1 line
Thanks, Tomas
Crap. It seems like these menial tasks get the better of me. I'll correct and resubmit.

Hmm. Seeing that hpsa is now well capable of supporting even older SmartArray controllers, is there really a point in updating the PCI-ID list every time?
Wouldn't you be better off by just using the catch-all phrase and remove all the individual IDs?

That way you would just have to update _one_ list ...

Cheers,

Hannes

Signature · 8 lines

Dr. Hannes Reinecke		      zSeries & Storage
[email protected]			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Tomas Henzl

2014-01-17 15:46 UTC #4 lore raw

Quoted 106 lines · Hannes Reinecke

Quoted 105 lines · Mike (OS Dev)
Quoted 105 lines
-----Original Message-----
From: Tomas Henzl [mailto:[email protected]]
Sent: Friday, January 17, 2014 9:14 AM
To: Miller, Mike (OS Dev); Andrew Morton; James E. J. Bottomley
Cc: LKML; LKML-scsi; [email protected]; Stephen M. Cameron
Subject: Re: [PATCH 1/1] scsi: hpsa, add all PCI ID's that HP has in svn
drivers/scsi/hpsa.c static const struct pci_device_id
Quoted 19 lines · Mike Miller
From: Mike Miller <[email protected]>
This patch has every ID we have in our svn repository. Some controllers were cancelled, others added, now the cancelled ones are back. Apparently the debate rages on about which controllers are cancelled, which are not, whatever. Please accept this patch. It is dependent upon the patches I sent yesterday.
This patch made/tested against kernel-3.13.0-rc8
Signed-off-by Mike Miller <[email protected]>
---
 drivers/scsi/hpsa.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
drivers/scsi/hpsa.c index renamed from drivers/scsi/hpsa.c +0 -0
348b207..3affec5 100644
drivers/scsi/hpsa.c +0 -0
@@ -100,6 +100,7 @@ static const struct pci_device_id
hpsa_pci_device_id[] = {
drivers/scsi/hpsa.c static const struct pci_device_id · line 100
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C,
0x3354},
drivers/scsi/hpsa.c static const struct pci_device_id · line 101
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C,
0x3355},
drivers/scsi/hpsa.c static const struct pci_device_id · line 102
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C,
0x3356},
drivers/scsi/hpsa.c static const struct pci_device_id · line 103
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1920},
drivers/scsi/hpsa.c static const struct pci_device_id · line 104
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1921},
drivers/scsi/hpsa.c static const struct pci_device_id · line 105
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1922},
drivers/scsi/hpsa.c static const struct pci_device_id · line 106
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1923},
drivers/scsi/hpsa.c static const struct pci_device_id
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
@@ -108,15 +109,19 @@ static const struct pci_device_id
hpsa_pci_device_id[] = {
drivers/scsi/hpsa.c static const struct pci_device_id · line 109
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1926},
drivers/scsi/hpsa.c static const struct pci_device_id · line 110
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1928},
drivers/scsi/hpsa.c static const struct pci_device_id · line 111
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1929},
drivers/scsi/hpsa.c static const struct pci_device_id · line 112
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x192A},
drivers/scsi/hpsa.c static const struct pci_device_id · line 113
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21BD},
drivers/scsi/hpsa.c static const struct pci_device_id · line 114
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21BE},
drivers/scsi/hpsa.c static const struct pci_device_id · line 115
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21BF},
drivers/scsi/hpsa.c static const struct pci_device_id · line 116
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C0},
drivers/scsi/hpsa.c static const struct pci_device_id · line 117
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C2},
drivers/scsi/hpsa.c static const struct pci_device_id · line 118
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C3},
drivers/scsi/hpsa.c static const struct pci_device_id · line 119
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C4},
drivers/scsi/hpsa.c static const struct pci_device_id · line 120
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C5},
drivers/scsi/hpsa.c static const struct pci_device_id · line 121
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C6},
drivers/scsi/hpsa.c static const struct pci_device_id · line 122
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C7},
drivers/scsi/hpsa.c static const struct pci_device_id · line 123
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C8},
drivers/scsi/hpsa.c static const struct pci_device_id · line 124
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C9},
drivers/scsi/hpsa.c static const struct pci_device_id · line 125
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21CA},
drivers/scsi/hpsa.c static const struct pci_device_id · line 126
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21CB},
drivers/scsi/hpsa.c static const struct pci_device_id · line 127
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21CC},
Quoted 9 lines
drivers/scsi/hpsa.c +1 -0
@@ -149,22 +154,29 @@ static struct board_type products[] = {
 	{0x3354103C, "Smart Array P420i", &SA5_access},
 	{0x3355103C, "Smart Array P220i", &SA5_access},
 	{0x3356103C, "Smart Array P721m", &SA5_access},
+	{0x1920103C, "Smart Array P430i", &SA5_access},
 	{0x1921103C, "Smart Array P830i", &SA5_access},
 	{0x1922103C, "Smart Array P430", &SA5_access},
 	{0x1923103C, "Smart Array P431", &SA5_access},
 	{0x1924103C, "Smart Array P830", &SA5_access},
drivers/scsi/hpsa.c static struct board_type products[] = { · line 171
Quoted 10 lines
drivers/scsi/hpsa.c +3 -0
+	{0x1925103C, "Smart Array P831", &SA5_access},
 	{0x1926103C, "Smart Array P731m", &SA5_access},
 	{0x1928103C, "Smart Array P230i", &SA5_access},
 	{0x1929103C, "Smart Array P530", &SA5_access},
+	{0x192A103C, "Smart Array P531", &SA5_access},
 	{0x21BD103C, "Smart Array", &SA5_access},
 	{0x21BE103C, "Smart Array", &SA5_access},
 	{0x21BF103C, "Smart Array", &SA5_access},
 	{0x21C0103C, "Smart Array", &SA5_access},
+	{0x21C1103C, "Smart Array", &SA5_access},
I think that both tables should be in sync - but there is no 0x21c1 in hpsa_pci_device_id (and the 0x1925), could you clarify that?

Quoted 6 lines

Quoted 3 lines
Quoted 1 line
Thanks, Tomas
Crap. It seems like these menial tasks get the better of me. I'll correct and resubmit.
Hmm. Seeing that hpsa is now well capable of supporting even older SmartArray controllers, is there really a point in updating the PCI-ID list every time?

It depends on whether HP actually wishes to support even the oldest cciss devices this way, I'm not sure if all the devices were individually tested with hpsa driver.

Cheers, Tomas

Quoted 8 lines

Wouldn't you be better off by just using the catch-all phrase and remove all the individual IDs?
That way you would just have to update _one_ list ...
Cheers,
Hannes

Miller, Mike (OS Dev)

author

2014-01-17 16:01 UTC #5 lore raw

In reply to Hannes Reinecke

Quoted 121 lines

-----Original Message-----
From: Hannes Reinecke [mailto:[email protected]]
Sent: Friday, January 17, 2014 9:31 AM
To: Miller, Mike (OS Dev)
Cc: Tomas Henzl; Andrew Morton; James E. J. Bottomley; LKML; LKML-scsi; Stephen M. Cameron
Subject: Re: [PATCH 1/1] scsi: hpsa, add all PCI ID's that HP has in svn
Quoted 110 lines · Mike (OS Dev)
Quoted 109 lines
-----Original Message-----
From: Tomas Henzl [mailto:[email protected]]
Sent: Friday, January 17, 2014 9:14 AM
To: Miller, Mike (OS Dev); Andrew Morton; James E. J. Bottomley
Cc: LKML; LKML-scsi; [email protected]; Stephen M. Cameron
Subject: Re: [PATCH 1/1] scsi: hpsa, add all PCI ID's that HP has in svn
drivers/scsi/hpsa.c static const struct pci_device_id
Quoted 19 lines · Mike Miller
From: Mike Miller <[email protected]>
This patch has every ID we have in our svn repository. Some controllers were cancelled, others added, now the cancelled ones are back. Apparently the debate rages on about which controllers are cancelled, which are not, whatever. Please accept this patch. It is dependent upon the patches I sent yesterday.
This patch made/tested against kernel-3.13.0-rc8
Signed-off-by Mike Miller <[email protected]>
---
 drivers/scsi/hpsa.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)
drivers/scsi/hpsa.c index renamed from drivers/scsi/hpsa.c +0 -0
348b207..3affec5 100644
drivers/scsi/hpsa.c +0 -0
@@ -100,6 +100,7 @@ static const struct pci_device_id
hpsa_pci_device_id[] = {
drivers/scsi/hpsa.c static const struct pci_device_id · line 100
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C,
0x3354},
drivers/scsi/hpsa.c static const struct pci_device_id · line 101
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C,
0x3355},
drivers/scsi/hpsa.c static const struct pci_device_id · line 102
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSF,     0x103C,
0x3356},
drivers/scsi/hpsa.c static const struct pci_device_id · line 103
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1920},
drivers/scsi/hpsa.c static const struct pci_device_id · line 104
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1921},
drivers/scsi/hpsa.c static const struct pci_device_id · line 105
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1922},
drivers/scsi/hpsa.c static const struct pci_device_id · line 106
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1923},
drivers/scsi/hpsa.c static const struct pci_device_id
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
@@ -108,15 +109,19 @@ static const struct pci_device_id
hpsa_pci_device_id[] = {
drivers/scsi/hpsa.c static const struct pci_device_id · line 109
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1926},
drivers/scsi/hpsa.c static const struct pci_device_id · line 110
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1928},
drivers/scsi/hpsa.c static const struct pci_device_id · line 111
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x1929},
drivers/scsi/hpsa.c static const struct pci_device_id · line 112
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSH,     0x103C,
0x192A},
drivers/scsi/hpsa.c static const struct pci_device_id · line 113
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21BD},
drivers/scsi/hpsa.c static const struct pci_device_id · line 114
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21BE},
drivers/scsi/hpsa.c static const struct pci_device_id · line 115
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21BF},
drivers/scsi/hpsa.c static const struct pci_device_id · line 116
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C0},
drivers/scsi/hpsa.c static const struct pci_device_id · line 117
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C2},
drivers/scsi/hpsa.c static const struct pci_device_id · line 118
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C3},
drivers/scsi/hpsa.c static const struct pci_device_id · line 119
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C4},
drivers/scsi/hpsa.c static const struct pci_device_id · line 120
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C5},
drivers/scsi/hpsa.c static const struct pci_device_id · line 121
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C6},
drivers/scsi/hpsa.c static const struct pci_device_id · line 122
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C7},
drivers/scsi/hpsa.c static const struct pci_device_id · line 123
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C8},
drivers/scsi/hpsa.c static const struct pci_device_id · line 124
Quoted 1 line
drivers/scsi/hpsa.c +1 -0
+	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21C9},
drivers/scsi/hpsa.c static const struct pci_device_id · line 125
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21CA},
drivers/scsi/hpsa.c static const struct pci_device_id · line 126
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21CB},
drivers/scsi/hpsa.c static const struct pci_device_id · line 127
Quoted 1 line
drivers/scsi/hpsa.c +0 -0
 	{PCI_VENDOR_ID_HP,     PCI_DEVICE_ID_HP_CISSI,     0x103C,
0x21CC},
Quoted 9 lines
drivers/scsi/hpsa.c +1 -0
@@ -149,22 +154,29 @@ static struct board_type products[] = {
 	{0x3354103C, "Smart Array P420i", &SA5_access},
 	{0x3355103C, "Smart Array P220i", &SA5_access},
 	{0x3356103C, "Smart Array P721m", &SA5_access},
+	{0x1920103C, "Smart Array P430i", &SA5_access},
 	{0x1921103C, "Smart Array P830i", &SA5_access},
 	{0x1922103C, "Smart Array P430", &SA5_access},
 	{0x1923103C, "Smart Array P431", &SA5_access},
 	{0x1924103C, "Smart Array P830", &SA5_access},
drivers/scsi/hpsa.c static struct board_type products[] = { · line 171
Quoted 10 lines
drivers/scsi/hpsa.c +3 -0
+	{0x1925103C, "Smart Array P831", &SA5_access},
 	{0x1926103C, "Smart Array P731m", &SA5_access},
 	{0x1928103C, "Smart Array P230i", &SA5_access},
 	{0x1929103C, "Smart Array P530", &SA5_access},
+	{0x192A103C, "Smart Array P531", &SA5_access},
 	{0x21BD103C, "Smart Array", &SA5_access},
 	{0x21BE103C, "Smart Array", &SA5_access},
 	{0x21BF103C, "Smart Array", &SA5_access},
 	{0x21C0103C, "Smart Array", &SA5_access},
+	{0x21C1103C, "Smart Array", &SA5_access},
I think that both tables should be in sync - but there is no 0x21c1 in hpsa_pci_device_id (and the 0x1925), could you clarify that?
Thanks, Tomas

Quoted 7 lines

Quoted 1 line
Crap. It seems like these menial tasks get the better of me. I'll correct and
resubmit.
Quoted 1 line
Hmm. Seeing that hpsa is now well capable of supporting even older SmartArray controllers, is there really a point in updating the PCI-ID list every time?
Wouldn't you be better off by just using the catch-all phrase and remove all

Umm, if we did that but kept the PCI ID repository updated would lspci still show the marketing names of the individual controllers? What about /proc/scsi/scsi and anywhere else the names are listed?

-- mikem

Quoted 12 lines

the individual IDs?
That way you would just have to update _one_ list ...
Cheers,
Hannes
--
Dr. Hannes Reinecke zSeries & Storage
[email protected] +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)