* [PATCH 1/2] net: atlantic: remove deep parameter on suspend/resume functions
@ 2022-07-13 11:12 AceLan Kao
2022-07-13 11:12 ` [PATCH 2/2] net: atlantic: remove aq_nic_deinit() when resume AceLan Kao
2022-07-14 12:40 ` [PATCH 1/2] net: atlantic: remove deep parameter on suspend/resume functions patchwork-bot+netdevbpf
0 siblings, 2 replies; 3+ messages in thread
From: AceLan Kao @ 2022-07-13 11:12 UTC (permalink / raw)
To: Igor Russkikh, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Manuel Ullmann, netdev, linux-kernel
From: "Chia-Lin Kao (AceLan)" <acelan.kao@canonical.com>
Below commit claims that atlantic NIC requires to reset the device on pm
op, and had set the deep to true for all suspend/resume functions.
commit 1809c30b6e5a ("net: atlantic: always deep reset on pm op, fixing up my null deref regression")
So, we could remove deep parameter on suspend/resume functions without
any functional change.
Fixes: 1809c30b6e5a ("net: atlantic: always deep reset on pm op, fixing up my null deref regression")
Signed-off-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
---
.../ethernet/aquantia/atlantic/aq_pci_func.c | 24 ++++++++-----------
1 file changed, 10 insertions(+), 14 deletions(-)
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
index 831833911a52..dbd5263130f9 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
@@ -379,7 +379,7 @@ static void aq_pci_shutdown(struct pci_dev *pdev)
}
}
-static int aq_suspend_common(struct device *dev, bool deep)
+static int aq_suspend_common(struct device *dev)
{
struct aq_nic_s *nic = pci_get_drvdata(to_pci_dev(dev));
@@ -392,17 +392,15 @@ static int aq_suspend_common(struct device *dev, bool deep)
if (netif_running(nic->ndev))
aq_nic_stop(nic);
- if (deep) {
- aq_nic_deinit(nic, !nic->aq_hw->aq_nic_cfg->wol);
- aq_nic_set_power(nic);
- }
+ aq_nic_deinit(nic, !nic->aq_hw->aq_nic_cfg->wol);
+ aq_nic_set_power(nic);
rtnl_unlock();
return 0;
}
-static int atl_resume_common(struct device *dev, bool deep)
+static int atl_resume_common(struct device *dev)
{
struct pci_dev *pdev = to_pci_dev(dev);
struct aq_nic_s *nic;
@@ -415,10 +413,8 @@ static int atl_resume_common(struct device *dev, bool deep)
pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev);
- if (deep) {
- /* Reinitialize Nic/Vecs objects */
- aq_nic_deinit(nic, !nic->aq_hw->aq_nic_cfg->wol);
- }
+ /* Reinitialize Nic/Vecs objects */
+ aq_nic_deinit(nic, !nic->aq_hw->aq_nic_cfg->wol);
if (netif_running(nic->ndev)) {
ret = aq_nic_init(nic);
@@ -444,22 +440,22 @@ static int atl_resume_common(struct device *dev, bool deep)
static int aq_pm_freeze(struct device *dev)
{
- return aq_suspend_common(dev, true);
+ return aq_suspend_common(dev);
}
static int aq_pm_suspend_poweroff(struct device *dev)
{
- return aq_suspend_common(dev, true);
+ return aq_suspend_common(dev);
}
static int aq_pm_thaw(struct device *dev)
{
- return atl_resume_common(dev, true);
+ return atl_resume_common(dev);
}
static int aq_pm_resume_restore(struct device *dev)
{
- return atl_resume_common(dev, true);
+ return atl_resume_common(dev);
}
static const struct dev_pm_ops aq_pm_ops = {
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH 2/2] net: atlantic: remove aq_nic_deinit() when resume
2022-07-13 11:12 [PATCH 1/2] net: atlantic: remove deep parameter on suspend/resume functions AceLan Kao
@ 2022-07-13 11:12 ` AceLan Kao
2022-07-14 12:40 ` [PATCH 1/2] net: atlantic: remove deep parameter on suspend/resume functions patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: AceLan Kao @ 2022-07-13 11:12 UTC (permalink / raw)
To: Igor Russkikh, David S. Miller, Eric Dumazet, Jakub Kicinski,
Paolo Abeni, Manuel Ullmann, netdev, linux-kernel
From: "Chia-Lin Kao (AceLan)" <acelan.kao@canonical.com>
aq_nic_deinit() has been called while suspending, so we don't have to call
it again on resume.
Actually, call it again leads to another hang issue when resuming from
S3.
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992345] Call Trace:
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992346] <TASK>
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992348] aq_nic_deinit+0xb4/0xd0 [atlantic]
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992356] aq_pm_thaw+0x7f/0x100 [atlantic]
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992362] pci_pm_resume+0x5c/0x90
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992366] ? pci_pm_thaw+0x80/0x80
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992368] dpm_run_callback+0x4e/0x120
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992371] device_resume+0xad/0x200
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992373] async_resume+0x1e/0x40
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992374] async_run_entry_fn+0x33/0x120
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992377] process_one_work+0x220/0x3c0
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992380] worker_thread+0x4d/0x3f0
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992382] ? process_one_work+0x3c0/0x3c0
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992384] kthread+0x12a/0x150
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992386] ? set_kthread_struct+0x40/0x40
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992387] ret_from_fork+0x22/0x30
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992391] </TASK>
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992392] ---[ end trace 1ec8c79604ed5e0d ]---
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992394] PM: dpm_run_callback(): pci_pm_resume+0x0/0x90 returns -110
Jul 8 03:09:44 u-Precision-7865-Tower kernel: [ 5910.992397] atlantic 0000:02:00.0: PM: failed to resume async: error -110
Fixes: 1809c30b6e5a ("net: atlantic: always deep reset on pm op, fixing up my null deref regression")
Signed-off-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
---
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
index dbd5263130f9..8647125d60ae 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
@@ -413,9 +413,6 @@ static int atl_resume_common(struct device *dev)
pci_set_power_state(pdev, PCI_D0);
pci_restore_state(pdev);
- /* Reinitialize Nic/Vecs objects */
- aq_nic_deinit(nic, !nic->aq_hw->aq_nic_cfg->wol);
-
if (netif_running(nic->ndev)) {
ret = aq_nic_init(nic);
if (ret)
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 1/2] net: atlantic: remove deep parameter on suspend/resume functions
2022-07-13 11:12 [PATCH 1/2] net: atlantic: remove deep parameter on suspend/resume functions AceLan Kao
2022-07-13 11:12 ` [PATCH 2/2] net: atlantic: remove aq_nic_deinit() when resume AceLan Kao
@ 2022-07-14 12:40 ` patchwork-bot+netdevbpf
1 sibling, 0 replies; 3+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-07-14 12:40 UTC (permalink / raw)
To: AceLan Kao
Cc: irusskikh, davem, edumazet, kuba, pabeni, labre, netdev,
linux-kernel
Hello:
This series was applied to netdev/net.git (master)
by Paolo Abeni <pabeni@redhat.com>:
On Wed, 13 Jul 2022 19:12:23 +0800 you wrote:
> From: "Chia-Lin Kao (AceLan)" <acelan.kao@canonical.com>
>
> Below commit claims that atlantic NIC requires to reset the device on pm
> op, and had set the deep to true for all suspend/resume functions.
> commit 1809c30b6e5a ("net: atlantic: always deep reset on pm op, fixing up my null deref regression")
> So, we could remove deep parameter on suspend/resume functions without
> any functional change.
>
> [...]
Here is the summary with links:
- [1/2] net: atlantic: remove deep parameter on suspend/resume functions
https://git.kernel.org/netdev/net/c/0f3325076038
- [2/2] net: atlantic: remove aq_nic_deinit() when resume
https://git.kernel.org/netdev/net/c/2e15c51fefaf
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-07-14 12:40 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-13 11:12 [PATCH 1/2] net: atlantic: remove deep parameter on suspend/resume functions AceLan Kao
2022-07-13 11:12 ` [PATCH 2/2] net: atlantic: remove aq_nic_deinit() when resume AceLan Kao
2022-07-14 12:40 ` [PATCH 1/2] net: atlantic: remove deep parameter on suspend/resume functions patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox