The patch titled
sky2 auto negotiation PHY errata
has been removed from the -mm tree. Its filename was
sky2-auto-negotiation-phy-errata.patch
This patch was dropped because it is obsolete
------------------------------------------------------
Subject: sky2 auto negotiation PHY errata
From: Stephen Hemminger <shemminger@xxxxxxxxxxxxxxxxxxxx>
This patch does the Marvell errata before auto negotiation
(from drivers/phy/marvell.c). The Yukon II chips have an internal
version of the same PHY, so perhaps this errata is necessary for them
as well.
For test only, but it may fix some of the hangs. It seems to fix
the PHY lockups I saw yesterday on Mac Mini.
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/net/sky2.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff -puN drivers/net/sky2.c~sky2-auto-negotiation-phy-errata drivers/net/sky2.c
--- a/drivers/net/sky2.c~sky2-auto-negotiation-phy-errata
+++ a/drivers/net/sky2.c
@@ -363,6 +363,14 @@ static void sky2_phy_init(struct sky2_hw
if (sky2->autoneg == AUTONEG_ENABLE) {
if (sky2_is_copper(hw)) {
+ /* Errata setup */
+ gm_phy_write(hw, port, PHY_MARV_PAGE_ADDR, 0x1f);
+ gm_phy_write(hw, port, PHY_MARV_PAGE_DATA, 0x200c);
+ gm_phy_write(hw, port, PHY_MARV_PAGE_ADDR, 5);
+ gm_phy_write(hw, port, PHY_MARV_PAGE_DATA, 0);
+ gm_phy_write(hw, port, PHY_MARV_PAGE_DATA, 0x100);
+
+
if (sky2->advertising & ADVERTISED_1000baseT_Full)
ct1000 |= PHY_M_1000C_AFD;
if (sky2->advertising & ADVERTISED_1000baseT_Half)
_
Patches currently in -mm which might be from shemminger@xxxxxxxxxxxxxxxxxxxx are
git-netdev-all.patch
sky2-auto-negotiation-phy-errata.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
