| Message ID | 1c537d1287aaf57b8b20a923686dbb551e1727f0.1587463802.git.nicolas.ferre@microchip.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | net: macb: Wake-on-Lan magic packet fixes and GEM handling | expand |
On 4/21/2020 3:41 AM, nicolas.ferre@microchip.com wrote: > From: Nicolas Ferre <nicolas.ferre@microchip.com> > > The calls to pm_runtime_force_suspend/resume() functions are only > relevant if the device is not configured to act as a WoL wakeup source. > Add the device_may_wakeup() test before calling them. > > Fixes: 3e2a5e153906 ("net: macb: add wake-on-lan support via magic packet") > Cc: Claudiu Beznea <claudiu.beznea@microchip.com> > Cc: Harini Katakam <harini.katakam@xilinx.com> > Cc: Sergio Prado <sergio.prado@e-labworks.com> > Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com> > --- > Changes in v2: > - new in v2 serries > > drivers/net/ethernet/cadence/macb_main.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c > index 72b8983a763a..8cf8e21fbb07 100644 > --- a/drivers/net/ethernet/cadence/macb_main.c > +++ b/drivers/net/ethernet/cadence/macb_main.c > @@ -4564,7 +4564,8 @@ static int __maybe_unused macb_suspend(struct device *dev) > > if (bp->ptp_info) > bp->ptp_info->ptp_remove(netdev); > - pm_runtime_force_suspend(dev); > + if (!(device_may_wakeup(dev))) > + pm_runtime_force_suspend(dev); Only if you need to respin, the parenthesis around device_may_wakeup() are not required: Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 72b8983a763a..8cf8e21fbb07 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -4564,7 +4564,8 @@ static int __maybe_unused macb_suspend(struct device *dev) if (bp->ptp_info) bp->ptp_info->ptp_remove(netdev); - pm_runtime_force_suspend(dev); + if (!(device_may_wakeup(dev))) + pm_runtime_force_suspend(dev); return 0; } @@ -4579,7 +4580,8 @@ static int __maybe_unused macb_resume(struct device *dev) if (!netif_running(netdev)) return 0; - pm_runtime_force_resume(dev); + if (!(device_may_wakeup(dev))) + pm_runtime_force_resume(dev); if (bp->wol & MACB_WOL_ENABLED) { macb_writel(bp, IDR, MACB_BIT(WOL));