[PATCH 1/1][SRU][OEM-5.14] net: atlantic: always deep reset on pm op, fixing up my null deref regression

Koba Ko koba.ko at canonical.com
Thu Jun 9 05:54:51 UTC 2022

From: Manuel Ullmann <labre at posteo.de>

BugLink: https://bugs.launchpad.net/bugs/1978058

The impact of this regression is the same for resume that I saw on
thaw: the kernel hangs and nothing except SysRq rebooting can be done.

Fixes regression in commit cbe6c3a8f8f4 ("net: atlantic: invert deep
par in pm functions, preventing null derefs"), where I disabled deep
pm resets in suspend and resume, trying to make sense of the
atl_resume_common() deep parameter in the first place.

It turns out, that atlantic always has to deep reset on pm
operations. Even though I expected that and tested resume, I screwed
up by kexec-rebooting into an unpatched kernel, thus missing the

This fixup obsoletes the deep parameter of atl_resume_common, but I
leave the cleanup for the maintainers to post to mainline.

Suspend and hibernation were successfully tested by the reporters.

Fixes: cbe6c3a8f8f4 ("net: atlantic: invert deep par in pm functions, preventing null derefs")
Link: https://lore.kernel.org/regressions/9-Ehc_xXSwdXcvZqKD5aSqsqeNj5Izco4MYEwnx5cySXVEc9-x_WC4C3kAoCqNTi-H38frroUK17iobNVnkLtW36V6VWGSQEOHXhmVMm5iQ=@protonmail.com/
Reported-by: Jordan Leppert <jordanleppert at protonmail.com>
Reported-by: Holger Hoffstaette <holger at applied-asynchrony.com>
Tested-by: Jordan Leppert <jordanleppert at protonmail.com>
Tested-by: Holger Hoffstaette <holger at applied-asynchrony.com>
CC: <stable at vger.kernel.org> # 5.10+
Signed-off-by: Manuel Ullmann <labre at posteo.de>
Link: https://lore.kernel.org/r/87bkw8dfmp.fsf@posteo.de
Signed-off-by: Paolo Abeni <pabeni at redhat.com>
(cherry picked from commit 1809c30b6e5a83a1de1435fe01aaa4de4d626a7c)
Signed-off-by: Koba Ko <koba.ko at canonical.com>
 drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c | 4 ++--
 1 file 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 bdfd462c74db9..fc5ea434a27c9 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
@@ -455,7 +455,7 @@ static int aq_pm_freeze(struct device *dev)
 static int aq_pm_suspend_poweroff(struct device *dev)
-	return aq_suspend_common(dev, false);
+	return aq_suspend_common(dev, true);
 static int aq_pm_thaw(struct device *dev)
@@ -465,7 +465,7 @@ static int aq_pm_thaw(struct device *dev)
 static int aq_pm_resume_restore(struct device *dev)
-	return atl_resume_common(dev, false);
+	return atl_resume_common(dev, true);
 static const struct dev_pm_ops aq_pm_ops = {

More information about the kernel-team mailing list