Patch 1 of 4
From: Mike Miller <[email protected]>
This patch adds the PCI ID's for HP Smart Array Gen9 controllers. Please
consider this patch for inclusion.
Signed-off-by: Mike Miller <[email protected]>
---
drivers/scsi/hpsa.c | 25 +++++++++++++++++++++++++
include/linux/pci_ids.h | 1 +
2 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 7f4f790..ee71153 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -108,6 +108,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_CISSF, 0x103C, 0x334d},
+ {PCI_VENDOR_ID_HP, PCI_DEVICE_ID_HP_CISSH, 0x103C, 0x1929},
+ {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, 0x21C1},
+ {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, 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_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
PCI_CLASS_STORAGE_RAID << 8, 0xffff << 8, 0},
{0,}
@@ -143,6 +156,18 @@ static struct board_type products[] = {
{0x1926103C, "Smart Array", &SA5_access},
{0x1928103C, "Smart Array", &SA5_access},
{0x334d103C, "Smart Array P822se", &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},
+ {0x21C7103C, "Smart Array", &SA5_access},
+ {0x21C8103C, "Smart Array", &SA5_access},
+ {0x21C9103C, "Smart Array", &SA5_access},
{0xFFFF103C, "Unknown Smart Array", &SA5_access},
};
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 3bed2e8..2ce3926 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -756,6 +756,7 @@
#define PCI_DEVICE_ID_HP_CISSE 0x323a
#define PCI_DEVICE_ID_HP_CISSF 0x323b
#define PCI_DEVICE_ID_HP_CISSH 0x323c
+#define PCI_DEVICE_ID_HP_CISSI 0x3239
#define PCI_DEVICE_ID_HP_ZX2_IOC 0x4031
#define PCI_VENDOR_ID_PCTECH 0x1042
On Wed, 2013-09-04 at 15:05 -0500, Mike Miller wrote:
> Patch 1 of 4
>
> From: Mike Miller <[email protected]>
Just for future reference, doing it this way means I have to edit the
patch. The way git am works when applying patches is that if the first
body line is a keyword it recognises (like From: or Subject: or Date:)
it will fold that into the commit metadata, otherwise everything becomes
the commit message. So by putting the redundant "patch 1 of 4" first,
git thinks the entire body is the commit message.
James
> This patch adds the PCI ID's for HP Smart Array Gen9 controllers. Please
> consider this patch for inclusion.
>
> Signed-off-by: Mike Miller <[email protected]>
> ---
-----Original Message-----
From: James Bottomley [mailto:[email protected]]
Sent: Tuesday, September 10, 2013 5:02 PM
To: Miller, Mike (OS Dev)
Cc: Andrew Morton; LKML; LKML-scsi
Subject: Re: [PATCH 1/4] hpsa: add HP Smart Array Gen9 PCI ID's
On Wed, 2013-09-04 at 15:05 -0500, Mike Miller wrote:
> Patch 1 of 4
>
> From: Mike Miller <[email protected]>
Just for future reference, doing it this way means I have to edit the patch. The way git am works when applying patches is that if the first body line is a keyword it recognises (like From: or Subject: or Date:) it will fold that into the commit metadata, otherwise everything becomes the commit message. So by putting the redundant "patch 1 of 4" first, git thinks the entire body is the commit message.
James
Sorry about that. I didn't realize git worked that way. So let me ask a dumb question, just having [PATCH x/y] in the subject line is enough? Would you like me to resubmit the patchset?
-- mikem
> This patch adds the PCI ID's for HP Smart Array Gen9 controllers.
> Please consider this patch for inclusion.
>
> Signed-off-by: Mike Miller <[email protected]>
> ---
On Tue, 2013-09-10 at 22:17 +0000, Miller, Mike (OS Dev) wrote:
>
> -----Original Message-----
> From: James Bottomley [mailto:[email protected]]
> Sent: Tuesday, September 10, 2013 5:02 PM
> To: Miller, Mike (OS Dev)
> Cc: Andrew Morton; LKML; LKML-scsi
> Subject: Re: [PATCH 1/4] hpsa: add HP Smart Array Gen9 PCI ID's
>
> On Wed, 2013-09-04 at 15:05 -0500, Mike Miller wrote:
> > Patch 1 of 4
> >
> > From: Mike Miller <[email protected]>
>
> Just for future reference, doing it this way means I have to edit the patch. The way git am works when applying patches is that if the first body line is a keyword it recognises (like From: or Subject: or Date:) it will fold that into the commit metadata, otherwise everything becomes the commit message. So by putting the redundant "patch 1 of 4" first, git thinks the entire body is the commit message.
>
> James
>
> Sorry about that. I didn't realize git worked that way. So let me ask
> a dumb question, just having [PATCH x/y] in the subject line is
> enough?
Yes, that's what all the apply scripts go by.
> Would you like me to resubmit the patchset?
No; I just edited the messages this time.
James