Patched in Tegra support.

5 files changed, 59 insertions, 61 deletions

diff --git a/arch/x86/kernel/acpi/Makefile b/arch/x86/kernel/acpi/Makefile
index 163b2258147..6f35260bb3e 100644
--- a/arch/x86/kernel/acpi/Makefile
+++ b/arch/x86/kernel/acpi/Makefile
@@ -1,7 +1,14 @@
+subdir-                         := realmode
+
 obj-$(CONFIG_ACPI)              += boot.o
-obj-$(CONFIG_ACPI_SLEEP)        += sleep.o wakeup_$(BITS).o
+obj-$(CONFIG_ACPI_SLEEP)        += sleep.o wakeup_rm.o wakeup_$(BITS).o
 
 ifneq ($(CONFIG_ACPI_PROCESSOR),)
 obj-y                           += cstate.o
 endif
 
+$(obj)/wakeup_rm.o:    $(obj)/realmode/wakeup.bin
+
+$(obj)/realmode/wakeup.bin: FORCE
+        $(Q)$(MAKE) $(build)=$(obj)/realmode
+
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index bacf4b0d91f..4558f0d0822 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -219,8 +219,6 @@ static int __init
 acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end)
 {
         struct acpi_madt_local_x2apic *processor = NULL;
-        int apic_id;
-        u8 enabled;
 
         processor = (struct acpi_madt_local_x2apic *)header;
 
@@ -229,8 +227,6 @@ acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end)
 
         acpi_table_print_madt_entry(header);
 
-        apic_id = processor->local_apic_id;
-        enabled = processor->lapic_flags & ACPI_MADT_ENABLED;
 #ifdef CONFIG_X86_X2APIC
         /*
          * We need to register disabled CPU as well to permit
@@ -239,10 +235,8 @@ acpi_parse_x2apic(struct acpi_subtable_header *header, const unsigned long end)
          * to not preallocating memory for all NR_CPUS
          * when we use CPU hotplug.
          */
-        if (!apic->apic_id_valid(apic_id) && enabled)
-                printk(KERN_WARNING PREFIX "x2apic entry ignored\n");
-        else
-                acpi_register_lapic(apic_id, enabled);
+        acpi_register_lapic(processor->local_apic_id,   /* APIC ID */
+                            processor->lapic_flags & ACPI_MADT_ENABLED);
 #else
         printk(KERN_WARNING PREFIX "x2apic entry ignored\n");
 #endif
@@ -422,14 +416,12 @@ acpi_parse_int_src_ovr(struct acpi_subtable_header * header,
                 return 0;
         }
 
