Skip to content

Commit 85ba108

Browse files
Russell King (Oracle)kuba-moo
authored andcommitted
net: stmmac: dwmac4: fix PCS duplex mode decode
dwmac4 was decoding the duplex mode from the GMAC_PHYIF_CONTROL_STATUS register incorrectly, using GMAC_PHYIF_CTRLSTATUS_LNKMOD_MASK (value 1) rather than GMAC_PHYIF_CTRLSTATUS_LNKMOD (bit 16). Fix this. Fixes: 70523e6 ("drivers: net: stmmac: reworking the PCS code.") Reviewed-by: Andrew Halaney <ahalaney@redhat.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Serge Semin <fancer.lancer@gmail.com> Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Link: https://patch.msgid.link/E1sbJvd-001rGD-E3@rmk-PC.armlinux.org.uk Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent b928e7d commit 85ba108

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

drivers/net/ethernet/stmicro/stmmac/dwmac4.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,6 @@ static inline u32 mtl_low_credx_base_addr(const struct dwmac4_addrs *addrs,
573573
#define GMAC_PHYIF_CTRLSTATUS_LNKSTS BIT(19)
574574
#define GMAC_PHYIF_CTRLSTATUS_JABTO BIT(20)
575575
#define GMAC_PHYIF_CTRLSTATUS_FALSECARDET BIT(21)
576-
/* LNKMOD */
577-
#define GMAC_PHYIF_CTRLSTATUS_LNKMOD_MASK 0x1
578576
/* LNKSPEED */
579577
#define GMAC_PHYIF_CTRLSTATUS_SPEED_125 0x2
580578
#define GMAC_PHYIF_CTRLSTATUS_SPEED_25 0x1

drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@ static void dwmac4_phystatus(void __iomem *ioaddr, struct stmmac_extra_stats *x)
786786
else
787787
x->pcs_speed = SPEED_10;
788788

789-
x->pcs_duplex = (status & GMAC_PHYIF_CTRLSTATUS_LNKMOD_MASK);
789+
x->pcs_duplex = (status & GMAC_PHYIF_CTRLSTATUS_LNKMOD);
790790

791791
pr_info("Link is Up - %d/%s\n", (int)x->pcs_speed,
792792
x->pcs_duplex ? "Full" : "Half");

0 commit comments

Comments
 (0)