rtc: rtc-cmos: Fix wake alarm breakage
Subsystems (2)
PATCH 1/1 rtc: rtc-cmos: Fix wake alarm breakage
From: Rafael J. Wysocki <[email protected]>
Commit 4919d3eb2ec0 ("rtc: cmos: Fix event handler registration ordering issue") overlooked the fact that cmos_do_probe() depended on the preparations carried out by cmos_wake_setup() and the wake alarm stopped working after the ordering of them had been changed.
Address this by partially reverting commit 4919d3eb2ec0 so that cmos_wake_setup() is called before cmos_do_probe() again and moving the rtc_wake_setup() invocation from cmos_wake_setup() directly to the callers of cmos_do_probe() where it will happen after a successful completion of the latter.
---
@Bjorn: This is the minimum fix. Folding cmos_wake_setup() into cmos_do_probe() requires changes that are a bit intrusive for post-rc1, but I will do that later.
--- drivers/rtc/rtc-cmos.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/rtc/rtc-cmos.c +8 -3
@@ -1233,6 +1233,9 @@ static u32 rtc_handler(void *context)static inline void rtc_wake_setup (struct device *dev) { +if (acpi_disabled) +return ; +acpi_install_fixed_event_handler (ACPI_EVENT_RTC , rtc_handler, dev);/* * After the RTC handler is installed, the Fixed_RTC event should
@@ -1286,7 +1289,6 @@ static void cmos_wake_setup(struct devicuse_acpi_alarm_quirks (); -rtc_wake_setup (dev); acpi_rtc_info.wake_on = rtc_wake_on; acpi_rtc_info.wake_off = rtc_wake_off;
@@ -1354,6 +1356,8 @@ static int cmos_pnp_probe(struct pnp_dev {int irq, ret; +cmos_wake_setup (&pnp->dev); +if (pnp_port_start (pnp,0 ) ==0x70 && !pnp_irq_valid (pnp,0 )) { irq =0 ;#ifdef CONFIG_X86
@@ -1372,7 +1376,7 @@ static int cmos_pnp_probe(struct pnp_devif (ret)return ret; -cmos_wake_setup (&pnp->dev); +rtc_wake_setup (&pnp->dev);return 0 ; }
@@ -1461,6 +1465,7 @@ static int __init cmos_platform_probe(stint irq, ret;cmos_of_init (pdev); +cmos_wake_setup (&pdev->dev);if (RTC_IOMAPPED ) resource =platform_get_resource (pdev,IORESOURCE_IO ,0 );
@@ -1474,7 +1479,7 @@ static int __init cmos_platform_probe(stif (ret)return ret; -cmos_wake_setup (&pdev->dev); +rtc_wake_setup (&pdev->dev);return 0 ; }
Quoted 8 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Commit
4919d3eb2ec0("rtc: cmos: Fix event handler registration ordering issue") overlooked the fact thatcmos_do_probe()depended on the preparations carried out bycmos_wake_setup()and the wake alarm stopped working after the ordering of them had been changed.[...]
Applied, thanks!
[1/1] rtc: rtc-cmos: Fix wake alarm breakage
commit: 0782b66ed2fbb035dda76111df0954515e417b24
Best regards,
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Works for me!
Quoted 22 lines · Alexandre Belloni
Quoted 8 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Commit
4919d3eb2ec0("rtc: cmos: Fix event handler registration ordering issue") overlooked the fact thatcmos_do_probe()depended on the preparations carried out bycmos_wake_setup()and the wake alarm stopped working after the ordering of them had been changed.[...]
Applied, thanks!
[1/1] rtc: rtc-cmos: Fix wake alarm breakage
commit: 0782b66ed2fbb035dda76111df0954515e417b24Best regards,
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Signature · 1 line
Len Brown, Intel
Todd Brandt
Tested-byQuoted 5 lines · Len Brown
Works for me!
Tested-by Len Brown <[email protected]>On Tue, Oct 18, 2022 at 6:39 PM Alexandre Belloni
Works for me too
Quoted 28 lines
Quoted 24 lines · <[email protected]> wrote:
Quoted 10 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Commit
4919d3eb2ec0("rtc: cmos: Fix event handler registration ordering issue") overlooked the fact thatcmos_do_probe()depended
on the preparations carried out bycmos_wake_setup()and the wake alarm stopped working after the ordering of them had been changed.[...]
Applied, thanks!
[1/1] rtc: rtc-cmos: Fix wake alarm breakage
commit:0782b66ed2fbb035dda76111df0954515e417b24Best regards,
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
Rafael J. Wysocki
maintainerQuoted 9 lines · Alexandre Belloni
Quoted 7 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Commit
4919d3eb2ec0("rtc: cmos: Fix event handler registration ordering issue") overlooked the fact thatcmos_do_probe()depended on the preparations carried out bycmos_wake_setup()and the wake alarm stopped working after the ordering of them had been changed.
Quoted 6 lines
Quoted 1 line
[...]
Applied, thanks!
[1/1] rtc: rtc-cmos: Fix wake alarm breakage
commit: 0782b66ed2fbb035dda76111df0954515e417b24
Thank you!
However, there is a build fix on top of this which has just been posted:
https://lore.kernel.org/linux-acpi/2677035.mvXUDI8C0e@kreacher/
Sorry about breaking it again.
Alexandre Belloni
maintainerQuoted 18 lines · Rafael J. Wysocki
Quoted 9 lines · Alexandre Belloni
Quoted 7 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Commit
4919d3eb2ec0("rtc: cmos: Fix event handler registration ordering issue") overlooked the fact thatcmos_do_probe()depended on the preparations carried out bycmos_wake_setup()and the wake alarm stopped working after the ordering of them had been changed.Quoted 6 lines
Quoted 1 line
[...]
Applied, thanks!
[1/1] rtc: rtc-cmos: Fix wake alarm breakage
commit: 0782b66ed2fbb035dda76111df0954515e417b24
Quoted 7 lines
Thank you!
However, there is a build fix on top of this which has just been posted:
https://lore.kernel.org/linux-acpi/2677035.mvXUDI8C0e@kreacher/
Sorry about breaking it again.
I had that in rtc-fixes:
https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git/commit/?h=rtc-fixes
Signature · 3 lines
Alexandre Belloni, co-owner and COO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Rafael J. Wysocki
maintainerQuoted 24 lines · Alexandre Belloni
Quoted 22 lines · Rafael J. Wysocki
Quoted 9 lines · Alexandre Belloni
Quoted 7 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Commit
4919d3eb2ec0("rtc: cmos: Fix event handler registration ordering issue") overlooked the fact thatcmos_do_probe()depended on the preparations carried out bycmos_wake_setup()and the wake alarm stopped working after the ordering of them had been changed.Quoted 6 lines
Quoted 1 line
[...]
Applied, thanks!
[1/1] rtc: rtc-cmos: Fix wake alarm breakage
commit: 0782b66ed2fbb035dda76111df0954515e417b24Thank you!
However, there is a build fix on top of this which has just been posted:
Quoted 7 lines
Quoted 3 lines
https://lore.kernel.org/linux-acpi/2677035.mvXUDI8C0e@kreacher/
Sorry about breaking it again.
I had that in rtc-fixes:
https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git/commit/?h=rtc-fixes
Looks good, thanks!
Quoted 11 lines · Alexandre Belloni
Quoted 8 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Commit
4919d3eb2ec0("rtc: cmos: Fix event handler registration ordering issue") overlooked the fact thatcmos_do_probe()depended on the preparations carried out bycmos_wake_setup()and the wake alarm stopped working after the ordering of them had been changed.[...]
Applied, thanks!
I did testing yesterday on the 6.1.0-rc2 build and this patch hasn't made it into rc2. This is an extreme inconvenience to anyone testing low power modes as the rtc wakealarm doesn't function. I'm a little surprised more people haven't complained.
Please get this in 6.1.0-rc3.
Quoted 5 lines
[1/1] rtc: rtc-cmos: Fix wake alarm breakage
commit:0782b66ed2fbb035dda76111df0954515e417b24Best regards,
Quoted 13 lines · Rafael J. Wysocki
From: Rafael J. Wysocki <[email protected]>
Commit
4919d3eb2ec0("rtc: cmos: Fix event handler registration ordering issue") overlooked the fact thatcmos_do_probe()depended on the preparations carried out bycmos_wake_setup()and the wake alarm stopped working after the ordering of them had been changed.Address this by partially reverting commit
4919d3eb2ec0so thatcmos_wake_setup()is called beforecmos_do_probe()again and moving thertc_wake_setup()invocation fromcmos_wake_setup()directly to the callers ofcmos_do_probe()where it will happen after a successful completion of the latter.
Quoted 4 lines
Fixes 4919d3eb2ec0 ("rtc: cmos: Fix event handler registration ordering issue")Reported-by Zhang Rui <[email protected]>Reported-by Todd Brandt <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>
Boot test that previously hit NULL pointer exceptions also completed successfully.
Signature · 2 lines
Mel Gorman SUSE Labs