LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 2.6.28-rc2] sata_promise: add ATA engine reset to reset ops
@ 2008-10-31  7:03 Mikael Pettersson
  2008-11-04  6:10 ` Jeff Garzik
  0 siblings, 1 reply; 2+ messages in thread
From: Mikael Pettersson @ 2008-10-31  7:03 UTC (permalink / raw)
  To: jgarzik; +Cc: linux-ide, linux-kernel, stable

Promise ATA engines need to be reset when errors occur.
That's currently done for errors detected by sata_promise itself,
but it's not done for errors like timeouts detected outside of
the low-level driver.

The effect of this omission is that a timeout tends to result
in a sequence of failed COMRESETs after which libata EH gives
up and disables the port. At that point the port's ATA engine
hangs and even reloading the driver will not resume it.

To fix this, make sata_promise override ->hardreset on SATA
ports with code which calls pdc_reset_port() on the port in
question before calling libata's hardreset. PATA ports don't
use ->hardreset, so for those we override ->softreset instead.

Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
---
Updated to add pdc_reset_port() to ->softreset not ->hardreset
on PATA ports. Patch title adjusted accordingly.

This should also go into the 2.6.27 and 2.6.26 stable branches.
In older branches libata EH is different and I'm seeing different
behaviour on timeouts, so I don't think this should go in as-is
in 2.6.25 and older.

 drivers/ata/sata_promise.c |   20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff -rupN linux-2.6.28-rc2/drivers/ata/sata_promise.c linux-2.6.28-rc2.sata_promise-proper-hardreset-v2/drivers/ata/sata_promise.c
--- linux-2.6.28-rc2/drivers/ata/sata_promise.c	2008-10-26 21:35:33.000000000 +0100
+++ linux-2.6.28-rc2.sata_promise-proper-hardreset-v2/drivers/ata/sata_promise.c	2008-10-31 00:27:40.000000000 +0100
@@ -153,6 +153,10 @@ static void pdc_freeze(struct ata_port *
 static void pdc_sata_freeze(struct ata_port *ap);
 static void pdc_thaw(struct ata_port *ap);
 static void pdc_sata_thaw(struct ata_port *ap);
+static int pdc_pata_softreset(struct ata_link *link, unsigned int *class,
+			      unsigned long deadline);
+static int pdc_sata_hardreset(struct ata_link *link, unsigned int *class,
+			      unsigned long deadline);
 static void pdc_error_handler(struct ata_port *ap);
 static void pdc_post_internal_cmd(struct ata_queued_cmd *qc);
 static int pdc_pata_cable_detect(struct ata_port *ap);
@@ -186,6 +190,7 @@ static struct ata_port_operations pdc_sa
 	.scr_read		= pdc_sata_scr_read,
 	.scr_write		= pdc_sata_scr_write,
 	.port_start		= pdc_sata_port_start,
+	.hardreset		= pdc_sata_hardreset,
 };
 
 /* First-generation chips need a more restrictive ->check_atapi_dma op */
@@ -200,6 +205,7 @@ static struct ata_port_operations pdc_pa
 	.freeze			= pdc_freeze,
 	.thaw			= pdc_thaw,
 	.port_start		= pdc_common_port_start,
+	.softreset		= pdc_pata_softreset,
 };
 
 static const struct ata_port_info pdc_port_info[] = {
@@ -693,6 +699,20 @@ static void pdc_sata_thaw(struct ata_por
 	readl(host_mmio + hotplug_offset); /* flush */
 }
 
+static int pdc_pata_softreset(struct ata_link *link, unsigned int *class,
+			      unsigned long deadline)
+{
+	pdc_reset_port(link->ap);
+	return ata_sff_softreset(link, class, deadline);
+}
+
+static int pdc_sata_hardreset(struct ata_link *link, unsigned int *class,
+			      unsigned long deadline)
+{
+	pdc_reset_port(link->ap);
+	return sata_sff_hardreset(link, class, deadline);
+}
+
 static void pdc_error_handler(struct ata_port *ap)
 {
 	if (!(ap->pflags & ATA_PFLAG_FROZEN))

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

* Re: [PATCH 2.6.28-rc2] sata_promise: add ATA engine reset to reset ops
  2008-10-31  7:03 [PATCH 2.6.28-rc2] sata_promise: add ATA engine reset to reset ops Mikael Pettersson
@ 2008-11-04  6:10 ` Jeff Garzik
  0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2008-11-04  6:10 UTC (permalink / raw)
  To: Mikael Pettersson; +Cc: linux-ide, linux-kernel, stable

Mikael Pettersson wrote:
> Promise ATA engines need to be reset when errors occur.
> That's currently done for errors detected by sata_promise itself,
> but it's not done for errors like timeouts detected outside of
> the low-level driver.
> 
> The effect of this omission is that a timeout tends to result
> in a sequence of failed COMRESETs after which libata EH gives
> up and disables the port. At that point the port's ATA engine
> hangs and even reloading the driver will not resume it.
> 
> To fix this, make sata_promise override ->hardreset on SATA
> ports with code which calls pdc_reset_port() on the port in
> question before calling libata's hardreset. PATA ports don't
> use ->hardreset, so for those we override ->softreset instead.
> 
> Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
> ---
> Updated to add pdc_reset_port() to ->softreset not ->hardreset
> on PATA ports. Patch title adjusted accordingly.
> 
> This should also go into the 2.6.27 and 2.6.26 stable branches.
> In older branches libata EH is different and I'm seeing different
> behaviour on timeouts, so I don't think this should go in as-is
> in 2.6.25 and older.
> 
>  drivers/ata/sata_promise.c |   20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)

applied



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

end of thread, other threads:[~2008-11-04  6:14 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-10-31  7:03 [PATCH 2.6.28-rc2] sata_promise: add ATA engine reset to reset ops Mikael Pettersson
2008-11-04  6:10 ` Jeff Garzik

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).