forked from Minki/linux
b44: check register instead of PHY address to detect external PHY
The Ethernet core supported by b44 supports an internal PHY integrated into the mac core, which is supported by the b44 driver and an external PHY to which the mac core is connected. This external PHY could be a switch connected through MII, which is often the case when this core is used on home routers. The usage of an external PHY was assumed when the PHY address 30 was used and an internal PHY was assumed when the PHY address was different. To verify that b44_phy_reset() was called and checked if it worked, otherwise PHY address 30 was assumed, an external PHY. It is better to check the register which says which PHY is connected to the MAC instead of checking the PHY address. The interface to an external PHY was only activated when this register was set. This also changes B44_FLAG_INTERNAL_PHY to B44_FLAG_EXTERNAL_PHY, it is easier to check. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
a181ceb501
commit
d61941952d
@ -284,7 +284,7 @@ static int __b44_writephy(struct b44 *bp, int phy_addr, int reg, u32 val)
|
||||
|
||||
static inline int b44_readphy(struct b44 *bp, int reg, u32 *val)
|
||||
{
|
||||
if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
|
||||
if (bp->flags & B44_FLAG_EXTERNAL_PHY)
|
||||
return 0;
|
||||
|
||||
return __b44_readphy(bp, bp->phy_addr, reg, val);
|
||||
@ -292,7 +292,7 @@ static inline int b44_readphy(struct b44 *bp, int reg, u32 *val)
|
||||
|
||||
static inline int b44_writephy(struct b44 *bp, int reg, u32 val)
|
||||
{
|
||||
if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
|
||||
if (bp->flags & B44_FLAG_EXTERNAL_PHY)
|
||||
return 0;
|
||||
|
||||
return __b44_writephy(bp, bp->phy_addr, reg, val);
|
||||
@ -321,7 +321,7 @@ static int b44_phy_reset(struct b44 *bp)
|
||||
u32 val;
|
||||
int err;
|
||||
|
||||
if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
|
||||
if (bp->flags & B44_FLAG_EXTERNAL_PHY)
|
||||
return 0;
|
||||
err = b44_writephy(bp, MII_BMCR, BMCR_RESET);
|
||||
if (err)
|
||||
@ -423,7 +423,7 @@ static int b44_setup_phy(struct b44 *bp)
|
||||
|
||||
b44_wap54g10_workaround(bp);
|
||||
|
||||
if (bp->phy_addr == B44_PHY_ADDR_NO_PHY)
|
||||
if (bp->flags & B44_FLAG_EXTERNAL_PHY)
|
||||
return 0;
|
||||
if ((err = b44_readphy(bp, B44_MII_ALEDCTRL, &val)) != 0)
|
||||
goto out;
|
||||
@ -521,7 +521,7 @@ static void b44_check_phy(struct b44 *bp)
|
||||
{
|
||||
u32 bmsr, aux;
|
||||
|
||||
if (bp->phy_addr == B44_PHY_ADDR_NO_PHY) {
|
||||
if (bp->flags & B44_FLAG_EXTERNAL_PHY) {
|
||||
bp->flags |= B44_FLAG_100_BASE_T;
|
||||
bp->flags |= B44_FLAG_FULL_DUPLEX;
|
||||
if (!netif_carrier_ok(bp->dev)) {
|
||||
@ -1315,7 +1315,7 @@ static void b44_chip_reset(struct b44 *bp, int reset_kind)
|
||||
if (!(br32(bp, B44_DEVCTRL) & DEVCTRL_IPP)) {
|
||||
bw32(bp, B44_ENET_CTRL, ENET_CTRL_EPSEL);
|
||||
br32(bp, B44_ENET_CTRL);
|
||||
bp->flags &= ~B44_FLAG_INTERNAL_PHY;
|
||||
bp->flags |= B44_FLAG_EXTERNAL_PHY;
|
||||
} else {
|
||||
u32 val = br32(bp, B44_DEVCTRL);
|
||||
|
||||
@ -1324,7 +1324,7 @@ static void b44_chip_reset(struct b44 *bp, int reset_kind)
|
||||
br32(bp, B44_DEVCTRL);
|
||||
udelay(100);
|
||||
}
|
||||
bp->flags |= B44_FLAG_INTERNAL_PHY;
|
||||
bp->flags &= ~B44_FLAG_EXTERNAL_PHY;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1828,8 +1828,8 @@ static int b44_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
|
||||
DUPLEX_FULL : DUPLEX_HALF;
|
||||
cmd->port = 0;
|
||||
cmd->phy_address = bp->phy_addr;
|
||||
cmd->transceiver = (bp->flags & B44_FLAG_INTERNAL_PHY) ?
|
||||
XCVR_INTERNAL : XCVR_EXTERNAL;
|
||||
cmd->transceiver = (bp->flags & B44_FLAG_EXTERNAL_PHY) ?
|
||||
XCVR_EXTERNAL : XCVR_INTERNAL;
|
||||
cmd->autoneg = (bp->flags & B44_FLAG_FORCE_LINK) ?
|
||||
AUTONEG_DISABLE : AUTONEG_ENABLE;
|
||||
if (cmd->autoneg == AUTONEG_ENABLE)
|
||||
|
@ -376,7 +376,7 @@ struct b44 {
|
||||
#define B44_FLAG_ADV_10FULL 0x02000000
|
||||
#define B44_FLAG_ADV_100HALF 0x04000000
|
||||
#define B44_FLAG_ADV_100FULL 0x08000000
|
||||
#define B44_FLAG_INTERNAL_PHY 0x10000000
|
||||
#define B44_FLAG_EXTERNAL_PHY 0x10000000
|
||||
#define B44_FLAG_RX_RING_HACK 0x20000000
|
||||
#define B44_FLAG_TX_RING_HACK 0x40000000
|
||||
#define B44_FLAG_WOL_ENABLE 0x80000000
|
||||
|
Loading…
Reference in New Issue
Block a user