Skip to content

Commit d78c0ce

Browse files
claudiubezneaPaolo Abeni
authored andcommitted
net: ravb: Make write access to CXR35 first before accessing other EMAC registers
Hardware manual of RZ/G3S (and RZ/G2L) specifies the following on the description of CXR35 register (chapter "PHY interface select register (CXR35)"): "After release reset, make write-access to this register before making write-access to other registers (except MDIOMOD). Even if not need to change the value of this register, make write-access to this register at least one time. Because RGMII/MII MODE is recognized by accessing this register". The setup procedure for EMAC module (chapter "Setup procedure" of RZ/G3S, RZ/G2L manuals) specifies the E-MAC.CXR35 register is the first EMAC register that is to be configured. Note [A] from chapter "PHY interface select register (CXR35)" specifies the following: [A] The case which CXR35 SEL_XMII is used for the selection of RGMII/MII in APB Clock 100 MHz. (1) To use RGMII interface, Set ‘H’03E8_0000’ to this register. (2) To use MII interface, Set ‘H’03E8_0002’ to this register. Take into account these indication. Fixes: 1089877 ("ravb: Add RZ/G2L MII interface support") Reviewed-by: Sergey Shtylyov <[email protected]> Signed-off-by: Claudiu Beznea <[email protected]> Signed-off-by: Paolo Abeni <[email protected]>
1 parent 88b7483 commit d78c0ce

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

drivers/net/ethernet/renesas/ravb_main.c

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,15 @@ static void ravb_emac_init_gbeth(struct net_device *ndev)
515515
{
516516
struct ravb_private *priv = netdev_priv(ndev);
517517

518+
if (priv->phy_interface == PHY_INTERFACE_MODE_MII) {
519+
ravb_write(ndev, (1000 << 16) | CXR35_SEL_XMII_MII, CXR35);
520+
ravb_modify(ndev, CXR31, CXR31_SEL_LINK0 | CXR31_SEL_LINK1, 0);
521+
} else {
522+
ravb_write(ndev, (1000 << 16) | CXR35_SEL_XMII_RGMII, CXR35);
523+
ravb_modify(ndev, CXR31, CXR31_SEL_LINK0 | CXR31_SEL_LINK1,
524+
CXR31_SEL_LINK0);
525+
}
526+
518527
/* Receive frame limit set register */
519528
ravb_write(ndev, GBETH_RX_BUFF_MAX + ETH_FCS_LEN, RFLR);
520529

@@ -537,14 +546,6 @@ static void ravb_emac_init_gbeth(struct net_device *ndev)
537546

538547
/* E-MAC interrupt enable register */
539548
ravb_write(ndev, ECSIPR_ICDIP, ECSIPR);
540-
541-
if (priv->phy_interface == PHY_INTERFACE_MODE_MII) {
542-
ravb_modify(ndev, CXR31, CXR31_SEL_LINK0 | CXR31_SEL_LINK1, 0);
543-
ravb_write(ndev, (1000 << 16) | CXR35_SEL_XMII_MII, CXR35);
544-
} else {
545-
ravb_modify(ndev, CXR31, CXR31_SEL_LINK0 | CXR31_SEL_LINK1,
546-
CXR31_SEL_LINK0);
547-
}
548549
}
549550

550551
static void ravb_emac_init_rcar(struct net_device *ndev)

0 commit comments

Comments
 (0)