summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSudarsana Reddy Kalluru <skalluru@marvell.com>2021-08-27 04:52:25 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-09-15 09:50:45 +0200
commit26fae720c1124cbfdc95a37379f402a1ced8a11a (patch)
treeda67f0c5b1bb90cdbe709ffedeada74df857bc7d
parentcb996dc9f93785145f129c183e17bd6abb3177b3 (diff)
downloadlinux-stable-26fae720c1124cbfdc95a37379f402a1ced8a11a.tar.gz
linux-stable-26fae720c1124cbfdc95a37379f402a1ced8a11a.tar.bz2
linux-stable-26fae720c1124cbfdc95a37379f402a1ced8a11a.zip
atlantic: Fix driver resume flow.
[ Upstream commit 57f780f1c43362b86fd23d20bd940e2468237716 ] Driver crashes when restoring from the Hibernate. In the resume flow, driver need to clean up the older nic/vec objects and re-initialize them. Fixes: 8aaa112a57c1d ("net: atlantic: refactoring pm logic") 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
index 59253846e885..f26d03735619 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
@@ -417,6 +417,9 @@ static int atl_resume_common(struct device *dev, bool deep)
pci_restore_state(pdev);
if (deep) {
+ /* Reinitialize Nic/Vecs objects */
+ aq_nic_deinit(nic, !nic->aq_hw->aq_nic_cfg->wol);
+
ret = aq_nic_init(nic);
if (ret)
goto err_exit;