1 files changed, 54 insertions, 6 deletions

diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c
index f14876256a4a..cae212f30d65 100644
--- a/drivers/rtc/rtc-cmos.c
+++ b/drivers/rtc/rtc-cmos.c
@@ -34,11 +34,11 @@
 #include <linux/interrupt.h>
 #include <linux/spinlock.h>
 #include <linux/platform_device.h>
-#include <linux/mod_devicetable.h>
 #include <linux/log2.h>
 #include <linux/pm.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
+#include <linux/dmi.h>
 
 /* this is for "generic access to PC-style RTC" using CMOS_READ/CMOS_WRITE */
 #include <asm-generic/rtc.h>
@@ -377,6 +377,51 @@ static int cmos_set_alarm(struct device *dev, struct rtc_wkalrm *t)
         return 0;
 }
 
+/*
+ * Do not disable RTC alarm on shutdown - workaround for b0rked BIOSes.
+ */
+static bool alarm_disable_quirk;
+
+static int __init set_alarm_disable_quirk(const struct dmi_system_id *id)
+{
+        alarm_disable_quirk = true;
+        pr_info("rtc-cmos: BIOS has alarm-disable quirk. ");
+        pr_info("RTC alarms disabled\n");
+        return 0;
+}
+
+static const struct dmi_system_id rtc_quirks[] __initconst = {
+        /* https://bugzilla.novell.com/show_bug.cgi?id=805740 */
+        {
+                .callback = set_alarm_disable_quirk,
+                .ident    = "IBM Truman",
+                .matches  = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "4852570"),
+                },
+        },
+        /* https://bugzilla.novell.com/show_bug.cgi?id=812592 */
+        {
+                .callback = set_alarm_disable_quirk,
+                .ident    = "Gigabyte GA-990XA-UD3",
+                .matches  = {
+                        DMI_MATCH(DMI_SYS_VENDOR,
+                                        "Gigabyte Technology Co., Ltd."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "GA-990XA-UD3"),
+                },
+        },
+        /* http://permalink.gmane.org/gmane.linux.kernel/1604474 */
+        {
+                .callback = set_alarm_disable_quirk,
+                .ident    = "Toshiba Satellite L300",
+                .matches  = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Satellite L300"),
+                },
+        },
+        {}
+};
+
 static int cmos_alarm_irq_enable(struct device *dev, unsigned int enabled)
 {
         struct cmos_rtc *cmos = dev_get_drvdata(dev);
@@ -385,6 +430,9 @@ static int cmos_alarm_irq_enable(struct device *dev, unsigned int enabled)
         if (!is_valid_irq(cmos->irq))
                 return -EINVAL;
 
+        if (alarm_disable_quirk)
+                return 0;
+
         spin_lock_irqsave(&rtc_lock, flags);
 
         if (enabled)
@@ -708,11 +756,9 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq)
                 irq_handler_t rtc_cmos_int_handler;
 
                 if (is_hpet_enabled()) {
-                        int err;
-
                         rtc_cmos_int_handler = hpet_rtc_interrupt;
-                        err = hpet_register_irq_handler(cmos_interrupt);
-                        if (err != 0) {
+                        retval = hpet_register_irq_handler(cmos_interrupt);
+                        if (retval) {
                                 dev_warn(dev, "hpet_register_irq_handler "
                                                 " failed in rtc_init().");
                                 goto cleanup1;
@@ -1127,7 +1173,7 @@ static struct platform_driver cmos_platform_driver = {
         .remove         = __exit_p(cmos_platform_remove),
         .shutdown       = cmos_platform_shutdown,
         .driver = {
-                .name           = (char *) driver_name,
+                .name           = driver_name,
 #ifdef CONFIG_PM
                 .pm             = &cmos_pm_ops,
 #endif
@@ -1157,6 +1203,8 @@ static int __init cmos_init(void)
                         platform_driver_registered = true;
         }
 
+        dmi_check_system(rtc_quirks);
+
         if (retval == 0)
                 return 0;