diff options
| author |   Sudarsana Reddy Kalluru <skalluru@marvell.com> | 2021-09-23 03:16:05 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-09-23 13:24:14 +0100 |
| commit | 4d88c339c423eefe2fd48215016cb0c75fcb4c4d (patch) | |
| tree | a2ccc615607335f90c05451b4142b0b32995f04b /drivers/net/ethernet/aquantia | |
| parent | net/mlx4_en: Don't allow aRFS for encapsulated packets (diff) | |
| download | linux-dev-4d88c339c423eefe2fd48215016cb0c75fcb4c4d.tar.xz linux-dev-4d88c339c423eefe2fd48215016cb0c75fcb4c4d.zip | |
atlantic: Fix issue in the pm resume flow.
After fixing hibernation resume flow, another usecase was found which
should be explicitly handled - resume when device is in "down" state.
Invoke aq_nic_init jointly with aq_nic_start only if ndev was already
up during suspend/hibernate. We still need to perform nic_deinit() if
caller requests for it, to handle the freeze/resume scenarios.
Fixes: 57f780f1c433 ("atlantic: Fix driver resume flow.")
Signed-off-by: Sudarsana Reddy Kalluru <skalluru@marvell.com>
Signed-off-by: Igor Russkikh <irusskikh@marvell.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/aquantia')
| -rw-r--r-- | drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c index dee9ff74d6d6..d4b1976ee69b 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c +++ b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c @@ -413,13 +413,13 @@ static int atl_resume_common(struct device *dev, bool deep) if (deep) { /* 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) goto err_exit; - } - if (netif_running(nic->ndev)) { ret = aq_nic_start(nic); if (ret) goto err_exit; |