diff options
| author |   Mikael Pettersson <mikpe@it.uu.se> | 2007-04-07 14:29:51 +0200 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2007-04-28 14:16:01 -0400 |
| commit | ce2d3abc292c1eecd9ddc6f03391a0a46c6561dc (patch) | |
| tree | 42c692445e1b84926fa1f0035fe18f910c89b332 /drivers/ata/sata_promise.c | |
| parent | pata_pdc2027x: Updates (diff) | |
| download | linux-dev-ce2d3abc292c1eecd9ddc6f03391a0a46c6561dc.tar.xz linux-dev-ce2d3abc292c1eecd9ddc6f03391a0a46c6561dc.zip | |
sata_promise: fix error decode regression
Promise ATA ports should always be reset by pdc_reset_port()
when errors are detected, but the recent error reason decoding
update to sata_promise replaced that reset with a freeze.
This patch changes the error detection to do a reset again.
This makes the error decoding update safer, as it now only
adds error decoding without changing any other behaviour.
Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/ata/sata_promise.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c index baa836881b03..a7916d72c4ca 100644 --- a/drivers/ata/sata_promise.c +++ b/drivers/ata/sata_promise.c @@ -45,7 +45,7 @@ #include "sata_promise.h" #define DRV_NAME "sata_promise" -#define DRV_VERSION "2.04" +#define DRV_VERSION "2.05" enum { @@ -650,9 +650,12 @@ static void pdc_error_intr(struct ata_port *ap, struct ata_queued_cmd *qc, | PDC_PCI_SYS_ERR | PDC1_PCI_PARITY_ERR)) ac_err_mask |= AC_ERR_HOST_BUS; - ehi->action |= ATA_EH_SOFTRESET; + if (sata_scr_valid(ap)) + ehi->serror |= pdc_sata_scr_read(ap, SCR_ERROR); + qc->err_mask |= ac_err_mask; - ata_port_freeze(ap); + + pdc_reset_port(ap); } static inline unsigned int pdc_host_intr( struct ata_port *ap, |