-        if (intsrc->source_irq == 0) {
+        if (intsrc->source_irq == 0 && intsrc->global_irq == 2) {
                 if (acpi_skip_timer_override) {
-                        printk(PREFIX "BIOS IRQ0 override ignored.\n");
+                        printk(PREFIX "BIOS IRQ0 pin2 override ignored.\n");
                         return 0;
                 }
-
-                if ((intsrc->global_irq == 2) && acpi_fix_pin2_polarity
-                        && (intsrc->inti_flags & ACPI_MADT_POLARITY_MASK)) {
+                if (acpi_fix_pin2_polarity && (intsrc->inti_flags & ACPI_MADT_POLARITY_MASK)) {
                         intsrc->inti_flags &= ~ACPI_MADT_POLARITY_MASK;
                         printk(PREFIX "BIOS IRQ0 pin2 override: forcing polarity to high active.\n");
                 }
@@ -574,12 +566,6 @@ int acpi_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity)
 
         return irq;
 }
-EXPORT_SYMBOL_GPL(acpi_register_gsi);
-
-void acpi_unregister_gsi(u32 gsi)
-{
-}
-EXPORT_SYMBOL_GPL(acpi_unregister_gsi);
 
 void __init acpi_set_irq_model_pic(void)
 {
@@ -601,7 +587,7 @@ void __init acpi_set_irq_model_ioapic(void)
 #ifdef CONFIG_ACPI_HOTPLUG_CPU
 #include <acpi/processor.h>
 
-static void __cpuinit acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
+static void acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
 {
 #ifdef CONFIG_ACPI_NUMA
         int nid;
@@ -650,7 +636,6 @@ static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu)
         kfree(buffer.pointer);
         buffer.length = ACPI_ALLOCATE_BUFFER;
         buffer.pointer = NULL;
-        lapic = NULL;
 
         if (!alloc_cpumask_var(&tmp_map, GFP_KERNEL))
                 goto out;
@@ -659,10 +644,10 @@ static int __cpuinit _acpi_map_lsapic(acpi_handle handle, int *pcpu)
                 goto free_tmp_map;
 
         cpumask_copy(tmp_map, cpu_present_mask);
-        acpi_register_lapic(physid, ACPI_MADT_ENABLED);
+        acpi_register_lapic(physid, lapic->lapic_flags & ACPI_MADT_ENABLED);
 
         /*
-         * If acpi_register_lapic successfully generates a new logical cpu
+         * If mp_register_lapic successfully generates a new logical cpu
          * number, then the following will get us exactly what was mapped
          */
         cpumask_andnot(new_map, cpu_present_mask, tmp_map);
@@ -998,7 +983,7 @@ void __init mp_config_acpi_legacy_irqs(void)
         int i;
         struct mpc_intsrc mp_irq;
 
-#ifdef CONFIG_EISA
+#if defined (CONFIG_MCA) || defined (CONFIG_EISA)
         /*
          * Fabricate the legacy ISA bus (bus #31).
          */
@@ -1342,12 +1327,17 @@ static int __init dmi_disable_acpi(const struct dmi_system_id *d)
 }
 
 /*
- * Force ignoring BIOS IRQ0 override
+ * Force ignoring BIOS IRQ0 pin2 override
  */
 static int __init dmi_ignore_irq0_timer_override(const struct dmi_system_id *d)
 {
+        /*
+         * The ati_ixp4x0_rev() early PCI quirk should have set
+         * the acpi_skip_timer_override flag already:
+         */
         if (!acpi_skip_timer_override) {
-                pr_notice("%s detected: Ignoring BIOS IRQ0 override\n",
+                WARN(1, KERN_ERR "ati_ixp4x0 quirk not complete.\n");
+                pr_notice("%s detected: Ignoring BIOS IRQ0 pin2 override\n",
                         d->ident);
                 acpi_skip_timer_override = 1;
         }
@@ -1441,7 +1431,7 @@ static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
          * is enabled.  This input is incorrectly designated the
          * ISA IRQ 0 via an interrupt source override even though
          * it is wired to the output of the master 8259A and INTIN0
-         * is not connected at all.  Force ignoring BIOS IRQ0
+         * is not connected at all.  Force ignoring BIOS IRQ0 pin2
          * override in that cases.
          */
         {
@@ -1476,14 +1466,6 @@ static struct dmi_system_id __initdata acpi_dmi_table_late[] = {
                      DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
                      },
          },
-        {
-         .callback = dmi_ignore_irq0_timer_override,
-         .ident = "FUJITSU SIEMENS",
-         .matches = {
-                     DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
-                     DMI_MATCH(DMI_PRODUCT_NAME, "AMILO PRO V2030"),
-                     },
-         },
         {}
 };
 
@@ -1706,9 +1688,3 @@ int __acpi_release_global_lock(unsigned int *lock)
         } while (unlikely (val != old));
         return old & 0x1;
 }
-
-void __init arch_reserve_mem_area(acpi_physical_address addr, size_t size)
-{
-        e820_add_region(addr, size, E820_ACPI);
-        update_e820();
-}
diff --git a/arch/x86/kernel/acpi/cstate.c b/arch/x86/kernel/acpi/cstate.c
index d2b7f27781b..f50e7fb2a20 100644
--- a/arch/x86/kernel/acpi/cstate.c
+++ b/arch/x86/kernel/acpi/cstate.c
@@ -14,7 +14,6 @@
 #include <acpi/processor.h>
 #include <asm/acpi.h>
 #include <asm/mwait.h>
