diff options
| author |   Mark Lord <liml@rtr.ca> | 2008-05-28 13:41:52 -0400 |
|---|---|---|
| committer |   Jeff Garzik <jgarzik@redhat.com> | 2008-05-30 12:37:26 -0400 |
| commit | 0388a8c0d54aa039758a8eca68d82325a563f8db (patch) | |
| tree | a31e9f2daefd2231dc1807961f6c97bc561abbc2 | |
| parent | sata_mv: workaround for 60x1 errata sata13 (diff) | |
| download | linux-dev-0388a8c0d54aa039758a8eca68d82325a563f8db.tar.xz linux-dev-0388a8c0d54aa039758a8eca68d82325a563f8db.zip | |
sata_mv: implement SoC guideline SATA_S11
The 5182 System-On-Chip (SOC) variant wants certain lower
bits to be cleared on any write to the PHY_MODE3 register.
If/when support is added for other SOC variants, we'll need
some way to uniquely identify the 5182, and not perform this
workaround for the others.
But for now, it is the only SOC variant we support here.
Signed-off-by: Mark Lord <mlord@pobox.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
| -rw-r--r-- | drivers/ata/sata_mv.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index 17093e600d80..acf347f71a2f 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c @@ -72,7 +72,7 @@ #include <linux/libata.h> #define DRV_NAME "sata_mv" -#define DRV_VERSION "1.23" +#define DRV_VERSION "1.24" enum { /* BAR's are enumerated in terms of pci_resource_start() terms */ @@ -2558,6 +2558,10 @@ static void mv6_phy_errata(struct mv_host_priv *hpriv, void __iomem *mmio, m3 = readl(port_mmio + PHY_MODE3); m3 = (m3 & 0x1f) | (0x5555601 << 5); + /* Guideline 88F5182 (GL# SATA-S11) */ + if (IS_SOC(hpriv)) + m3 &= ~0x1c; + if (fix_phy_mode4) { u32 m4; |