| Message ID | 1535567269-12534-1-git-send-email-opendmb@gmail.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net,v2] net: bcmgenet: use MAC link status for fixed phy | expand |
From: Doug Berger <opendmb@gmail.com> Date: Wed, 29 Aug 2018 11:27:49 -0700 > When using the fixed PHY with GENET (e.g. MOCA) the PHY link > status can be determined from the internal link status captured > by the MAC. This allows the PHY state machine to use the correct > link state with the fixed PHY even if MAC link event interrupts > are missed when the net device is opened. > > Fixes: 8d88c6ebb34c ("net: bcmgenet: enable MoCA link state change detection") > Signed-off-by: Doug Berger <opendmb@gmail.com> > --- > v2: increased "Fixes" sha1 to 12 digits This doesn't apply cleanly to the net tree.
On 8/31/2018 10:59 PM, David Miller wrote: > From: Doug Berger <opendmb@gmail.com> > Date: Wed, 29 Aug 2018 11:27:49 -0700 > >> When using the fixed PHY with GENET (e.g. MOCA) the PHY link >> status can be determined from the internal link status captured >> by the MAC. This allows the PHY state machine to use the correct >> link state with the fixed PHY even if MAC link event interrupts >> are missed when the net device is opened. >> >> Fixes: 8d88c6ebb34c ("net: bcmgenet: enable MoCA link state change detection") >> Signed-off-by: Doug Berger <opendmb@gmail.com> >> --- >> v2: increased "Fixes" sha1 to 12 digits > > This doesn't apply cleanly to the net tree. You've applied and fixed the sha1 to 12 digits (thanks for doing that) of the v1 previously submitted: https://git.kernel.org/pub/scm/linux/kernel/git/davem/net.git/commit/?id=c3c397c1f16c51601a3fac4fe0c63ad8aa85a904
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.h b/drivers/net/ethernet/broadcom/genet/bcmgenet.h index b773bc07edf7..14b49612aa86 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.h +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.h @@ -186,6 +186,9 @@ struct bcmgenet_mib_counters { #define UMAC_MAC1 0x010 #define UMAC_MAX_FRAME_LEN 0x014 +#define UMAC_MODE 0x44 +#define MODE_LINK_STATUS (1 << 5) + #define UMAC_EEE_CTRL 0x064 #define EN_LPI_RX_PAUSE (1 << 0) #define EN_LPI_TX_PFC (1 << 1) diff --git a/drivers/net/ethernet/broadcom/genet/bcmmii.c b/drivers/net/ethernet/broadcom/genet/bcmmii.c index 5333274a283c..4241ae928d4a 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmmii.c +++ b/drivers/net/ethernet/broadcom/genet/bcmmii.c @@ -115,8 +115,14 @@ void bcmgenet_mii_setup(struct net_device *dev) static int bcmgenet_fixed_phy_link_update(struct net_device *dev, struct fixed_phy_status *status) { - if (dev && dev->phydev && status) - status->link = dev->phydev->link; + struct bcmgenet_priv *priv; + u32 reg; + + if (dev && dev->phydev && status) { + priv = netdev_priv(dev); + reg = bcmgenet_umac_readl(priv, UMAC_MODE); + status->link = !!(reg & MODE_LINK_STATUS); + } return 0; }
When using the fixed PHY with GENET (e.g. MOCA) the PHY link status can be determined from the internal link status captured by the MAC. This allows the PHY state machine to use the correct link state with the fixed PHY even if MAC link event interrupts are missed when the net device is opened. Fixes: 8d88c6ebb34c ("net: bcmgenet: enable MoCA link state change detection") Signed-off-by: Doug Berger <opendmb@gmail.com> --- v2: increased "Fixes" sha1 to 12 digits drivers/net/ethernet/broadcom/genet/bcmgenet.h | 3 +++ drivers/net/ethernet/broadcom/genet/bcmmii.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-)