From: Jiang Yutang b14...@freescale.com
Split sata_fsl_softreset() into hard and soft resets to make
error-handling more efficient device and PMP detection more
reliable.
Also includes fix for PMP support, driver tested with Sil3726,
Sil4726 Exar PMP controllers.
[AV: Also fixes resuming from deep sleep on MPC8315 CPUs]
Signed-off-by: Jiang Yutang b14...@freescale.com
Signed-off-by: Anton Vorontsov avoront...@ru.mvista.com
---
drivers/ata/sata_fsl.c | 84 +---
1 files changed, 44 insertions(+), 40 deletions(-)
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index d344db4..172b57e 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -707,34 +707,17 @@ static unsigned int sata_fsl_dev_classify(struct ata_port
*ap)
return ata_dev_classify(tf);
}
-static int sata_fsl_prereset(struct ata_link *link, unsigned long deadline)
-{
- /* FIXME: Never skip softreset, sata_fsl_softreset() is
-* combination of soft and hard resets. sata_fsl_softreset()
-* needs to be splitted into soft and hard resets.
-*/
- return 0;
-}
-
-static int sata_fsl_softreset(struct ata_link *link, unsigned int *class,
+static int sata_fsl_hardreset(struct ata_link *link, unsigned int *class,
unsigned long deadline)
{
struct ata_port *ap = link-ap;
- struct sata_fsl_port_priv *pp = ap-private_data;
struct sata_fsl_host_priv *host_priv = ap-host-private_data;
void __iomem *hcr_base = host_priv-hcr_base;
- int pmp = sata_srst_pmp(link);
u32 temp;
- struct ata_taskfile tf;
- u8 *cfis;
- u32 Serror;
int i = 0;
unsigned long start_jiffies;
- DPRINTK(in xx_softreset\n);
-
- if (pmp != SATA_PMP_CTRL_PORT)
- goto issue_srst;
+ DPRINTK(in xx_hardreset\n);
try_offline_again:
/*
@@ -749,7 +732,7 @@ try_offline_again:
if (temp ONLINE) {
ata_port_printk(ap, KERN_ERR,
- Softreset failed, not off-lined %d\n, i);
+ Hardreset failed, not off-lined %d\n, i);
/*
* Try to offline controller atleast twice
@@ -761,7 +744,7 @@ try_offline_again:
goto try_offline_again;
}
- DPRINTK(softreset, controller off-lined\n);
+ DPRINTK(hardreset, controller off-lined\n);
VPRINTK(HStatus = 0x%x\n, ioread32(hcr_base + HSTATUS));
VPRINTK(HControl = 0x%x\n, ioread32(hcr_base + HCONTROL));
@@ -786,11 +769,11 @@ try_offline_again:
if (!(temp ONLINE)) {
ata_port_printk(ap, KERN_ERR,
- Softreset failed, not on-lined\n);
+ Hardreset failed, not on-lined\n);
goto err;
}
- DPRINTK(softreset, controller off-lined on-lined\n);
+ DPRINTK(hardreset, controller off-lined on-lined\n);
VPRINTK(HStatus = 0x%x\n, ioread32(hcr_base + HSTATUS));
VPRINTK(HControl = 0x%x\n, ioread32(hcr_base + HCONTROL));
@@ -806,7 +789,7 @@ try_offline_again:
No Device OR PHYRDY change,Hstatus = 0x%x\n,
ioread32(hcr_base + HSTATUS));
*class = ATA_DEV_NONE;
- goto out;
+ return 0;
}
/*
@@ -819,11 +802,44 @@ try_offline_again:
if ((temp 0xFF) != 0x18) {
ata_port_printk(ap, KERN_WARNING, No Signature Update\n);
*class = ATA_DEV_NONE;
- goto out;
+ goto do_followup_srst;
} else {
ata_port_printk(ap, KERN_INFO,
Signature Update detected @ %d msecs\n,
jiffies_to_msecs(jiffies - start_jiffies));
+ *class = sata_fsl_dev_classify(ap);
+ return 0;
+ }
+
+do_followup_srst:
+ /*
+* request libATA to perform follow-up softreset
+*/
+ return -EAGAIN;
+
+err:
+ return -EIO;
+}
+
+static int sata_fsl_softreset(struct ata_link *link, unsigned int *class,
+ unsigned long deadline)
+{
+ struct ata_port *ap = link-ap;
+ struct sata_fsl_port_priv *pp = ap-private_data;
+ struct sata_fsl_host_priv *host_priv = ap-host-private_data;
+ void __iomem *hcr_base = host_priv-hcr_base;
+ int pmp = sata_srst_pmp(link);
+ u32 temp;
+ struct ata_taskfile tf;
+ u8 *cfis;
+ u32 Serror;
+
+ DPRINTK(in xx_softreset\n);
+
+ if (ata_link_offline(link)) {
+ DPRINTK(PHY reports no device\n);
+ *class = ATA_DEV_NONE;
+ return 0;
}
/*
@@ -834,7 +850,6 @@ try_offline_again:
* reached here, we can send a command to the target
