From: Nicolas Ferre <nicolas.ferre@microchip.com>
To: Jakub Kicinski <kuba@kernel.org>, <netdev@vger.kernel.org>,
"David S. Miller" <davem@davemloft.net>
Cc: <linux-arm-kernel@lists.infradead.org>,
Claudiu Beznea <claudiu.beznea@microchip.com>,
<harini.katakam@xilinx.com>, <linux-kernel@vger.kernel.org>,
Alexandre Belloni <alexandre.belloni@bootlin.com>,
<antoine.tenart@bootlin.com>, <f.fainelli@gmail.com>
Subject: Re: [PATCH v4 1/5] net: macb: fix wakeup test in runtime suspend/resume routines
Date: Thu, 7 May 2020 12:03:04 +0200 [thread overview]
Message-ID: <347c9a4f-8a01-a931-c9d5-536339337f8a@microchip.com> (raw)
In-Reply-To: <20200506131843.22cf1dab@kicinski-fedora-pc1c0hjn.dhcp.thefacebook.com>
On 06/05/2020 at 22:18, Jakub Kicinski wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> On Wed, 6 May 2020 13:37:37 +0200 nicolas.ferre@microchip.com wrote:
>> From: Nicolas Ferre <nicolas.ferre@microchip.com>
>>
>> Use the proper struct device pointer to check if the wakeup flag
>> and wakeup source are positioned.
>> Use the one passed by function call which is equivalent to
>> &bp->dev->dev.parent.
>>
>> It's preventing the trigger of a spurious interrupt in case the
>> Wake-on-Lan feature is used.
>>
>> Fixes: bc1109d04c39 ("net: macb: Add pm runtime support")
>
> Fixes tag: Fixes: bc1109d04c39 ("net: macb: Add pm runtime support")
> Has these problem(s):
> - Target SHA1 does not exist
Indeed, it's:
Fixes: d54f89af6cc4 ("net: macb: Add pm runtime support")
David: do I have to respin or you can modify it?
Thanks. Regards,
Nicolas
>> Signed-off-by: Nicolas Ferre <nicolas.ferre@microchip.com>
>> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
>> Cc: Claudiu Beznea <claudiu.beznea@microchip.com>
>> Cc: Harini Katakam <harini.katakam@xilinx.com>
>> ---
>> drivers/net/ethernet/cadence/macb_main.c | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
>> index 36290a8e2a84..d11fae37d46b 100644
>> --- a/drivers/net/ethernet/cadence/macb_main.c
>> +++ b/drivers/net/ethernet/cadence/macb_main.c
>> @@ -4616,7 +4616,7 @@ static int __maybe_unused macb_runtime_suspend(struct device *dev)
>> struct net_device *netdev = dev_get_drvdata(dev);
>> struct macb *bp = netdev_priv(netdev);
>>
>> - if (!(device_may_wakeup(&bp->dev->dev))) {
>> + if (!(device_may_wakeup(dev))) {
>> clk_disable_unprepare(bp->tx_clk);
>> clk_disable_unprepare(bp->hclk);
>> clk_disable_unprepare(bp->pclk);
>> @@ -4632,7 +4632,7 @@ static int __maybe_unused macb_runtime_resume(struct device *dev)
>> struct net_device *netdev = dev_get_drvdata(dev);
>> struct macb *bp = netdev_priv(netdev);
>>
>> - if (!(device_may_wakeup(&bp->dev->dev))) {
>> + if (!(device_may_wakeup(dev))) {
>> clk_prepare_enable(bp->pclk);
>> clk_prepare_enable(bp->hclk);
>> clk_prepare_enable(bp->tx_clk);
>
--
Nicolas Ferre
next prev parent reply other threads:[~2020-05-07 10:03 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-06 11:37 [PATCH v4 0/5] net: macb: Wake-on-Lan magic packet fixes and GEM handling nicolas.ferre
2020-05-06 11:37 ` [PATCH v4 1/5] net: macb: fix wakeup test in runtime suspend/resume routines nicolas.ferre
2020-05-06 20:18 ` Jakub Kicinski
2020-05-07 10:03 ` Nicolas Ferre [this message]
2020-05-25 8:18 ` Nicolas Ferre
2020-05-25 8:47 ` Russell King - ARM Linux admin
2020-05-06 11:37 ` [PATCH v4 2/5] net: macb: mark device wake capable when "magic-packet" property present nicolas.ferre
2020-05-06 11:37 ` [PATCH v4 3/5] net: macb: fix macb_get/set_wol() when moving to phylink nicolas.ferre
2020-05-13 13:05 ` Russell King - ARM Linux admin
2020-05-13 14:16 ` Nicolas Ferre
2020-05-25 8:41 ` Russell King - ARM Linux admin
2020-05-06 11:37 ` [PATCH v4 4/5] net: macb: fix macb_suspend() by removing call to netif_carrier_off() nicolas.ferre
2020-05-06 11:37 ` [PATCH v4 5/5] net: macb: fix call to pm_runtime in the suspend/resume functions nicolas.ferre
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=347c9a4f-8a01-a931-c9d5-536339337f8a@microchip.com \
--to=nicolas.ferre@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--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=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).