Skip to content

Commit 1809c30

Browse files
labrePaolo Abeni
authored andcommitted
net: atlantic: always deep reset on pm op, fixing up my null deref regression
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 cbe6c3a ("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 breakage. 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: cbe6c3a ("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 <[email protected]> Reported-by: Holger Hoffstaette <[email protected]> Tested-by: Jordan Leppert <[email protected]> Tested-by: Holger Hoffstaette <[email protected]> CC: <[email protected]> # 5.10+ Signed-off-by: Manuel Ullmann <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
1 parent fc54e39 commit 1809c30

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ static int aq_pm_freeze(struct device *dev)
449449

450450
static int aq_pm_suspend_poweroff(struct device *dev)
451451
{
452-
return aq_suspend_common(dev, false);
452+
return aq_suspend_common(dev, true);
453453
}
454454

455455
static int aq_pm_thaw(struct device *dev)
@@ -459,7 +459,7 @@ static int aq_pm_thaw(struct device *dev)
459459

460460
static int aq_pm_resume_restore(struct device *dev)
461461
{
462-
return atl_resume_common(dev, false);
462+
return atl_resume_common(dev, true);
463463
}
464464

465465
static const struct dev_pm_ops aq_pm_ops = {

0 commit comments

Comments
 (0)