diff options
author | Andi Kleen <andi@firstfloor.org> | 2008-01-30 07:33:54 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:33:54 -0500 |
commit | 1a2b441231ddc12b785940000320894bfa02bd82 (patch) | |
tree | 2fab8cf5b8cb91af545bc686efc30adfa29bfb4f | |
parent | 934d15854d04e8ca2495d8f5698164df990d5d66 (diff) |
x86: fix early_ioremap() on 64-bit
Fix early_ioremap() on x86-64
I had ACPI failures on several machines since a few days. Symptom
was NUMA nodes not getting detected or worse cores not getting detected.
They all came from ACPI not being able to read various of its tables. I finally
bisected it down to Jeremy's "put _PAGE_GLOBAL into PAGE_KERNEL" change.
With that the fix was fairly obvious. The problem was that early_ioremap()
didn't use a "_all" flush that would affect the global PTEs too. So
with global bits getting used everywhere now an early_ioremap would
not actually flush a mapping if something else was mapped previously
on that slot (which can happen with early_iounmap inbetween)
This patch changes all flushes in init_64.c to be __flush_tlb_all()
and fixes the problem here.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r-- | arch/x86/mm/init_64.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 0fd9d7f77786..c250580a9432 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c | |||
@@ -228,7 +228,7 @@ __meminit void *early_ioremap(unsigned long addr, unsigned long size) | |||
228 | addr &= PMD_MASK; | 228 | addr &= PMD_MASK; |
229 | for (i = 0; i < pmds; i++, addr += PMD_SIZE) | 229 | for (i = 0; i < pmds; i++, addr += PMD_SIZE) |
230 | set_pmd(pmd+i, __pmd(addr | __PAGE_KERNEL_LARGE_EXEC)); | 230 | set_pmd(pmd+i, __pmd(addr | __PAGE_KERNEL_LARGE_EXEC)); |
231 | __flush_tlb(); | 231 | __flush_tlb_all(); |
232 | return (void *)vaddr; | 232 | return (void *)vaddr; |
233 | next: | 233 | next: |
234 | ; | 234 | ; |
@@ -249,7 +249,7 @@ __meminit void early_iounmap(void *addr, unsigned long size) | |||
249 | pmd = level2_kernel_pgt + pmd_index(vaddr); | 249 | pmd = level2_kernel_pgt + pmd_index(vaddr); |
250 | for (i = 0; i < pmds; i++) | 250 | for (i = 0; i < pmds; i++) |
251 | pmd_clear(pmd + i); | 251 | pmd_clear(pmd + i); |
252 | __flush_tlb(); | 252 | __flush_tlb_all(); |
253 | } | 253 | } |
254 | 254 | ||
255 | static void __meminit | 255 | static void __meminit |
@@ -317,7 +317,7 @@ static void __meminit phys_pud_init(pud_t *pud_page, unsigned long addr, unsigne | |||
317 | spin_unlock(&init_mm.page_table_lock); | 317 | spin_unlock(&init_mm.page_table_lock); |
318 | unmap_low_page(pmd); | 318 | unmap_low_page(pmd); |
319 | } | 319 | } |
320 | __flush_tlb(); | 320 | __flush_tlb_all(); |
321 | } | 321 | } |
322 | 322 | ||
323 | static void __init find_early_table_space(unsigned long end) | 323 | static void __init find_early_table_space(unsigned long end) |