Skip to content

Commit

Permalink
net: ethernet: fec: Prevent MII event after MII_SPEED write
Browse files Browse the repository at this point in the history
The change to polled IO for MDIO completion assumes that MII events
are only generated for MDIO transactions. However on some SoCs writing
to the MII_SPEED register can also trigger an MII event. As a result,
the next MDIO read has a pending MII event, and immediately reads the
data registers before it contains useful data. When the read does
complete, another MII event is posted, which results in the next read
also going wrong, and the cycle continues.

By writing 0 to the MII_DATA register before writing to the speed
register, this MII event for the MII_SPEED is suppressed, and polled
IO works as expected.

Fixes: 29ae6bd ("net: ethernet: fec: Replace interrupt driven MDIO with polled IO")
Reported-by: Andy Duan <fugang.duan@nxp.com>
Suggested-by: Andy Duan <fugang.duan@nxp.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Andrew Lunn authored and David S. Miller committed Apr 28, 2020
1 parent 88fb831 commit 790ab24
Showing 1 changed file with 17 additions and 0 deletions.
17 changes: 17 additions & 0 deletions drivers/net/ethernet/freescale/fec_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -996,6 +996,9 @@ fec_restart(struct net_device *ndev)
writel(0x0, fep->hwp + FEC_X_CNTRL);
}

/* Prevent an MII event being report when changing speed */
writel(0, fep->hwp + FEC_MII_DATA);

/* Set MII speed */
writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);

Expand Down Expand Up @@ -1182,6 +1185,10 @@ fec_stop(struct net_device *ndev)
writel(val, fep->hwp + FEC_ECNTRL);
fec_enet_stop_mode(fep, true);
}

/* Prevent an MII event being report when changing speed */
writel(0, fep->hwp + FEC_MII_DATA);

writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);

/* We have to keep ENET enabled to have MII interrupt stay working */
Expand Down Expand Up @@ -2142,6 +2149,16 @@ static int fec_enet_mii_init(struct platform_device *pdev)
if (suppress_preamble)
fep->phy_speed |= BIT(7);

/* Clear MMFR to avoid to generate MII event by writing MSCR.
* MII event generation condition:
* - writing MSCR:
* - mmfr[31:0]_not_zero & mscr[7:0]_is_zero &
* mscr_reg_data_in[7:0] != 0
* - writing MMFR:
* - mscr[7:0]_not_zero
*/
writel(0, fep->hwp + FEC_MII_DATA);

writel(fep->phy_speed, fep->hwp + FEC_MII_SPEED);

/* Clear any pending transaction complete indication */
Expand Down

0 comments on commit 790ab24

Please sign in to comment.