ipr: add CCIN definition for Blue Hawk adapter

PATCH New Wayne Boyer 3 participants 7 messages Oct 20, 2011 – Oct 27, 2011 1 message not in the archive

Subsystems (2)

SCSI IBM Power Linux RAID adapter

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Wayne Boyer

author

2011-10-20 14:57 UTC #1 lore raw

PATCH 1/1 ipr: add CCIN definition for Blue Hawk adapter

Add the appropriate definitions and table entry for the Blue Hawk adapter.

Signed-off-by Wayne Boyer <[email protected]>

---
 drivers/scsi/ipr.c |    4 +++-
 drivers/scsi/ipr.h |    1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

drivers/scsi/ipr.c +3 -1

Index: b/drivers/scsi/ipr.c
===================================================================
@@ -9114,8 +9114,10 @@ static struct pci_device_id ipr_pci_tabl
 	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,
 		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B2, 0, 0, 0 },
 	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,
-		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57C4, 0, 0, 0 },
+		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57C3, 0, 0, 0 },
 	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2,
+		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57C4, 0, 0, 0 },
+	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,
 		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B4, 0, 0, 0 },
 	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2,
 		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B1, 0, 0, 0 },

drivers/scsi/ipr.h +1 -0

Index: b/drivers/scsi/ipr.h
===================================================================
@@ -82,6 +82,7 @@
 
 #define IPR_SUBS_DEV_ID_57B4    0x033B
 #define IPR_SUBS_DEV_ID_57B2    0x035F
+#define IPR_SUBS_DEV_ID_57C3    0x0353
 #define IPR_SUBS_DEV_ID_57C4    0x0354
 #define IPR_SUBS_DEV_ID_57C6    0x0357
 #define IPR_SUBS_DEV_ID_57CC    0x035C

Wayne Boyer

author

2011-10-20 16:27 UTC #2 lore raw

PATCH RESEND 1/1 ipr: add definitions for additional adapter

In reply to a message not in the archive

Add the appropriate definitions and table entry for an additional adapter.

Signed-off-by Wayne Boyer <[email protected]>

---
 drivers/scsi/ipr.c |    4 +++-
 drivers/scsi/ipr.h |    1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

drivers/scsi/ipr.c +3 -1

Index: b/drivers/scsi/ipr.c
===================================================================
@@ -9114,8 +9114,10 @@ static struct pci_device_id ipr_pci_tabl
 	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,
 		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B2, 0, 0, 0 },
 	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,
-		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57C4, 0, 0, 0 },
+		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57C3, 0, 0, 0 },
 	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2,
+		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57C4, 0, 0, 0 },
+	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,
 		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B4, 0, 0, 0 },
 	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2,
 		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B1, 0, 0, 0 },

drivers/scsi/ipr.h +1 -0

Index: b/drivers/scsi/ipr.h
===================================================================
@@ -82,6 +82,7 @@
 
 #define IPR_SUBS_DEV_ID_57B4    0x033B
 #define IPR_SUBS_DEV_ID_57B2    0x035F
+#define IPR_SUBS_DEV_ID_57C3    0x0353
 #define IPR_SUBS_DEV_ID_57C4    0x0354
 #define IPR_SUBS_DEV_ID_57C6    0x0357
 #define IPR_SUBS_DEV_ID_57CC    0x035C

James Bottomley

2011-10-20 18:04 UTC #3 lore raw

Re: [RESEND][PATCH 1/1] ipr: add definitions for additional adapter

Quoted 1 line · Wayne Boyer

Add the appropriate definitions and table entry for an additional adapter.

This is the same patch except that the description is less descriptive ... is there some reason for that?

James

Wayne Boyer

author

2011-10-20 19:29 UTC #4 lore raw

Re: [RESEND][PATCH 1/1] ipr: add definitions for additional adapter

Quoted 6 lines · James Bottomley

Quoted 1 line · Wayne Boyer
Add the appropriate definitions and table entry for an additional adapter.
This is the same patch except that the description is less descriptive ... is there some reason for that?

