net: stmmac: Use mutex instead of spinlock

commit 29555fa3de865630570b5f53c847b953413daf1a upstream.

Some drivers, such as DWC EQOS on Tegra, need to perform operations that
can sleep under this lock (clk_set_rate() in tegra_eqos_fix_speed()) for
proper operation. Since there is no need for this lock to be a spinlock,
convert it to a mutex instead.

Fixes: e6ea2d16fc61 ("net: stmmac: dwc-qos: Add Tegra186 support")
Reported-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Thierry Reding <treding@nvidia.com>
Tested-by: Bhadram Varka <vbhadram@nvidia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac.h b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
index a916e13624ebe06e12903f2e5d6f92bc4dbda861..d1f4696f2abb4e2b25fcc550bc36791059ba820b 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac.h
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac.h
@@ -96,7 +96,7 @@ struct stmmac_priv {
        struct net_device *dev;
        struct device *device;
        struct mac_device_info *hw;
-       spinlock_t lock;
+       struct mutex lock;
 
        /* RX Queue */
        struct stmmac_rx_queue rx_queue[MTL_MAX_RX_QUEUES];

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
index ecddd9948788ab70a7f9d2fdc8195abf28cab6ab..8c71090081852d3f11c3b93d028e0a94fb514303 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
@@ -392,13 +392,13 @@ stmmac_ethtool_set_link_ksettings(struct net_device *dev,
                        ADVERTISED_10baseT_Half |
                        ADVERTISED_10baseT_Full);
 
-               spin_lock(&priv->lock);
+               mutex_lock(&priv->lock);
 
                if (priv->hw->mac->pcs_ctrl_ane)
                        priv->hw->mac->pcs_ctrl_ane(priv->ioaddr, 1,
                                                    priv->hw->ps, 0);
 
-               spin_unlock(&priv->lock);
+               mutex_unlock(&priv->lock);
 
                return 0;
        }
@@ -615,12 +615,12 @@ static void stmmac_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
 {
        struct stmmac_priv *priv = netdev_priv(dev);
 
-       spin_lock_irq(&priv->lock);
+       mutex_lock(&priv->lock);
        if (device_can_wakeup(priv->device)) {
                wol->supported = WAKE_MAGIC | WAKE_UCAST;
                wol->wolopts = priv->wolopts;
        }
-       spin_unlock_irq(&priv->lock);
+       mutex_unlock(&priv->lock);
 }
 
 static int stmmac_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
@@ -649,9 +649,9 @@ static int stmmac_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
                disable_irq_wake(priv->wol_irq);
        }
 
-       spin_lock_irq(&priv->lock);
+       mutex_lock(&priv->lock);
        priv->wolopts = wol->wolopts;
-       spin_unlock_irq(&priv->lock);
+       mutex_unlock(&priv->lock);
 
        return 0;
 }

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 81d446469a3543dde6554c14f9a1977d4ecd6a39..b4c8e673fe25602a000b0b9604f8b453cec05cc8 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -365,7 +365,6 @@ bool stmmac_eee_init(struct stmmac_priv *priv)
 {
        struct net_device *ndev = priv->dev;
        int interface = priv->plat->interface;
-       unsigned long flags;
        bool ret = false;
 
        if ((interface != PHY_INTERFACE_MODE_MII) &&
@@ -392,7 +391,7 @@ bool stmmac_eee_init(struct stmmac_priv *priv)
                         * changed).
                         * In that case the driver disable own timers.
                         */
-                       spin_lock_irqsave(&priv->lock, flags);
+                       mutex_lock(&priv->lock);
                        if (priv->eee_active) {
                                netdev_dbg(priv->dev, "disable EEE\n");
                                del_timer_sync(&priv->eee_ctrl_timer);
@@ -400,11 +399,11 @@ bool stmmac_eee_init(struct stmmac_priv *priv)
                                                             tx_lpi_timer);
                        }
                        priv->eee_active = 0;
-                       spin_unlock_irqrestore(&priv->lock, flags);
+                       mutex_unlock(&priv->lock);
                        goto out;
                }
                /* Activate the EEE and start timers */
