Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 97531
b: refs/heads/master
c: b406c7a
h: refs/heads/master
i:
  97529: 312233f
  97527: 65f1b29
v: v3
  • Loading branch information
Mark Lord authored and Jeff Garzik committed May 30, 2008
1 parent f7008a8 commit 35af976
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5cf73bfb061552aa18d816d2859409be9ace5306
refs/heads/master: b406c7a6655da7a2fcd9f72e41262f93ff707748
9 changes: 7 additions & 2 deletions trunk/drivers/ata/sata_mv.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
#include <linux/libata.h>

#define DRV_NAME "sata_mv"
#define DRV_VERSION "1.22"
#define DRV_VERSION "1.23"

enum {
/* BAR's are enumerated in terms of pci_resource_start() terms */
Expand Down Expand Up @@ -2557,7 +2557,6 @@ static void mv6_phy_errata(struct mv_host_priv *hpriv, void __iomem *mmio,
*/
m3 = readl(port_mmio + PHY_MODE3);
m3 = (m3 & 0x1f) | (0x5555601 << 5);
writel(m3, port_mmio + PHY_MODE3);

if (fix_phy_mode4) {
u32 m4;
Expand All @@ -2573,6 +2572,12 @@ static void mv6_phy_errata(struct mv_host_priv *hpriv, void __iomem *mmio,

writel(m4, port_mmio + PHY_MODE4);
}
/*
* Workaround for 60x1-B2 errata SATA#13:
* Any write to PHY_MODE4 (above) may corrupt PHY_MODE3,
* so we must always rewrite PHY_MODE3 after PHY_MODE4.
*/
writel(m3, port_mmio + PHY_MODE3);

/* Revert values of pre-emphasis and signal amps to the saved ones */
m2 = readl(port_mmio + PHY_MODE2);
Expand Down

0 comments on commit 35af976

Please sign in to comment.