gianfar: fix sleep in atomic...
Subsystems (2)
PATCH 1/1 gianfar: fix sleep in atomic...
Since device_set_wakeup_enable now sleeps, it should not be called from a critical section. Since wol_en is not updated elsewhere, we can omit the locking entirely.
drivers/net/gianfar_ethtool.c +0 -0
@@ -635,10 +635,8 @@ static int gfar_set_wol(struct net_device *dev,
struct ethtool_wolinfo *wol)
if (wol->wolopts & ~WAKE_MAGIC)
return -EINVAL;
- spin_lock_irqsave(&priv->bflock, flags);
priv->wol_en = wol->wolopts & WAKE_MAGIC ? 1 : 0; device_set_wakeup_enable(&dev->dev, priv->wol_en);
- spin_unlock_irqrestore(&priv->bflock, flags);
return 0;
}
Signature · 1 line
Daniel J Blueman
Quoted 5 lines · Daniel J Blueman
Since
device_set_wakeup_enablenow sleeps, it should not be called from a critical section. Sincewol_enis not updated elsewhere, we can omit the locking entirely.Signed-off-by Daniel J Blueman <[email protected]>
Quoted 17 lines
drivers/net/gianfar_ethtool.c +0
-2@@ -635,10 +635,8 @@ static int gfar_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)if (wol->wolopts & ~WAKE_MAGIC )return -EINVAL ; -spin_lock_irqsave (&priv->bflock, flags); priv->wol_en = wol->wolopts &WAKE_MAGIC ?1 :0 ;device_set_wakeup_enable (&dev->dev, priv->wol_en); -spin_unlock_irqrestore (&priv->bflock, flags);return 0 ;}
PATCH 1/1 gianfar: Do not call device_set_wakeup_enable() under a spinlock
Quoted 8 lines · Rafael J. Wysocki
Quoted 5 lines · Daniel J Blueman
Since
device_set_wakeup_enablenow sleeps, it should not be called from a critical section. Sincewol_enis not updated elsewhere, we can omit the locking entirely.Signed-off-by Daniel J Blueman <[email protected]>
Having reconsidered that I think it may be better to do something like in the patch below.
This is a regression fix, so please apply if there are no objections.
Thanks,
Rafael
---
From: Rafael J. Wysocki <[email protected]>
Subject: gianfar: Do not call device_set_wakeup_enable() under a spinlock
The gianfar driver calls device_set_wakeup_enable() under a spinlock, which causes a problem to happen after the recent core power management changes, because this function can sleep now. Fix this by moving the device_set_wakeup_enable() call out of the spinlock-protected area.
--- drivers/net/gianfar_ethtool.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/gianfar_ethtool.c +3 -2
@@ -635,9 +635,10 @@ static int gfar_set_wol(struct net_devicif (wol->wolopts & ~WAKE_MAGIC )return -EINVAL ; +device_set_wakeup_enable (&dev->dev, wol->wolopts &WAKE_MAGIC ); +spin_lock_irqsave (&priv->bflock, flags); - priv->wol_en = wol->wolopts &WAKE_MAGIC ?1 :0 ; -device_set_wakeup_enable (&dev->dev, priv->wol_en); + priv->wol_en = !!device_may_wakeup (&dev->dev);spin_unlock_irqrestore (&priv->bflock, flags);return 0 ;
David Miller
maintainerRe: [PATCH] gianfar: Do not call device_set_wakeup_enable() under a spinlock
From: "Rafael J. Wysocki" <[email protected]>
Date: Tue, 9 Nov 2010 22:54:19 +0100
Quoted 7 lines
The gianfar driver calls
device_set_wakeup_enable()under a spinlock, which causes a problem to happen after the recent core power management changes, because this function can sleep now. Fix this by moving thedevice_set_wakeup_enable()call out of the spinlock-protected area.Signed-off-by Rafael J. Wysocki <[email protected]>
Patch applied, thank you.