-               spin_lock_irqsave(&priv->lock, flags);
+               mutex_lock(&priv->lock);
                if (!priv->eee_active) {
                        priv->eee_active = 1;
                        setup_timer(&priv->eee_ctrl_timer,
@@ -421,7 +420,7 @@ bool stmmac_eee_init(struct stmmac_priv *priv)
                priv->hw->mac->set_eee_pls(priv->hw, ndev->phydev->link);
 
                ret = true;
-               spin_unlock_irqrestore(&priv->lock, flags);
+               mutex_unlock(&priv->lock);
 
                netdev_dbg(priv->dev, "Energy-Efficient Ethernet initialized\n");
        }
@@ -799,13 +798,12 @@ static void stmmac_adjust_link(struct net_device *dev)
 {
        struct stmmac_priv *priv = netdev_priv(dev);
        struct phy_device *phydev = dev->phydev;
-       unsigned long flags;
        bool new_state = false;
 
        if (!phydev)
                return;
 
-       spin_lock_irqsave(&priv->lock, flags);
+       mutex_lock(&priv->lock);
 
        if (phydev->link) {
                u32 ctrl = readl(priv->ioaddr + MAC_CTRL_REG);
@@ -864,7 +862,7 @@ static void stmmac_adjust_link(struct net_device *dev)
        if (new_state && netif_msg_link(priv))
                phy_print_status(phydev);
 
-       spin_unlock_irqrestore(&priv->lock, flags);
+       mutex_unlock(&priv->lock);
 
        if (phydev->is_pseudo_fixed_link)
                /* Stop PHY layer to call the hook to adjust the link in case
@@ -4284,7 +4282,7 @@ int stmmac_dvr_probe(struct device *device,
                               (8 * priv->plat->rx_queues_to_use));
        }
 
-       spin_lock_init(&priv->lock);
+       mutex_init(&priv->lock);
 
        /* If a specific clk_csr value is passed from the platform
         * this means that the CSR Clock Range selection cannot be
@@ -4375,6 +4373,7 @@ int stmmac_dvr_remove(struct device *dev)
            priv->hw->pcs != STMMAC_PCS_TBI &&
            priv->hw->pcs != STMMAC_PCS_RTBI)
                stmmac_mdio_unregister(ndev);
+       mutex_destroy(&priv->lock);
        free_netdev(ndev);
 
        return 0;
@@ -4392,7 +4391,6 @@ int stmmac_suspend(struct device *dev)
 {
        struct net_device *ndev = dev_get_drvdata(dev);
        struct stmmac_priv *priv = netdev_priv(ndev);
-       unsigned long flags;
 
        if (!ndev || !netif_running(ndev))
                return 0;
@@ -4400,7 +4398,7 @@ int stmmac_suspend(struct device *dev)
        if (ndev->phydev)
                phy_stop(ndev->phydev);
 
-       spin_lock_irqsave(&priv->lock, flags);
+       mutex_lock(&priv->lock);
 
        netif_device_detach(ndev);
        stmmac_stop_all_queues(priv);
@@ -4423,7 +4421,7 @@ int stmmac_suspend(struct device *dev)
                clk_disable_unprepare(priv->plat->pclk);
                clk_disable_unprepare(priv->plat->stmmac_clk);
        }
-       spin_unlock_irqrestore(&priv->lock, flags);
+       mutex_unlock(&priv->lock);
 
        priv->oldlink = false;
        priv->speed = SPEED_UNKNOWN;
@@ -4467,7 +4465,6 @@ int stmmac_resume(struct device *dev)
 {
        struct net_device *ndev = dev_get_drvdata(dev);
        struct stmmac_priv *priv = netdev_priv(ndev);
-       unsigned long flags;
 
        if (!netif_running(ndev))
                return 0;
@@ -4479,9 +4476,9 @@ int stmmac_resume(struct device *dev)
         * from another devices (e.g. serial console).
         */
        if (device_may_wakeup(priv->device)) {
-               spin_lock_irqsave(&priv->lock, flags);
+               mutex_lock(&priv->lock);
                priv->hw->mac->pmt(priv->hw, 0);
-               spin_unlock_irqrestore(&priv->lock, flags);
+               mutex_unlock(&priv->lock);
                priv->irq_wake = 0;
        } else {
                pinctrl_pm_select_default_state(priv->device);
@@ -4497,7 +4494,7 @@ int stmmac_resume(struct device *dev)
 
        netif_device_attach(ndev);
 
-       spin_lock_irqsave(&priv->lock, flags);
+       mutex_lock(&priv->lock);
 
        stmmac_reset_queues_param(priv);
 
@@ -4516,7 +4513,7 @@ int stmmac_resume(struct device *dev)
 
        stmmac_start_all_queues(priv);
 
-       spin_unlock_irqrestore(&priv->lock, flags);
+       mutex_unlock(&priv->lock);
 
        if (ndev->phydev)
                phy_start(ndev->phydev);