Merge branch 'linus' into x86/urgent

1 files changed, 56 insertions, 2 deletions

diff --git a/arch/x86/kernel/quirks.c b/arch/x86/kernel/quirks.c
index d89a648fe710..79bdcd11c66e 100644
--- a/arch/x86/kernel/quirks.c
+++ b/arch/x86/kernel/quirks.c
@@ -65,6 +65,7 @@ static enum {
         ICH_FORCE_HPET_RESUME,
         VT8237_FORCE_HPET_RESUME,
         NVIDIA_FORCE_HPET_RESUME,
+        ATI_FORCE_HPET_RESUME,
 } force_hpet_resume_type;
 
 static void __iomem *rcba_base;
@@ -158,6 +159,8 @@ static void ich_force_enable_hpet(struct pci_dev *dev)
 
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ESB2_0,
                          ich_force_enable_hpet);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_0,
+                         ich_force_enable_hpet);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH6_1,
                          ich_force_enable_hpet);
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH7_0,
@@ -174,6 +177,12 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_7,
 
 static struct pci_dev *cached_dev;
 
+static void hpet_print_force_info(void)
+{
+        printk(KERN_INFO "HPET not enabled in BIOS. "
+               "You might try hpet=force boot option\n");
+}
+
 static void old_ich_force_hpet_resume(void)
 {
         u32 val;
@@ -253,6 +262,8 @@ static void old_ich_force_enable_hpet_user(struct pci_dev *dev)
 {
         if (hpet_force_user)
                 old_ich_force_enable_hpet(dev);
+        else
+                hpet_print_force_info();
 }
 
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82801CA_0,
@@ -290,8 +301,13 @@ static void vt8237_force_enable_hpet(struct pci_dev *dev)
 {
         u32 uninitialized_var(val);
 
-        if (!hpet_force_user || hpet_address || force_hpet_address)
+        if (hpet_address || force_hpet_address)
+                return;
+
+        if (!hpet_force_user) {
+                hpet_print_force_info();
                 return;
+        }
 
         pci_read_config_dword(dev, 0x68, &val);
         /*
@@ -330,6 +346,36 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8235,
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8237,
                          vt8237_force_enable_hpet);
 
+static void ati_force_hpet_resume(void)
+{
+        pci_write_config_dword(cached_dev, 0x14, 0xfed00000);
+        printk(KERN_DEBUG "Force enabled HPET at resume\n");
+}
+
+static void ati_force_enable_hpet(struct pci_dev *dev)
+{
+        u32 uninitialized_var(val);
+
+        if (hpet_address || force_hpet_address)
+                return;
+
+        if (!hpet_force_user) {
+                hpet_print_force_info();
+                return;
+        }
+
+        pci_write_config_dword(dev, 0x14, 0xfed00000);
+        pci_read_config_dword(dev, 0x14, &val);
+        force_hpet_address = val;
+        force_hpet_resume_type = ATI_FORCE_HPET_RESUME;
+        dev_printk(KERN_DEBUG, &dev->dev, "Force enabled HPET at 0x%lx\n",
+                   force_hpet_address);
+        cached_dev = dev;
+        return;
+}
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_IXP400_SMBUS,
+                         ati_force_enable_hpet);
+
 /*
  * Undocumented chipset feature taken from LinuxBIOS.
  */
@@ -343,8 +389,13 @@ static void nvidia_force_enable_hpet(struct pci_dev *dev)
 {
         u32 uninitialized_var(val);
 
-        if (!hpet_force_user || hpet_address || force_hpet_address)
+        if (hpet_address || force_hpet_address)
+                return;
+
+        if (!hpet_force_user) {
+                hpet_print_force_info();
                 return;
+        }
 
         pci_write_config_dword(dev, 0x44, 0xfed00001);
         pci_read_config_dword(dev, 0x44, &val);
@@ -397,6 +448,9 @@ void force_hpet_resume(void)
         case NVIDIA_FORCE_HPET_RESUME:
                 nvidia_force_hpet_resume();
                 return;
+        case ATI_FORCE_HPET_RESUME:
+                ati_force_hpet_resume();
+                return;
         default:
                 break;
         }