ravb: Clean up duplex handling

BugLink: https://bugs.launchpad.net/bugs/1857158
[ Upstream commit 08b43857804dd0eca48f5c5a84885cf0079586e0 ]

Since only full-duplex operation is supported by the
hardware, remove duplex handling code and keep the
register setting of ECMR.DM fixed at 1.

This updates the driver implementation to follow the
data sheet text "This bit should always be set to 1."

Fixes: c156633f1353 ("Renesas Ethernet AVB driver proper")
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Reviewed-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>

diff --git a/drivers/net/ethernet/renesas/ravb.h b/drivers/net/ethernet/renesas/ravb.h
index 897bd33c2c508411a7fb075e97dc6d0f468949b5..e1c95db31dcf69e5ea942b83a543b4f616420687 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb.h
+++ b/drivers/net/ethernet/renesas/ravb.h
@@ -1031,7 +1031,6 @@ struct ravb_private {
        phy_interface_t phy_interface;
        int msg_enable;
        int speed;
-       int duplex;
        int emac_irq;
        enum ravb_chip_id chip_id;
        int rx_irqs[NUM_RX_QUEUE];

diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c
index 720aad8992d905d8a2353f95ca32bcd4f0853238..aa813fdd09c29a05f7368c0ed29c21942b578462 100644 (file)
--- a/drivers/net/ethernet/renesas/ravb_main.c
+++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -85,13 +85,6 @@ static int ravb_config(struct net_device *ndev)
        return error;
 }
 
-static void ravb_set_duplex(struct net_device *ndev)
-{
-       struct ravb_private *priv = netdev_priv(ndev);
-
-       ravb_modify(ndev, ECMR, ECMR_DM, priv->duplex ? ECMR_DM : 0);
-}
-
 static void ravb_set_rate(struct net_device *ndev)
 {
        struct ravb_private *priv = netdev_priv(ndev);
@@ -398,13 +391,11 @@ error:
 /* E-MAC init function */
 static void ravb_emac_init(struct net_device *ndev)
 {
-       struct ravb_private *priv = netdev_priv(ndev);
-
        /* Receive frame limit set register */
        ravb_write(ndev, ndev->mtu + ETH_HLEN + VLAN_HLEN + ETH_FCS_LEN, RFLR);
 
        /* EMAC Mode: PAUSE prohibition; Duplex; RX Checksum; TX; RX */
-       ravb_write(ndev, ECMR_ZPF | (priv->duplex ? ECMR_DM : 0) |
+       ravb_write(ndev, ECMR_ZPF | ECMR_DM |
                   (ndev->features & NETIF_F_RXCSUM ? ECMR_RCSC : 0) |
                   ECMR_TE | ECMR_RE, ECMR);
 
@@ -991,12 +982,6 @@ static void ravb_adjust_link(struct net_device *ndev)
                ravb_rcv_snd_disable(ndev);
 
        if (phydev->link) {
-               if (phydev->duplex != priv->duplex) {
-                       new_state = true;
-                       priv->duplex = phydev->duplex;
-                       ravb_set_duplex(ndev);
-               }
-
                if (phydev->speed != priv->speed) {
                        new_state = true;
                        priv->speed = phydev->speed;
@@ -1011,7 +996,6 @@ static void ravb_adjust_link(struct net_device *ndev)
                new_state = true;
                priv->link = 0;
                priv->speed = 0;
-               priv->duplex = -1;
        }
 
        /* Enable TX and RX right over here, if E-MAC change is ignored */
@@ -1041,7 +1025,6 @@ static int ravb_phy_init(struct net_device *ndev)
 
        priv->link = 0;
        priv->speed = 0;
-       priv->duplex = -1;
 
        /* Try connecting to PHY */
        pn = of_parse_phandle(np, "phy-handle", 0);