leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rtc: cmos: Fix wake alarm breakage

Browse Source 
Commit 4919d3eb2e ("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 4919d3eb2e 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.

Fixes: 4919d3eb2e ("rtc: cmos: Fix event handler registration ordering issue")
Reported-by: Zhang Rui <rui.zhang@intel.com>
Reported-by: Todd Brandt <todd.e.brandt@linux.intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://lore.kernel.org/r/5887691.lOV4Wx5bFT@kreacher
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
This commit is contained in:
Rafael J. Wysocki 2022-10-18 18:09:31 +02:00 committed by Alexandre Belloni
parent 9abf2313ad
commit 0782b66ed2
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/rtc/rtc-cmos.c
View File

@ -1233,6 +1233,9 @@ static u32 rtc_handler(void *context)
static inline void rtc_wake_setup(struct device *dev) static inline void rtc_wake_setup(struct device *dev)
{ {
if (acpi_disabled)
return;
acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, dev); acpi_install_fixed_event_handler(ACPI_EVENT_RTC, rtc_handler, dev);
/* /*
* After the RTC handler is installed, the Fixed_RTC event should * After the RTC handler is installed, the Fixed_RTC event should
@ -1286,7 +1289,6 @@ static void cmos_wake_setup(struct device *dev)
use_acpi_alarm_quirks(); use_acpi_alarm_quirks();
rtc_wake_setup(dev);
acpi_rtc_info.wake_on = rtc_wake_on; acpi_rtc_info.wake_on = rtc_wake_on;
acpi_rtc_info.wake_off = rtc_wake_off; acpi_rtc_info.wake_off = rtc_wake_off;
@ -1354,6 +1356,8 @@ static int cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
{ {
int irq, ret; int irq, ret;
cmos_wake_setup(&pnp->dev);
if (pnp_port_start(pnp, 0) == 0x70 && !pnp_irq_valid(pnp, 0)) { if (pnp_port_start(pnp, 0) == 0x70 && !pnp_irq_valid(pnp, 0)) {
irq = 0; irq = 0;
#ifdef CONFIG_X86 #ifdef CONFIG_X86
@ -1372,7 +1376,7 @@ static int cmos_pnp_probe(struct pnp_dev *pnp, const struct pnp_device_id *id)
if (ret) if (ret)
return ret; return ret;
cmos_wake_setup(&pnp->dev); rtc_wake_setup(&pnp->dev);
return 0; return 0;
} }
@ -1461,6 +1465,7 @@ static int __init cmos_platform_probe(struct platform_device *pdev)
int irq, ret; int irq, ret;
cmos_of_init(pdev); cmos_of_init(pdev);
cmos_wake_setup(&pdev->dev);
if (RTC_IOMAPPED) if (RTC_IOMAPPED)
resource = platform_get_resource(pdev, IORESOURCE_IO, 0); resource = platform_get_resource(pdev, IORESOURCE_IO, 0);
@ -1474,7 +1479,7 @@ static int __init cmos_platform_probe(struct platform_device *pdev)
if (ret) if (ret)
return ret; return ret;
cmos_wake_setup(&pdev->dev); rtc_wake_setup(&pdev->dev);
return 0; return 0;
} }