[PATCH] sata_promise: PHYMODE4 fixup

This patch adds code to fix up the PHYMODE4 "align timing"
register value on second-generation Promise SATA chips.
Failure to correct this value on non-x86 machines makes
drive detection prone to failure due to timeouts. (I've
observed about 50% detection failure rates on SPARC64.)

The HW boots with a bad value in this register, but on x86
machines the Promise BIOS corrects it to the value recommended
by the manual, so most people have been unaffected by this issue.

After developing the patch I checked Promise's SATAII driver,
and discovered that it also corrects PHYMODE4 just like this
patch does.

This patch depends on the sata_promise SATAII updates
patch I sent recently.

Signed-off-by: Mikael Pettersson <mikpe@it.uu.se>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

diff --git a/drivers/ata/sata_promise.c b/drivers/ata/sata_promise.c
index 8daf5d67dfe2fce3ec34bb1b6ba440999f3b71ea..a2778cf016bc2e8866423775416a48621a17433c 100644 (file)
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
@@ -280,6 +280,7 @@ static struct pci_driver pdc_ata_pci_driver = {
 static int pdc_port_start(struct ata_port *ap)
 {
        struct device *dev = ap->host->dev;
+       struct pdc_host_priv *hp = ap->host->private_data;
        struct pdc_port_priv *pp;
        int rc;
 
@@ -301,6 +302,16 @@ static int pdc_port_start(struct ata_port *ap)
 
        ap->private_data = pp;
 
+       /* fix up PHYMODE4 align timing */
+       if ((hp->flags & PDC_FLAG_GEN_II) && sata_scr_valid(ap)) {
+               void __iomem *mmio = (void __iomem *) ap->ioaddr.scr_addr;
+               unsigned int tmp;
+
+               tmp = readl(mmio + 0x014);
+               tmp = (tmp & ~3) | 1;   /* set bits 1:0 = 0:1 */
+               writel(tmp, mmio + 0x014);
+       }
+
        return 0;
 
 err_out_kfree: