The internal phy is using wrong registers for the config interrupt function, causing incorrect behavior when detecting the link activity. Fix it.
We cannot use the bcm_phy_config_intr function from the bcm-phy-lib.c because it uses different registers from brcm63xx. We need to use our own function, which matches with the one used by the "Broadcom PHY driver" (brcm_fet_config_intr at broadcom.c). brcm63xx internal phy uses the same registers as the ones defined in brcmphy.h for fast ethernet, use them instead. Signed-off-by: Daniel Gonzalez Cabanelas <[email protected]> diff --git a/target/linux/brcm63xx/patches-4.4/409-bcm63xx_net_phy-fix-registers.patch b/target/linux/brcm63xx/patches-4.4/409-bcm63xx_net_phy-fix-registers.patch new file mode 100644 index 0000000..c53d464 --- /dev/null +++ b/target/linux/brcm63xx/patches-4.4/409-bcm63xx_net_phy-fix-registers.patch @@ -0,0 +1,102 @@ +--- a/drivers/net/phy/bcm63xx.c ++++ b/drivers/net/phy/bcm63xx.c +@@ -6,44 +6,55 @@ + * as published by the Free Software Foundation; either version + * 2 of the License, or (at your option) any later version. + */ + #include "bcm-phy-lib.h" + #include <linux/module.h> + #include <linux/phy.h> +- +-#define MII_BCM63XX_IR 0x1a /* interrupt register */ +-#define MII_BCM63XX_IR_EN 0x4000 /* global interrupt enable */ +-#define MII_BCM63XX_IR_DUPLEX 0x0800 /* duplex changed */ +-#define MII_BCM63XX_IR_SPEED 0x0400 /* speed changed */ +-#define MII_BCM63XX_IR_LINK 0x0200 /* link changed */ +-#define MII_BCM63XX_IR_GMASK 0x0100 /* global interrupt mask */ ++#include <linux/brcmphy.h> + + MODULE_DESCRIPTION("Broadcom 63xx internal PHY driver"); + MODULE_AUTHOR("Maxime Bizon <[email protected]>"); + MODULE_LICENSE("GPL"); + + static int bcm63xx_config_init(struct phy_device *phydev) + { + int reg, err; + +- reg = phy_read(phydev, MII_BCM63XX_IR); ++ reg = phy_read(phydev, MII_BRCM_FET_INTREG); + if (reg < 0) + return reg; + + /* Mask interrupts globally. */ +- reg |= MII_BCM63XX_IR_GMASK; +- err = phy_write(phydev, MII_BCM63XX_IR, reg); ++ reg |= MII_BRCM_FET_IR_MASK; ++ err = phy_write(phydev, MII_BRCM_FET_INTREG, reg); + if (err < 0) + return err; + + /* Unmask events we are interested in */ +- reg = ~(MII_BCM63XX_IR_DUPLEX | +- MII_BCM63XX_IR_SPEED | +- MII_BCM63XX_IR_LINK) | +- MII_BCM63XX_IR_EN; +- return phy_write(phydev, MII_BCM63XX_IR, reg); ++ reg = ~(MII_BRCM_FET_IR_DUPLEX_EN | ++ MII_BRCM_FET_IR_SPEED_EN | ++ MII_BRCM_FET_IR_LINK_EN) | ++ MII_BRCM_FET_IR_ENABLE; ++ return phy_write(phydev, MII_BRCM_FET_INTREG, reg); ++} ++ ++static int brcm_fet_config_intr(struct phy_device *phydev) ++{ ++ int reg, err; ++ ++ reg = phy_read(phydev, MII_BRCM_FET_INTREG); ++ if (reg < 0) ++ return reg; ++ ++ if (phydev->interrupts == PHY_INTERRUPT_ENABLED) ++ reg &= ~MII_BRCM_FET_IR_MASK; ++ else ++ reg |= MII_BRCM_FET_IR_MASK; ++ ++ err = phy_write(phydev, MII_BRCM_FET_INTREG, reg); ++ return err; + } + + static struct phy_driver bcm63xx_driver[] = { + { + .phy_id = 0x00406000, + .phy_id_mask = 0xfffffc00, +@@ -52,26 +63,26 @@ + .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause), + .flags = PHY_HAS_INTERRUPT | PHY_IS_INTERNAL, + .config_init = bcm63xx_config_init, + .config_aneg = genphy_config_aneg, + .read_status = genphy_read_status, + .ack_interrupt = bcm_phy_ack_intr, +- .config_intr = bcm_phy_config_intr, ++ .config_intr = brcm_fet_config_intr, + .driver = { .owner = THIS_MODULE }, + }, { + /* same phy as above, with just a different OUI */ + .phy_id = 0x002bdc00, + .phy_id_mask = 0xfffffc00, + .name = "Broadcom BCM63XX (2)", + .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause), + .flags = PHY_HAS_INTERRUPT | PHY_IS_INTERNAL, + .config_init = bcm63xx_config_init, + .config_aneg = genphy_config_aneg, + .read_status = genphy_read_status, + .ack_interrupt = bcm_phy_ack_intr, +- .config_intr = bcm_phy_config_intr, ++ .config_intr = brcm_fet_config_intr, + .driver = { .owner = THIS_MODULE }, + } }; + + module_phy_driver(bcm63xx_driver); + + static struct mdio_device_id __maybe_unused bcm63xx_tbl[] = { _______________________________________________ Lede-dev mailing list [email protected] http://lists.infradead.org/mailman/listinfo/lede-dev
