* [PATCH 1/1] ipr: add CCIN definition for Blue Hawk adapter
[not found] <20111019230016.134176494@linux.vnet.ibm.com>
@ 2011-10-20 14:55 ` Wayne Boyer
2011-10-20 16:25 ` [RESEND][PATCH 1/1] ipr: add definitions for additional adapter Wayne Boyer
1 sibling, 0 replies; 7+ messages in thread
From: Wayne Boyer @ 2011-10-20 14:55 UTC (permalink / raw)
To: James E.J. Bottomley
Cc: Brian King, Kleber Sacilotto de Souza, Wendy Xiong, linux-scsi
Add the appropriate definitions and table entry for the Blue Hawk adapter.
Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com>
---
drivers/scsi/ipr.c | 4 +++-
drivers/scsi/ipr.h | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
Index: b/drivers/scsi/ipr.c
===================================================================
--- a/drivers/scsi/ipr.c 2011-10-19 15:53:30.852967743 -0700
+++ b/drivers/scsi/ipr.c 2011-10-19 15:56:17.363057868 -0700
@@ -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
===================================================================
--- a/drivers/scsi/ipr.h 2011-10-19 15:53:32.829134947 -0700
+++ b/drivers/scsi/ipr.h 2011-10-19 15:56:20.895356624 -0700
@@ -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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [RESEND][PATCH 1/1] ipr: add definitions for additional adapter
[not found] <20111019230016.134176494@linux.vnet.ibm.com>
2011-10-20 14:55 ` [PATCH 1/1] ipr: add CCIN definition for Blue Hawk adapter Wayne Boyer
@ 2011-10-20 16:25 ` Wayne Boyer
2011-10-20 18:04 ` James Bottomley
` (3 more replies)
1 sibling, 4 replies; 7+ messages in thread
From: Wayne Boyer @ 2011-10-20 16:25 UTC (permalink / raw)
To: James E.J. Bottomley
Cc: Brian King, Kleber Sacilotto de Souza, Wendy Xiong, linux-scsi
Add the appropriate definitions and table entry for an additional adapter.
Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com>
---
drivers/scsi/ipr.c | 4 +++-
drivers/scsi/ipr.h | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
Index: b/drivers/scsi/ipr.c
===================================================================
--- a/drivers/scsi/ipr.c 2011-10-19 15:53:30.852967743 -0700
+++ b/drivers/scsi/ipr.c 2011-10-19 15:56:17.363057868 -0700
@@ -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
===================================================================
--- a/drivers/scsi/ipr.h 2011-10-19 15:53:32.829134947 -0700
+++ b/drivers/scsi/ipr.h 2011-10-19 15:56:20.895356624 -0700
@@ -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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RESEND][PATCH 1/1] ipr: add definitions for additional adapter
2011-10-20 16:25 ` [RESEND][PATCH 1/1] ipr: add definitions for additional adapter Wayne Boyer
@ 2011-10-20 18:04 ` James Bottomley
2011-10-20 19:24 ` Wayne Boyer
2011-10-24 18:20 ` Brian King
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: James Bottomley @ 2011-10-20 18:04 UTC (permalink / raw)
To: Wayne Boyer
Cc: Brian King, Kleber Sacilotto de Souza, Wendy Xiong, linux-scsi
On Thu, 2011-10-20 at 09:25 -0700, Wayne Boyer wrote:
> 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RESEND][PATCH 1/1] ipr: add definitions for additional adapter
2011-10-20 18:04 ` James Bottomley
@ 2011-10-20 19:24 ` Wayne Boyer
0 siblings, 0 replies; 7+ messages in thread
From: Wayne Boyer @ 2011-10-20 19:24 UTC (permalink / raw)
To: James Bottomley
Cc: Brian King, Kleber Sacilotto de Souza, Wendy Xiong, linux-scsi
On 10/20/2011 11:04 AM, James Bottomley wrote:
> On Thu, 2011-10-20 at 09:25 -0700, Wayne Boyer wrote:
>> 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
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RESEND][PATCH 1/1] ipr: add definitions for additional adapter
2011-10-20 16:25 ` [RESEND][PATCH 1/1] ipr: add definitions for additional adapter Wayne Boyer
2011-10-20 18:04 ` James Bottomley
@ 2011-10-24 18:20 ` Brian King
2011-10-27 18:42 ` Wayne Boyer
2011-10-27 18:58 ` Wayne Boyer
3 siblings, 0 replies; 7+ messages in thread
From: Brian King @ 2011-10-24 18:20 UTC (permalink / raw)
To: Wayne Boyer
Cc: James E.J. Bottomley, Kleber Sacilotto de Souza, Wendy Xiong, linux-scsi
On 10/20/2011 11:25 AM, Wayne Boyer wrote:
> Add the appropriate definitions and table entry for an additional adapter.
>
> Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com>
Acked-by: Brian King <brking@linux.vnet.ibm.com>
--
Brian King
Linux on Power Virtualization
IBM Linux Technology Center
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RESEND][PATCH 1/1] ipr: add definitions for additional adapter
2011-10-20 16:25 ` [RESEND][PATCH 1/1] ipr: add definitions for additional adapter Wayne Boyer
2011-10-20 18:04 ` James Bottomley
2011-10-24 18:20 ` Brian King
@ 2011-10-27 18:42 ` Wayne Boyer
2011-10-27 18:58 ` Wayne Boyer
3 siblings, 0 replies; 7+ messages in thread
From: Wayne Boyer @ 2011-10-27 18:42 UTC (permalink / raw)
To: James E.J. Bottomley
Cc: Brian King, Kleber Sacilotto de Souza, Wendy Xiong, linux-scsi
This patch is not correct. It will break support for the 57C4
adapter. New patch to follow.
Wayne
On 10/20/2011 09:25 AM, Wayne Boyer wrote:
> Add the appropriate definitions and table entry for an additional adapter.
>
> Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com>
> ---
> drivers/scsi/ipr.c | 4 +++-
> drivers/scsi/ipr.h | 1 +
> 2 files changed, 4 insertions(+), 1 deletion(-)
>
> Index: b/drivers/scsi/ipr.c
> ===================================================================
> --- a/drivers/scsi/ipr.c 2011-10-19 15:53:30.852967743 -0700
> +++ b/drivers/scsi/ipr.c 2011-10-19 15:56:17.363057868 -0700
> @@ -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
> ===================================================================
> --- a/drivers/scsi/ipr.h 2011-10-19 15:53:32.829134947 -0700
> +++ b/drivers/scsi/ipr.h 2011-10-19 15:56:20.895356624 -0700
> @@ -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 majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [RESEND][PATCH 1/1] ipr: add definitions for additional adapter
2011-10-20 16:25 ` [RESEND][PATCH 1/1] ipr: add definitions for additional adapter Wayne Boyer
` (2 preceding siblings ...)
2011-10-27 18:42 ` Wayne Boyer
@ 2011-10-27 18:58 ` Wayne Boyer
3 siblings, 0 replies; 7+ messages in thread
From: Wayne Boyer @ 2011-10-27 18:58 UTC (permalink / raw)
To: James E.J. Bottomley
Cc: Brian King, Kleber Sacilotto de Souza, Wendy Xiong, linux-scsi
Here is the corrected patch.
---
Add the appropriate definition and table entry for an additional adapter.
Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com>
---
drivers/scsi/ipr.c | 2 ++
drivers/scsi/ipr.h | 1 +
2 files changed, 3 insertions(+)
Index: b/drivers/scsi/ipr.h
===================================================================
--- a/drivers/scsi/ipr.h 2011-10-19 15:53:32.829134947 -0700
+++ b/drivers/scsi/ipr.h 2011-10-27 11:47:05.015146361 -0700
@@ -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
Index: b/drivers/scsi/ipr.c
===================================================================
--- a/drivers/scsi/ipr.c 2011-10-19 15:53:30.852967743 -0700
+++ b/drivers/scsi/ipr.c 2011-10-27 11:38:45.039388987 -0700
@@ -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 },
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-10-27 19:09 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
[not found] <20111019230016.134176494@linux.vnet.ibm.com>
2011-10-20 14:55 ` [PATCH 1/1] ipr: add CCIN definition for Blue Hawk adapter Wayne Boyer
2011-10-20 16:25 ` [RESEND][PATCH 1/1] ipr: add definitions for additional adapter Wayne Boyer
2011-10-20 18:04 ` James Bottomley
2011-10-20 19:24 ` Wayne Boyer
2011-10-24 18:20 ` Brian King
2011-10-27 18:42 ` Wayne Boyer
2011-10-27 18:58 ` Wayne Boyer
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.