| Message ID | 20210118150812.796791-1-geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | f6a2e94b3f9d89cb40771ff746b16b5687650cbb |
| Delegated to: | Geert Uytterhoeven |
| Headers | show |
| Series | sh_eth: Fix power down vs. is_opened flag ordering | expand |
On 1/18/21 6:08 PM, Geert Uytterhoeven wrote: > sh_eth_close() does a synchronous power down of the device before > marking it closed. Revert the order, to make sure the device is never > marked opened while suspended. > > While at it, use pm_runtime_put() instead of pm_runtime_put_sync(), as > there is no reason to do a synchronous power down. > > Fixes: 7fa2955ff70ce453 ("sh_eth: Fix sleeping function called from invalid context") > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Sergei Shtylyov <sergei.shtylyov@gmail.com> [...] MBR, Sergei
Hi Geert, Thanks for your work. On 2021-01-18 16:08:12 +0100, Geert Uytterhoeven wrote: > sh_eth_close() does a synchronous power down of the device before > marking it closed. Revert the order, to make sure the device is never > marked opened while suspended. > > While at it, use pm_runtime_put() instead of pm_runtime_put_sync(), as > there is no reason to do a synchronous power down. > > Fixes: 7fa2955ff70ce453 ("sh_eth: Fix sleeping function called from invalid context") > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> > --- > drivers/net/ethernet/renesas/sh_eth.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c > index 9b52d350e21a9f2b..590b088bc4c7f3e2 100644 > --- a/drivers/net/ethernet/renesas/sh_eth.c > +++ b/drivers/net/ethernet/renesas/sh_eth.c > @@ -2606,10 +2606,10 @@ static int sh_eth_close(struct net_device *ndev) > /* Free all the skbuffs in the Rx queue and the DMA buffer. */ > sh_eth_ring_free(ndev); > > - pm_runtime_put_sync(&mdp->pdev->dev); > - > mdp->is_opened = 0; > > + pm_runtime_put(&mdp->pdev->dev); > + > return 0; > } > > -- > 2.25.1 >
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Mon, 18 Jan 2021 16:08:12 +0100 you wrote: > sh_eth_close() does a synchronous power down of the device before > marking it closed. Revert the order, to make sure the device is never > marked opened while suspended. > > While at it, use pm_runtime_put() instead of pm_runtime_put_sync(), as > there is no reason to do a synchronous power down. > > [...] Here is the summary with links: - sh_eth: Fix power down vs. is_opened flag ordering https://git.kernel.org/netdev/net/c/f6a2e94b3f9d You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c index 9b52d350e21a9f2b..590b088bc4c7f3e2 100644 --- a/drivers/net/ethernet/renesas/sh_eth.c +++ b/drivers/net/ethernet/renesas/sh_eth.c @@ -2606,10 +2606,10 @@ static int sh_eth_close(struct net_device *ndev) /* Free all the skbuffs in the Rx queue and the DMA buffer. */ sh_eth_ring_free(ndev); - pm_runtime_put_sync(&mdp->pdev->dev); - mdp->is_opened = 0; + pm_runtime_put(&mdp->pdev->dev); + return 0; }
sh_eth_close() does a synchronous power down of the device before marking it closed. Revert the order, to make sure the device is never marked opened while suspended. While at it, use pm_runtime_put() instead of pm_runtime_put_sync(), as there is no reason to do a synchronous power down. Fixes: 7fa2955ff70ce453 ("sh_eth: Fix sleeping function called from invalid context") Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- drivers/net/ethernet/renesas/sh_eth.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)