-#include <asm/special_insns.h>
 
 /*
  * Initialize bm_flags based on the CPU cache properties
diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index d5e0d717005..103b6ab368d 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -14,9 +14,8 @@
 #include <asm/desc.h>
 #include <asm/pgtable.h>
 #include <asm/cacheflush.h>
-#include <asm/realmode.h>
 
-#include "../../realmode/rm/wakeup.h"
+#include "realmode/wakeup.h"
 #include "sleep.h"
 
 unsigned long acpi_realmode_flags;
@@ -33,9 +32,13 @@ static char temp_stack[4096];
  */
 int acpi_suspend_lowlevel(void)
 {
-        struct wakeup_header *header =
-                (struct wakeup_header *) __va(real_mode_header->wakeup_header);
+        struct wakeup_header *header;
+        /* address in low memory of the wakeup routine. */
+        char *acpi_realmode;
 
+        acpi_realmode = TRAMPOLINE_SYM(acpi_wakeup_code);
+
+        header = (struct wakeup_header *)(acpi_realmode + WAKEUP_HEADER_OFFSET);
         if (header->signature != WAKEUP_HEADER_SIGNATURE) {
                 printk(KERN_ERR "wakeup header does not match\n");
                 return -EINVAL;
@@ -43,22 +46,38 @@ int acpi_suspend_lowlevel(void)
 
         header->video_mode = saved_video_mode;
 
-        header->pmode_behavior = 0;
+        header->wakeup_jmp_seg = acpi_wakeup_address >> 4;
+
+        /*
+         * Set up the wakeup GDT.  We set these up as Big Real Mode,
+         * that is, with limits set to 4 GB.  At least the Lenovo
+         * Thinkpad X61 is known to need this for the video BIOS
+         * initialization quirk to work; this is likely to also
+         * be the case for other laptops or integrated video devices.
+         */
+
+        /* GDT[0]: GDT self-pointer */
+        header->wakeup_gdt[0] =
+                (u64)(sizeof(header->wakeup_gdt) - 1) +
+                ((u64)__pa(&header->wakeup_gdt) << 16);
+        /* GDT[1]: big real mode-like code segment */
+        header->wakeup_gdt[1] =
+                GDT_ENTRY(0x809b, acpi_wakeup_address, 0xfffff);
+        /* GDT[2]: big real mode-like data segment */
+        header->wakeup_gdt[2] =
+                GDT_ENTRY(0x8093, acpi_wakeup_address, 0xfffff);
 
 #ifndef CONFIG_64BIT
         store_gdt((struct desc_ptr *)&header->pmode_gdt);
 
-        if (!rdmsr_safe(MSR_EFER,
-                        &header->pmode_efer_low,
-                        &header->pmode_efer_high))
-                header->pmode_behavior |= (1 << WAKEUP_BEHAVIOR_RESTORE_EFER);
+        if (rdmsr_safe(MSR_EFER, &header->pmode_efer_low,
+                       &header->pmode_efer_high))
+                header->pmode_efer_low = header->pmode_efer_high = 0;
 #endif /* !CONFIG_64BIT */
 
         header->pmode_cr0 = read_cr0();
-        if (__this_cpu_read(cpu_info.cpuid_level) >= 0) {
-                header->pmode_cr4 = read_cr4();
-                header->pmode_behavior |= (1 << WAKEUP_BEHAVIOR_RESTORE_CR4);
-        }
+        header->pmode_cr4 = read_cr4_safe();
+        header->pmode_behavior = 0;
         if (!rdmsr_safe(MSR_IA32_MISC_ENABLE,
                         &header->pmode_misc_en_low,
                         &header->pmode_misc_en_high))
@@ -72,6 +91,7 @@ int acpi_suspend_lowlevel(void)
         header->pmode_cr3 = (u32)__pa(&initial_page_table);
         saved_magic = 0x12345678;
 #else /* CONFIG_64BIT */
+        header->trampoline_segment = trampoline_address() >> 4;
 #ifdef CONFIG_SMP
         stack_start = (unsigned long)temp_stack + sizeof(temp_stack);
         early_gdt_descr.address =
@@ -101,8 +121,6 @@ static int __init acpi_sleep_setup(char *str)
 #endif
                 if (strncmp(str, "nonvs", 5) == 0)
                         acpi_nvs_nosave();
-                if (strncmp(str, "nonvs_s3", 8) == 0)
-                        acpi_nvs_nosave_s3();
                 if (strncmp(str, "old_ordering", 12) == 0)
                         acpi_old_suspend_ordering();
                 str = strchr(str, ',');
diff --git a/arch/x86/kernel/acpi/sleep.h b/arch/x86/kernel/acpi/sleep.h
index 67f59f8c695..416d4be13fe 100644
--- a/arch/x86/kernel/acpi/sleep.h
+++ b/arch/x86/kernel/acpi/sleep.h
@@ -2,15 +2,13 @@
  *      Variables and functions used by the code in sleep.c
  */
 
-#include <asm/realmode.h>
+#include <asm/trampoline.h>
 
 extern unsigned long saved_video_mode;
 extern long saved_magic;
 
 extern int wakeup_pmode_return;
 
-extern u8 wake_sleep_flags;
-
 extern unsigned long acpi_copy_wakeup_routine(unsigned long);
 extern void wakeup_long64(void);