2022-07-13 11:30:55

by AceLan Kao

Subject: [PATCH 1/2] net: atlantic: remove deep parameter on suspend/resume functions

From: "Chia-Lin Kao (AceLan)" <[email protected]>

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) <[email protected]>
---
.../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

2022-07-14 13:21:43

by patchwork-bot+netdevbpf

Subject: Re: [PATCH 1/2] net: atlantic: remove deep parameter on suspend/resume functions

Hello:

This series was applied to netdev/net.git (master)
by Paolo Abeni <[email protected]>:

On Wed, 13 Jul 2022 19:12:23 +0800 you wrote:
> From: "Chia-Lin Kao (AceLan)" <[email protected]>
>
> 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