| Message ID | d7c8c1dadf40df3a7c9e643f76ffadd0ccc1ad1b.1660659689.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 5c23d6b717e4e956376f3852b90f58e262946b50 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v2,1/2] stmmac: intel: Add a missing clk_disable_unprepare() call in intel_eth_pci_remove() | expand |
On Tue, 16 Aug 2022 16:23:57 +0200 Christophe JAILLET wrote: > Commit 09f012e64e4b ("stmmac: intel: Fix clock handling on error and remove > paths") removed this clk_disable_unprepare() > > This was partly revert by commit ac322f86b56c ("net: stmmac: Fix clock > handling on remove path") which removed this clk_disable_unprepare() > because: I'll take patch 1 in now, please repost patch two in a few hours after Linus pull net (or just tomorrow if you don't wanna try to track it down). Please avoid posting fixes and cleanups in a single series. They go via different trees.
Hello: This series was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Tue, 16 Aug 2022 16:23:57 +0200 you wrote: > Commit 09f012e64e4b ("stmmac: intel: Fix clock handling on error and remove > paths") removed this clk_disable_unprepare() > > This was partly revert by commit ac322f86b56c ("net: stmmac: Fix clock > handling on remove path") which removed this clk_disable_unprepare() > because: > " > While unloading the dwmac-intel driver, clk_disable_unprepare() is > being called twice in stmmac_dvr_remove() and > intel_eth_pci_remove(). This causes kernel panic on the second call. > " > > [...] Here is the summary with links: - [v2,1/2] stmmac: intel: Add a missing clk_disable_unprepare() call in intel_eth_pci_remove() https://git.kernel.org/netdev/net/c/5c23d6b717e4 - [v2,2/2] stmmac: intel: Simplify intel_eth_pci_remove() (no matching commit) You are awesome, thank you!
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c index 52f9ed8db9c9..4f2b82a884b9 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c @@ -1134,6 +1134,7 @@ static void intel_eth_pci_remove(struct pci_dev *pdev) stmmac_dvr_remove(&pdev->dev); + clk_disable_unprepare(priv->plat->stmmac_clk); clk_unregister_fixed_rate(priv->plat->stmmac_clk); pcim_iounmap_regions(pdev, BIT(0));
Commit 09f012e64e4b ("stmmac: intel: Fix clock handling on error and remove paths") removed this clk_disable_unprepare() This was partly revert by commit ac322f86b56c ("net: stmmac: Fix clock handling on remove path") which removed this clk_disable_unprepare() because: " While unloading the dwmac-intel driver, clk_disable_unprepare() is being called twice in stmmac_dvr_remove() and intel_eth_pci_remove(). This causes kernel panic on the second call. " However later on, commit 5ec55823438e8 ("net: stmmac: add clocks management for gmac driver") has updated stmmac_dvr_remove() which do not call clk_disable_unprepare() anymore. So this call should now be called from intel_eth_pci_remove(). Fixes: 5ec55823438e8 ("net: stmmac: add clocks management for gmac driver") Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> --- Change in v2: * Fix a copy'n'paste typo from the error handling path of the probe to the remove function * Remove the big warning added below the --- in v1 (see link below if needed) * Add Reviewed-by: v1: https://lore.kernel.org/all/b5b44a0c025d0fdddd9b9d23153261363089a06a.1659204745.git.christophe.jaillet@wanadoo.fr/ Andy proposed another way to fix the issue. See the thread above. I won't be able to propose it myself. --- drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 1 + 1 file changed, 1 insertion(+)