From 19bfe37caa8184768ecc15269302f42036625259 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Tue, 8 May 2007 00:34:03 -0700 Subject: workaround rtc-related acpi table bugs This works around a bug seen in some RTC-related ACPI table entries, and tweaks related diagnostics to follow the ACPI convention. The bug prevents misleading boot-time messages: platforms affected by this bug wrongly report they can support alarms up to one year in the future, when in fact the longest alarm is just 24 hours. That will surprise anyone trying to use those extended alarms. Signed-off-by: David Brownell Cc: Alessandro Zummo Cc: Len Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/acpi/glue.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/glue.c b/drivers/acpi/glue.c index 83768e9cf29..41427a41f62 100644 --- a/drivers/acpi/glue.c +++ b/drivers/acpi/glue.c @@ -316,13 +316,20 @@ static int __init acpi_rtc_init(void) rtc_info.wake_on = rtc_wake_on; rtc_info.wake_off = rtc_wake_off; + /* workaround bug in some ACPI tables */ + if (acpi_gbl_FADT.month_alarm && !acpi_gbl_FADT.day_alarm) { + DBG("bogus FADT month_alarm\n"); + acpi_gbl_FADT.month_alarm = 0; + } + rtc_info.rtc_day_alarm = acpi_gbl_FADT.day_alarm; rtc_info.rtc_mon_alarm = acpi_gbl_FADT.month_alarm; rtc_info.rtc_century = acpi_gbl_FADT.century; /* NOTE: S4_RTC_WAKE is NOT currently useful to Linux */ if (acpi_gbl_FADT.flags & ACPI_FADT_S4_RTC_WAKE) - printk("ACPI: RTC can wake from S4\n"); + printk(PREFIX "RTC can wake from S4\n"); + dev->platform_data = &rtc_info; @@ -331,7 +338,7 @@ static int __init acpi_rtc_init(void) put_device(dev); } else - pr_debug("ACPI: RTC unavailable?\n"); + DBG("RTC unavailable?\n"); return 0; } /* do this between RTC subsys_initcall() and rtc_cmos driver_initcall() */ -- cgit v1.2.3