linux-scsi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] ipr: add MSI support
       [not found] <20090123165823.748742817@linux.vnet.ibm.com>
@ 2009-01-23 17:17 ` Wayne Boyer
  2009-01-23 18:39   ` Brian King
  2009-01-23 17:17 ` [PATCH 2/2] ipr: add message to error table Wayne Boyer
  1 sibling, 1 reply; 6+ messages in thread
From: Wayne Boyer @ 2009-01-23 17:17 UTC (permalink / raw)
  To: linux-scsi

Enable MSI if available/supported.

Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com>
---
 drivers/scsi/ipr.c |    7 +++++++
 drivers/scsi/ipr.h |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

Index: linux-2.6/drivers/scsi/ipr.c
===================================================================
--- linux-2.6.orig/drivers/scsi/ipr.c	2009-01-21 10:19:59.000000000 -0800
+++ linux-2.6/drivers/scsi/ipr.c	2009-01-22 15:50:59.000000000 -0800
@@ -7147,6 +7147,7 @@

 	ENTER;
 	free_irq(pdev->irq, ioa_cfg);
+	pci_disable_msi(pdev);
 	iounmap(ioa_cfg->hdw_dma_regs);
 	pci_release_regions(pdev);
 	ipr_free_mem(ioa_cfg);
@@ -7432,6 +7433,11 @@
 		goto out;
 	}

+	if (!(rc = pci_enable_msi(pdev)))
+		dev_info(&pdev->dev, "MSI enabled\n");
+	else if (ipr_debug)
+		dev_info(&pdev->dev, "Cannot enable MSI\n");
+
 	dev_info(&pdev->dev, "Found IOA with IRQ: %d\n", pdev->irq);

 	host = scsi_host_alloc(&driver_template, sizeof(*ioa_cfg));
@@ -7574,6 +7580,7 @@
 out_scsi_host_put:
 	scsi_host_put(host);
 out_disable:
+	pci_disable_msi(pdev);
 	pci_disable_device(pdev);
 	goto out;
 }
Index: linux-2.6/drivers/scsi/ipr.h
===================================================================
--- linux-2.6.orig/drivers/scsi/ipr.h	2009-01-21 10:19:57.000000000 -0800
+++ linux-2.6/drivers/scsi/ipr.h	2009-01-21 15:23:02.000000000 -0800
@@ -37,8 +37,8 @@
 /*
  * Literals
  */
-#define IPR_DRIVER_VERSION "2.4.1"
-#define IPR_DRIVER_DATE "(April 24, 2007)"
+#define IPR_DRIVER_VERSION "2.4.2"
+#define IPR_DRIVER_DATE "(January 21, 2009)"

 /*
  * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH 2/2] ipr: add message to error table
       [not found] <20090123165823.748742817@linux.vnet.ibm.com>
  2009-01-23 17:17 ` [PATCH 1/2] ipr: add MSI support Wayne Boyer
@ 2009-01-23 17:17 ` Wayne Boyer
  2009-01-23 18:39   ` Brian King
  2009-01-25 14:18   ` James Bottomley
  1 sibling, 2 replies; 6+ messages in thread
From: Wayne Boyer @ 2009-01-23 17:17 UTC (permalink / raw)
  To: linux-scsi

Adds a message to the error table for an error that wasn't previously handled.

Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com>
---

 drivers/scsi/ipr.c |    2 ++
 1 file changed, 2 insertions(+)

Index: linux-2.6/drivers/scsi/ipr.c
===================================================================
--- linux-2.6.orig/drivers/scsi/ipr.c	2009-01-22 15:50:59.000000000 -0800
+++ linux-2.6/drivers/scsi/ipr.c	2009-01-23 08:55:23.000000000 -0800
@@ -354,6 +354,8 @@
 	"9076: Configuration error, missing remote IOA"},
 	{0x06679100, 0, IPR_DEFAULT_LOG_LEVEL,
 	"4050: Enclosure does not support a required multipath function"},
+	{0x06690000, 0, IPR_DEFAULT_LOG_LEVEL,
+	"4070: Logically bad written to device"},
 	{0x06690200, 0, IPR_DEFAULT_LOG_LEVEL,
 	"9041: Array protection temporarily suspended"},
 	{0x06698200, 0, IPR_DEFAULT_LOG_LEVEL,


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/2] ipr: add MSI support
  2009-01-23 17:17 ` [PATCH 1/2] ipr: add MSI support Wayne Boyer
