| From 1ec2cfedee4c0001903e98e21555cbf7f73f2586 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 10 Jul 2020 14:46:45 +0200 |
| Subject: net: macb: fix call to pm_runtime in the suspend/resume functions |
| |
| From: Nicolas Ferre <nicolas.ferre@microchip.com> |
| |
| [ Upstream commit 6c8f85cac98a4c6b767c4c4f6af7283724c32b47 ] |
| |
| 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> |
| Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> |
| Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 e7fafe2fcae5d..01ed4d4296db2 100644 |
| --- a/drivers/net/ethernet/cadence/macb_main.c |
| +++ b/drivers/net/ethernet/cadence/macb_main.c |
| @@ -4453,7 +4453,8 @@ static int __maybe_unused macb_suspend(struct device *dev) |
| netif_carrier_off(netdev); |
| 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; |
| } |
| @@ -4468,7 +4469,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)); |
| -- |
| 2.25.1 |
| |