@@ -2308,32 +2308,9 @@ static int __maybe_unused ravb_resume(struct device *dev)structravb_private*priv=netdev_priv(ndev);intret=0;-if(priv->wol_enabled){-/* Reduce the usecount of the clock to zero and then-*restoreittoitsoriginalvalue.Thisisdonetoforce-*theclocktobere-enabledwhichisaworkaround-*forrenesas-cpg-mssrdriverwhichdonotenableclocks-*whenresumingfromPSCIsuspend/resume.-*-*Withoutthisworkaroundthedriverfailstocommunicate-*withthehardwareifWoLwasenabledwhenthesystem-*enteredPSCIsuspend.ThisisduetothatifWoLisenabled-*weexplicitlykeeptheclockfrombeingturnedoffwhen-*suspending,butinPSCIsleeppoweriscutsotheclock-*isdisabledanyhow,theclockdriverisnotawareofthis-*sotheclockisnotturnedbackonwhenresuming.-*-*TODO:oncetherenesas-cpg-mssrsuspend/resumeisworking-*thisclockdanceshouldberemoved.-*/-clk_disable(priv->clk);-clk_disable(priv->clk);-clk_enable(priv->clk);-clk_enable(priv->clk);--/* Set reset mode to rearm the WoL logic */+/* If WoL is enabled set reset mode to rearm the WoL logic */+if(priv->wol_enabled)ravb_write(ndev,CCC_OPC_RESET,CCC);-}/* All register have been reset to default values.*Restoreallregisterswhichwheresetupatprobetimeand
Hi Geert,
Thanks for your patch.
Feels good to get rid of this hack :-)
On 2017-12-11 09:54:09 +0100, Geert Uytterhoeven wrote:
This reverts commit fbf3d034f2ff6264183cfa6845770e8cc2a986c8.
As of commit 560869100b99a3da ("clk: renesas: cpg-mssr: Restore module
clocks during resume"), the workaround is no longer needed.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
@@ -2308,32 +2308,9 @@ static int __maybe_unused ravb_resume(struct device *dev)structravb_private*priv=netdev_priv(ndev);intret=0;-if(priv->wol_enabled){-/* Reduce the usecount of the clock to zero and then-*restoreittoitsoriginalvalue.Thisisdonetoforce-*theclocktobere-enabledwhichisaworkaround-*forrenesas-cpg-mssrdriverwhichdonotenableclocks-*whenresumingfromPSCIsuspend/resume.-*-*Withoutthisworkaroundthedriverfailstocommunicate-*withthehardwareifWoLwasenabledwhenthesystem-*enteredPSCIsuspend.ThisisduetothatifWoLisenabled-*weexplicitlykeeptheclockfrombeingturnedoffwhen-*suspending,butinPSCIsleeppoweriscutsotheclock-*isdisabledanyhow,theclockdriverisnotawareofthis-*sotheclockisnotturnedbackonwhenresuming.-*-*TODO:oncetherenesas-cpg-mssrsuspend/resumeisworking-*thisclockdanceshouldberemoved.-*/-clk_disable(priv->clk);-clk_disable(priv->clk);-clk_enable(priv->clk);-clk_enable(priv->clk);--/* Set reset mode to rearm the WoL logic */+/* If WoL is enabled set reset mode to rearm the WoL logic */+if(priv->wol_enabled)ravb_write(ndev,CCC_OPC_RESET,CCC);-}/* All register have been reset to default values.*Restoreallregisterswhichwheresetupatprobetimeand
From: Sergei Shtylyov <hidden> Date: 2017-12-11 19:39:22
Hello!
On 12/11/2017 11:54 AM, Geert Uytterhoeven wrote:
This reverts commit fbf3d034f2ff6264183cfa6845770e8cc2a986c8.
As of commit 560869100b99a3da ("clk: renesas: cpg-mssr: Restore module
clocks during resume"), the workaround is no longer needed.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Sergei Shtylyov <redacted>
[...]
MBR, Sergei
This reverts commit fbf3d034f2ff6264183cfa6845770e8cc2a986c8.
As of commit 560869100b99a3da ("clk: renesas: cpg-mssr: Restore module
clocks during resume"), the workaround is no longer needed.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>