From: <nicolas.ferre@microchip.com>
To: <linux-arm-kernel@lists.infradead.org>, <netdev@vger.kernel.org>,
"Claudiu Beznea" <claudiu.beznea@microchip.com>,
<harini.katakam@xilinx.com>
Cc: <linux-kernel@vger.kernel.org>,
"David S. Miller" <davem@davemloft.net>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
<antoine.tenart@bootlin.com>, <f.fainelli@gmail.com>,
<linux@armlinux.org.uk>, <andrew@lunn.ch>,
<michal.simek@xilinx.com>,
"Nicolas Ferre" <nicolas.ferre@microchip.com>,
Sergio Prado <sergio.prado@e-labworks.com>
Subject: [PATCH v3 5/7] net: macb: fix call to pm_runtime in the suspend/resume functions
Date: Mon, 4 May 2020 15:44:20 +0200 [thread overview]
Message-ID: <e985e9247478205d66507cd1bd74b6f8fb6c829f.1588597759.git.nicolas.ferre@microchip.com> (raw)
In-Reply-To: <cover.1588597759.git.nicolas.ferre@microchip.com>
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>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
---
Changes in v3:
- remove the parenthesis around device_may_wakeup()
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..b42831966ffa 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));
--
2.26.2
next prev parent reply other threads:[~2020-05-04 13:47 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-04 13:44 [PATCH v3 0/7] net: macb: Wake-on-Lan magic packet fixes and GEM handling nicolas.ferre
2020-05-04 13:44 ` [PATCH v3 1/7] net: macb: fix wakeup test in runtime suspend/resume routines nicolas.ferre
2020-05-04 13:44 ` [PATCH v3 2/7] net: macb: mark device wake capable when "magic-packet" property present nicolas.ferre
2020-05-04 13:44 ` [PATCH v3 3/7] net: macb: fix macb_get/set_wol() when moving to phylink nicolas.ferre
2020-05-04 13:44 ` [PATCH v3 4/7] net: macb: fix macb_suspend() by removing call to netif_carrier_off() nicolas.ferre
2020-05-04 13:44 ` nicolas.ferre [this message]
2020-05-04 13:44 ` [PATCH v3 6/7] net: macb: WoL support for GEM type of Ethernet controller nicolas.ferre
2020-05-04 13:44 ` [PATCH v3 7/7] net: macb: Add WoL interrupt support for MACB " nicolas.ferre
2020-05-04 18:07 ` [PATCH v3 0/7] net: macb: Wake-on-Lan magic packet fixes and GEM handling 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=e985e9247478205d66507cd1bd74b6f8fb6c829f.1588597759.git.nicolas.ferre@microchip.com \
--to=nicolas.ferre@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=andrew@lunn.ch \
--cc=antoine.tenart@bootlin.com \
--cc=claudiu.beznea@microchip.com \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=harini.katakam@xilinx.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=michal.simek@xilinx.com \
--cc=netdev@vger.kernel.org \
--cc=sergio.prado@e-labworks.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®