All of lore.kernel.org
 help / color / mirror / Atom feed
From: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
To: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
	"David S . Miller" <davem@davemloft.net>
Cc: Andrew Lunn <andrew@lunn.ch>,
	Geert Uytterhoeven <geert@linux-m68k.org>,
	<netdev@vger.kernel.org>, <linux-renesas-soc@vger.kernel.org>
Subject: [PATCH v2 02/14] sh_eth: fix invalid context bug while changing link options by ethtool
Date: Wed, 4 Jul 2018 11:12:40 +0300	[thread overview]
Message-ID: <20180704081245.7395-3-vladimir_zapolskiy@mentor.com> (raw)
In-Reply-To: <20180704081245.7395-1-vladimir_zapolskiy@mentor.com>

The change fixes sleep in atomic context bug, which is encountered
every time when link settings are changed by ethtool.

Since commit 35b5f6b1a82b ("PHYLIB: Locking fixes for PHY I/O
potentially sleeping") phy_start_aneg() function utilizes a mutex
to serialize changes to phy state, however that helper function is
called in atomic context under a grabbed spinlock, because
phy_start_aneg() is called by phy_ethtool_ksettings_set() and by
replaced phy_ethtool_sset() helpers from phylib.

Now duplex mode setting is enforced in sh_eth_adjust_link() only,
also now RX/TX is disabled when link is put down or modifications
to E-MAC registers ECMR and GECMR are expected for both cases of
checked and ignored link status pin state from E-MAC interrupt handler.

For reference the change is a partial rework of commit 1e1b812bbe10
("sh_eth: fix handling of no LINK signal").

Fixes: dc19e4e5e02f ("sh: sh_eth: Add support ethtool")
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
---
 drivers/net/ethernet/renesas/sh_eth.c | 49 ++++++++-------------------
 1 file changed, 15 insertions(+), 34 deletions(-)

diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index e8aca46bb925..8e429e865552 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -1927,8 +1927,15 @@ static void sh_eth_adjust_link(struct net_device *ndev)
 {
 	struct sh_eth_private *mdp = netdev_priv(ndev);
 	struct phy_device *phydev = ndev->phydev;
+	unsigned long flags;
 	int new_state = 0;
 
+	spin_lock_irqsave(&mdp->lock, flags);
+
+	/* Disable TX and RX right over here, if E-MAC change is ignored */
+	if (mdp->cd->no_psr || mdp->no_ether_link)
+		sh_eth_rcv_snd_disable(ndev);
+
 	if (phydev->link) {
 		if (phydev->duplex != mdp->duplex) {
 			new_state = 1;
@@ -1947,18 +1954,21 @@ static void sh_eth_adjust_link(struct net_device *ndev)
 			sh_eth_modify(ndev, ECMR, ECMR_TXF, 0);
 			new_state = 1;
 			mdp->link = phydev->link;
-			if (mdp->cd->no_psr || mdp->no_ether_link)
-				sh_eth_rcv_snd_enable(ndev);
 		}
 	} else if (mdp->link) {
 		new_state = 1;
 		mdp->link = 0;
 		mdp->speed = 0;
 		mdp->duplex = -1;
-		if (mdp->cd->no_psr || mdp->no_ether_link)
-			sh_eth_rcv_snd_disable(ndev);
 	}
 
+	/* Enable TX and RX right over here, if E-MAC change is ignored */
+	if ((mdp->cd->no_psr || mdp->no_ether_link) && phydev->link)
+		sh_eth_rcv_snd_enable(ndev);
+
+	mmiowb();
+	spin_unlock_irqrestore(&mdp->lock, flags);
+
 	if (new_state && netif_msg_link(mdp))
 		phy_print_status(phydev);
 }
@@ -2049,39 +2059,10 @@ static int sh_eth_get_link_ksettings(struct net_device *ndev,
 static int sh_eth_set_link_ksettings(struct net_device *ndev,
 				     const struct ethtool_link_ksettings *cmd)
 {
-	struct sh_eth_private *mdp = netdev_priv(ndev);
-	unsigned long flags;
-	int ret;
-
 	if (!ndev->phydev)
 		return -ENODEV;
 
-	spin_lock_irqsave(&mdp->lock, flags);
-
-	/* disable tx and rx */
-	sh_eth_rcv_snd_disable(ndev);
-
-	ret = phy_ethtool_ksettings_set(ndev->phydev, cmd);
-	if (ret)
-		goto error_exit;
-
-	if (cmd->base.duplex == DUPLEX_FULL)
-		mdp->duplex = 1;
-	else
-		mdp->duplex = 0;
-
-	if (mdp->cd->set_duplex)
-		mdp->cd->set_duplex(ndev);
-
-error_exit:
-	mdelay(1);
-
-	/* enable tx and rx */
-	sh_eth_rcv_snd_enable(ndev);
-
-	spin_unlock_irqrestore(&mdp->lock, flags);
-
-	return ret;
+	return phy_ethtool_ksettings_set(ndev->phydev, cmd);
 }
 
 /* If it is ever necessary to increase SH_ETH_REG_DUMP_MAX_REGS, the
-- 
2.17.1

  parent reply	other threads:[~2018-07-04  8:13 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-04  8:12 [PATCH v2 00/14] ravb/sh_eth: fix sleep in atomic by reusing shared ethtool handlers Vladimir Zapolskiy
2018-07-04  8:12 ` [PATCH v2 01/14] sh_eth: fix invalid context bug while calling auto-negotiation by ethtool Vladimir Zapolskiy
2018-07-06 15:39   ` Sergei Shtylyov
2018-07-04  8:12 ` Vladimir Zapolskiy [this message]
2018-07-06 18:43   ` [PATCH v2 02/14] sh_eth: fix invalid context bug while changing link options " Sergei Shtylyov
2018-07-04  8:12 ` [PATCH v2 03/14] sh_eth: simplify link auto-negotiation " Vladimir Zapolskiy
2018-07-06 18:48   ` Sergei Shtylyov
2018-07-04  8:12 ` [PATCH v2 04/14] sh_eth: remove custom .nway_reset from ethtool ops Vladimir Zapolskiy
2018-07-06 19:04   ` Sergei Shtylyov
2018-07-04  8:14 ` [PATCH v2 05/14] sh_eth: remove useless serialization in sh_eth_get_link_ksettings() Vladimir Zapolskiy
2018-07-06 19:06   ` Sergei Shtylyov
2018-07-04  8:14 ` [PATCH v2 06/14] sh_eth: remove custom .get_link_ksettings from ethtool ops Vladimir Zapolskiy
2018-07-06 19:08   ` Sergei Shtylyov
2018-07-04  8:14 ` [PATCH v2 07/14] sh_eth: remove custom .set_link_ksettings " Vladimir Zapolskiy
2018-07-06 19:15   ` Sergei Shtylyov
2018-07-04  8:14 ` [PATCH v2 08/14] ravb: fix invalid context bug while calling auto-negotiation by ethtool Vladimir Zapolskiy
2018-07-05  6:09   ` Vladimir Zapolskiy
2018-07-05  6:09     ` Vladimir Zapolskiy
2018-07-05  8:27     ` Sergei Shtylyov
2018-07-06 19:47   ` Sergei Shtylyov
2018-07-04  8:14 ` [PATCH v2 09/14] ravb: fix invalid context bug while changing link options " Vladimir Zapolskiy
2018-07-05  6:09   ` Vladimir Zapolskiy
2018-07-05  6:09     ` Vladimir Zapolskiy
2018-07-06 19:58   ` Sergei Shtylyov
2018-07-04  8:16 ` [PATCH v2 10/14] ravb: simplify link auto-negotiation " Vladimir Zapolskiy
2018-07-06 20:30   ` Sergei Shtylyov
2018-07-04  8:16 ` [PATCH v2 11/14] ravb: remove custom .nway_reset from ethtool ops Vladimir Zapolskiy
2018-07-06 20:30   ` Sergei Shtylyov
2018-07-04  8:16 ` [PATCH v2 12/14] ravb: remove useless serialization in ravb_get_link_ksettings() Vladimir Zapolskiy
2018-07-06 20:31   ` Sergei Shtylyov
2018-07-04  8:16 ` [PATCH v2 13/14] ravb: remove custom .get_link_ksettings from ethtool ops Vladimir Zapolskiy
2018-07-06 20:39   ` Sergei Shtylyov
2018-07-04  8:16 ` [PATCH v2 14/14] ravb: remove custom .set_link_ksettings " Vladimir Zapolskiy
2018-07-06 20:41   ` Sergei Shtylyov
2018-07-05  0:56 ` [PATCH v2 00/14] ravb/sh_eth: fix sleep in atomic by reusing shared ethtool handlers David Miller
2018-07-05  5:59   ` Vladimir Zapolskiy
2018-07-05  5:59     ` Vladimir Zapolskiy
2018-07-05 19:13     ` Sergei Shtylyov
2018-07-05  7:21 ` Geert Uytterhoeven
2018-07-07  1:47 ` David Miller
2018-07-07 15:22   ` Sergei Shtylyov
2018-07-07 23:58     ` David Miller
2018-07-08 23:24       ` Sergei Shtylyov
2018-07-08 23:33         ` Sergei Shtylyov
2018-07-09 18:16         ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180704081245.7395-3-vladimir_zapolskiy@mentor.com \
    --to=vladimir_zapolskiy@mentor.com \
    --cc=andrew@lunn.ch \
    --cc=davem@davemloft.net \
    --cc=geert@linux-m68k.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=sergei.shtylyov@cogentembedded.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.