Yes, the reason is that the name used in the first patch is an internal name. It won't be used outside of IBM and we don't want to cause any confusion.

Wayne

Brian King

Acked-by on v1 1/1

2011-10-24 18:20 UTC #5 lore raw

Re: [RESEND][PATCH 1/1] ipr: add definitions for additional adapter

In reply to Wayne Boyer

Quoted 3 lines · Wayne Boyer

Add the appropriate definitions and table entry for an additional adapter.
Signed-off-by Wayne Boyer <[email protected]>

Acked-by Brian King <[email protected]>

Signature · 3 lines

Brian King
Linux on Power Virtualization
IBM Linux Technology Center

Wayne Boyer

author

2011-10-27 18:50 UTC #6 lore raw

Re: [RESEND][PATCH 1/1] ipr: add definitions for additional adapter

In reply to Wayne Boyer

This patch is not correct. It will break support for the 57C4 adapter. New patch to follow.

Wayne

Quoted 42 lines · Wayne Boyer

Add the appropriate definitions and table entry for an additional adapter.
Signed-off-by Wayne Boyer <[email protected]>
---
 drivers/scsi/ipr.c |    4 +++-
 drivers/scsi/ipr.h |    1 +
 2 files changed, 4 insertions(+), 1 deletion(-)
Index: b/drivers/scsi/ipr.c
===================================================================
drivers/scsi/ipr.c +3 -1
@@ -9114,8 +9114,10 @@ static struct pci_device_id ipr_pci_tabl
 	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,
 		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B2, 0, 0, 0 },
 	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,
-		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57C4, 0, 0, 0 },
+		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57C3, 0, 0, 0 },
 	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2,
+		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57C4, 0, 0, 0 },
+	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,
 		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B4, 0, 0, 0 },
 	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2,
 		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B1, 0, 0, 0 },
Index: b/drivers/scsi/ipr.h
===================================================================
drivers/scsi/ipr.h +1 -1
@@ -82,6 +82,7 @@
 
 #define IPR_SUBS_DEV_ID_57B4    0x033B
 #define IPR_SUBS_DEV_ID_57B2    0x035F
+#define IPR_SUBS_DEV_ID_57C3    0x0353
 #define IPR_SUBS_DEV_ID_57C4    0x0354
 #define IPR_SUBS_DEV_ID_57C6    0x0357
 #define IPR_SUBS_DEV_ID_57CC    0x035C
 
--
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

Wayne Boyer

author

2011-10-27 19:09 UTC #7 lore raw

Re: [RESEND][PATCH 1/1] ipr: add definitions for additional adapter

In reply to Wayne Boyer

Here is the corrected patch.

---

Add the appropriate definition and table entry for an additional adapter.

Signed-off-by Wayne Boyer <[email protected]>

---
 drivers/scsi/ipr.c |    2 ++
 drivers/scsi/ipr.h |    1 +
 2 files changed, 3 insertions(+)

drivers/scsi/ipr.h +1 -0

Index: b/drivers/scsi/ipr.h
===================================================================
@@ -82,6 +82,7 @@
 
 #define IPR_SUBS_DEV_ID_57B4    0x033B
 #define IPR_SUBS_DEV_ID_57B2    0x035F
+#define IPR_SUBS_DEV_ID_57C3    0x0353
 #define IPR_SUBS_DEV_ID_57C4    0x0354
 #define IPR_SUBS_DEV_ID_57C6    0x0357
 #define IPR_SUBS_DEV_ID_57CC    0x035C

drivers/scsi/ipr.c +2 -0

Index: b/drivers/scsi/ipr.c
===================================================================
@@ -9114,6 +9114,8 @@ static struct pci_device_id ipr_pci_tabl
 	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,
 		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B2, 0, 0, 0 },
 	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,
+		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57C3, 0, 0, 0 },
+	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_FPGA_E2,
 		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57C4, 0, 0, 0 },
 	{ PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CROC_ASIC_E2,
 		PCI_VENDOR_ID_IBM, IPR_SUBS_DEV_ID_57B4, 0, 0, 0 },