@ 2009-01-23 18:39   ` Brian King
  0 siblings, 0 replies; 6+ messages in thread
From: Brian King @ 2009-01-23 18:39 UTC (permalink / raw)
  To: Wayne Boyer; +Cc: linux-scsi

Acked by: Brian King <brking@linux.vnet.ibm.com>

Wayne Boyer wrote:
> Enable MSI if available/supported.
> 
> Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com>
> ---
>  drivers/scsi/ipr.c |    7 +++++++
>  drivers/scsi/ipr.h |    4 ++--
>  2 files changed, 9 insertions(+), 2 deletions(-)
> 
> Index: linux-2.6/drivers/scsi/ipr.c
> ===================================================================
> --- linux-2.6.orig/drivers/scsi/ipr.c	2009-01-21 10:19:59.000000000 -0800
> +++ linux-2.6/drivers/scsi/ipr.c	2009-01-22 15:50:59.000000000 -0800
> @@ -7147,6 +7147,7 @@
> 
>  	ENTER;
>  	free_irq(pdev->irq, ioa_cfg);
> +	pci_disable_msi(pdev);
>  	iounmap(ioa_cfg->hdw_dma_regs);
>  	pci_release_regions(pdev);
>  	ipr_free_mem(ioa_cfg);
> @@ -7432,6 +7433,11 @@
>  		goto out;
>  	}
> 
> +	if (!(rc = pci_enable_msi(pdev)))
> +		dev_info(&pdev->dev, "MSI enabled\n");
> +	else if (ipr_debug)
> +		dev_info(&pdev->dev, "Cannot enable MSI\n");
> +
>  	dev_info(&pdev->dev, "Found IOA with IRQ: %d\n", pdev->irq);
> 
>  	host = scsi_host_alloc(&driver_template, sizeof(*ioa_cfg));
> @@ -7574,6 +7580,7 @@
>  out_scsi_host_put:
>  	scsi_host_put(host);
>  out_disable:
> +	pci_disable_msi(pdev);
>  	pci_disable_device(pdev);
>  	goto out;
>  }
> Index: linux-2.6/drivers/scsi/ipr.h
> ===================================================================
> --- linux-2.6.orig/drivers/scsi/ipr.h	2009-01-21 10:19:57.000000000 -0800
> +++ linux-2.6/drivers/scsi/ipr.h	2009-01-21 15:23:02.000000000 -0800
> @@ -37,8 +37,8 @@
>  /*
>   * Literals
>   */
> -#define IPR_DRIVER_VERSION "2.4.1"
> -#define IPR_DRIVER_DATE "(April 24, 2007)"
> +#define IPR_DRIVER_VERSION "2.4.2"
> +#define IPR_DRIVER_DATE "(January 21, 2009)"
> 
>  /*
>   * IPR_MAX_CMD_PER_LUN: This defines the maximum number of outstanding
> 
> --
> 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


-- 
Brian King
Linux on Power Virtualization
IBM Linux Technology Center



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] ipr: add message to error table
  2009-01-23 17:17 ` [PATCH 2/2] ipr: add message to error table Wayne Boyer
@ 2009-01-23 18:39   ` Brian King
  2009-01-25 14:18   ` James Bottomley
  1 sibling, 0 replies; 6+ messages in thread
From: Brian King @ 2009-01-23 18:39 UTC (permalink / raw)
  To: Wayne Boyer; +Cc: linux-scsi

Acked by: Brian King <brking@linux.vnet.ibm.com>

Wayne Boyer wrote:
> Adds a message to the error table for an error that wasn't previously handled.
> 
> Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com>
> ---
> 
>  drivers/scsi/ipr.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> Index: linux-2.6/drivers/scsi/ipr.c
> ===================================================================
> --- linux-2.6.orig/drivers/scsi/ipr.c	2009-01-22 15:50:59.000000000 -0800
> +++ linux-2.6/drivers/scsi/ipr.c	2009-01-23 08:55:23.000000000 -0800
> @@ -354,6 +354,8 @@
>  	"9076: Configuration error, missing remote IOA"},
>  	{0x06679100, 0, IPR_DEFAULT_LOG_LEVEL,
>  	"4050: Enclosure does not support a required multipath function"},
> +	{0x06690000, 0, IPR_DEFAULT_LOG_LEVEL,
> +	"4070: Logically bad written to device"},
>  	{0x06690200, 0, IPR_DEFAULT_LOG_LEVEL,
>  	"9041: Array protection temporarily suspended"},
>  	{0x06698200, 0, IPR_DEFAULT_LOG_LEVEL,
> 
> --
> 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


-- 
Brian King
Linux on Power Virtualization
IBM Linux Technology Center



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] ipr: add message to error table
  2009-01-23 17:17 ` [PATCH 2/2] ipr: add message to error table Wayne Boyer
  2009-01-23 18:39   ` Brian King
@ 2009-01-25 14:18   ` James Bottomley
  2009-01-28 16:24     ` Wayne Boyer
  1 sibling, 1 reply; 6+ messages in thread
