Skip to content

Abuzarra/fix resume eth mac #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
abuzarra wants to merge 2 commits into from
Closed

Abuzarra/fix resume eth mac #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ec1ef3
net: stmmac: fix pinctrl management during suspend/resume
abuzarra Mar 31, 2023
ecfc4a1
net: ethernet: stmmac: encapsulate power managements functions
abuzarra Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,10 +566,10 @@ static int stm32_dwmac_resume(struct device *dev)

return ret;
}
#endif /* CONFIG_PM_SLEEP */

static SIMPLE_DEV_PM_OPS(stm32_dwmac_pm_ops,
stm32_dwmac_suspend, stm32_dwmac_resume);
#endif /* CONFIG_PM_SLEEP */

static struct stm32_ops stm32mcu_dwmac_data = {
.set_mode = stm32mcu_set_mode,
Expand Down Expand Up @@ -629,7 +629,9 @@ static struct platform_driver stm32_dwmac_driver = {
.remove = stm32_dwmac_remove,
.driver = {
.name = "stm32-dwmac",
#ifdef CONFIG_PM_SLEEP
.pm = &stm32_dwmac_pm_ops,
#endif /* CONFIG_PM_SLEEP */
.of_match_table = stm32_dwmac_match,
},
};
Expand Down
10 changes: 8 additions & 2 deletions drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7325,8 +7325,11 @@ int stmmac_suspend(struct device *dev)
struct stmmac_priv *priv = netdev_priv(ndev);
u32 chan;

if (!ndev || !netif_running(ndev))
if (!ndev || !netif_running(ndev)) {
/* Select sleep pin state */
pinctrl_pm_select_sleep_state(dev);
return 0;
}

mutex_lock(&priv->lock);

Expand Down Expand Up @@ -7424,8 +7427,11 @@ int stmmac_resume(struct device *dev)
struct stmmac_priv *priv = netdev_priv(ndev);
int ret;

if (!netif_running(ndev))
if (!netif_running(ndev)) {
/* Select default pin state */
pinctrl_pm_select_default_state(priv->device);
return 0;
}

/* Power Down bit, into the PM register, is cleared
* automatically as soon as a magic packet or a Wake-up frame
Expand Down