From: James Bottomley @ 2009-01-25 14:18 UTC (permalink / raw)
  To: Wayne Boyer; +Cc: linux-scsi

On Fri, 2009-01-23 at 09:17 -0800, Wayne Boyer wrote:
> Adds a message to the error table for an error that wasn't previously handled.
> 
> Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com>
> ---
> 
>  drivers/scsi/ipr.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> Index: linux-2.6/drivers/scsi/ipr.c
> ===================================================================
> --- linux-2.6.orig/drivers/scsi/ipr.c	2009-01-22 15:50:59.000000000 -0800
> +++ linux-2.6/drivers/scsi/ipr.c	2009-01-23 08:55:23.000000000 -0800
> @@ -354,6 +354,8 @@
>  	"9076: Configuration error, missing remote IOA"},
>  	{0x06679100, 0, IPR_DEFAULT_LOG_LEVEL,
>  	"4050: Enclosure does not support a required multipath function"},
> +	{0x06690000, 0, IPR_DEFAULT_LOG_LEVEL,
> +	"4070: Logically bad written to device"},

Neither from the change log nor from the actual text can I tell what the
problem is ... is there a word missing (like block or sector)?

James



^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/2] ipr: add message to error table
  2009-01-25 14:18   ` James Bottomley
@ 2009-01-28 16:24     ` Wayne Boyer
  0 siblings, 0 replies; 6+ messages in thread
From: Wayne Boyer @ 2009-01-28 16:24 UTC (permalink / raw)
  To: James Bottomley; +Cc: linux-scsi

James Bottomley wrote:
> On Fri, 2009-01-23 at 09:17 -0800, Wayne Boyer wrote:
>> Adds a message to the error table for an error that wasn't previously handled.
>>
>> Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com>
>> ---
>>
>>  drivers/scsi/ipr.c |    2 ++
>>  1 file changed, 2 insertions(+)
>>
>> Index: linux-2.6/drivers/scsi/ipr.c
>> ===================================================================
>> --- linux-2.6.orig/drivers/scsi/ipr.c	2009-01-22 15:50:59.000000000 -0800
>> +++ linux-2.6/drivers/scsi/ipr.c	2009-01-23 08:55:23.000000000 -0800
>> @@ -354,6 +354,8 @@
>>  	"9076: Configuration error, missing remote IOA"},
>>  	{0x06679100, 0, IPR_DEFAULT_LOG_LEVEL,
>>  	"4050: Enclosure does not support a required multipath function"},
>> +	{0x06690000, 0, IPR_DEFAULT_LOG_LEVEL,
>> +	"4070: Logically bad written to device"},
> 
> Neither from the change log nor from the actual text can I tell what the
> problem is ... is there a word missing (like block or sector)?
> 

After some discussion, I've come up with a more descriptive message and
better change log.  Updated patch below...

> James
> 


Adds a message to the error table for an error that wasn't previously handled.
In some cases the I/O Adapter will detect an error condition and mark a block
as "logically bad".

Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com>
---

 drivers/scsi/ipr.c |    2 ++
 1 file changed, 2 insertions(+)

Index: linux-2.6/drivers/scsi/ipr.c
===================================================================
--- linux-2.6.orig/drivers/scsi/ipr.c	2009-01-26 12:29:01.000000000 -0800
+++ linux-2.6/drivers/scsi/ipr.c	2009-01-27 14:32:08.000000000 -0800
@@ -354,6 +354,8 @@
 	"9076: Configuration error, missing remote IOA"},
 	{0x06679100, 0, IPR_DEFAULT_LOG_LEVEL,
 	"4050: Enclosure does not support a required multipath function"},
+	{0x06690000, 0, IPR_DEFAULT_LOG_LEVEL,
+	"4070: Logically bad block written on device"},
 	{0x06690200, 0, IPR_DEFAULT_LOG_LEVEL,
 	"9041: Array protection temporarily suspended"},
 	{0x06698200, 0, IPR_DEFAULT_LOG_LEVEL,

-- 
Wayne Boyer
IBM - Beaverton, Oregon
LTC S/W Development - eServerIO
(503) 578-5236, T/L 775-5236

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2009-01-28 16:24 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20090123165823.748742817@linux.vnet.ibm.com>
2009-01-23 17:17 ` [PATCH 1/2] ipr: add MSI support Wayne Boyer
2009-01-23 18:39   ` Brian King
2009-01-23 17:17 ` [PATCH 2/2] ipr: add message to error table Wayne Boyer
2009-01-23 18:39   ` Brian King
2009-01-25 14:18   ` James Bottomley
2009-01-28 16:24     ` Wayne Boyer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).