revert "x86: create a non-zero sized bm_pte only when needed"
PATCH 1/1 revert "x86: create a non-zero sized bm_pte only when needed"
This reverts commit 698609bdcd35d0641f4c6622c83680ab1a6d67cb.
69860 breaks Xen booting, as it relies on head*.S to set up the fixmap pagetables (as a side-effect of initializing the USB debug port). Xen, however, does not boot via head*.S, and so the fixmap area is not initialized.
The specific symptom of the crash is a fault in dmi_scan(), because the pointer that early_ioremap returns is not actually present.
arch/x86/mm/ioremap.c +0 -0
@@ -487,12 +487,7 @@ static int __init early_ioremap_debug_setup(char *str)
early_param("early_ioremap_debug", early_ioremap_debug_setup);
static __initdata int after_paging_init;
-#define __FIXADDR_TOP (-PAGE_SIZE)
-static pte_t bm_pte[(__fix_to_virt(FIX_DBGP_BASE)
- ^ __fix_to_virt(FIX_BTMAP_BEGIN)) >> PMD_SHIFT
- ? PAGE_SIZE / sizeof(pte_t) : 0] __page_aligned_bss;
-#undef __FIXADDR_TOP
-static __initdata pte_t *bm_ptep;
+static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;
static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
{
@@ -507,8 +502,6 @@ static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)
static inline pte_t * __init early_ioremap_pte(unsigned long addr) {
- if (!sizeof(bm_pte))
- return &bm_ptep[pte_index(addr)]; return &bm_pte[pte_index(addr)]; }
@@ -526,14 +519,8 @@ void __init early_ioremap_init(void)
slot_virt[i] = fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i); pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN));
- if (sizeof(bm_pte)) {
- memset(bm_pte, 0, sizeof(bm_pte));
- pmd_populate_kernel(&init_mm, pmd, bm_pte);
- } else {
- bm_ptep = pte_offset_kernel(pmd, 0);
- if (early_ioremap_debug)
- printk(KERN_INFO "bm_ptep=%p\n", bm_ptep);
- }
+ memset(bm_pte, 0, sizeof(bm_pte));
+ pmd_populate_kernel(&init_mm, pmd, bm_pte);
/* * The boot-ioremap range spans multiple pmds, for which
[tip:x86/mm] Revert "x86: create a non-zero sized bm_pte only when needed"
Commit-ID: 45c7b28f3c7e3a45cc5a597cc19816a9015ee8ae Gitweb: http://git.kernel.org/tip/45c7b28f3c7e3a45cc5a597cc19816a9015ee8ae Author: Jeremy Fitzhardinge <[email protected]> AuthorDate: Fri, 20 Mar 2009 17:53:34 -0700 Committer: Ingo Molnar <[email protected]> CommitDate: Sat, 21 Mar 2009 17:11:41 +0100
Revert "x86: create a non-zero sized bm_pte only when needed"
This reverts commit 698609bdcd35d0641f4c6622c83680ab1a6d67cb.
69860 breaks Xen booting, as it relies on head*.S to set up the fixmap pagetables (as a side-effect of initializing the USB debug port). Xen, however, does not boot via head*.S, and so the fixmap area is not initialized.
The specific symptom of the crash is a fault in dmi_scan(), because the pointer that early_ioremap returns is not actually present.
LKML-Reference: <[email protected]>
--- arch/x86/mm/ioremap.c | 19 +++---------------- 1 files changed, 3 insertions(+), 16 deletions(-)
arch/x86/mm/ioremap.c +3 -16
@@ -487,12 +487,7 @@ static int __init early_ioremap_debug_setup(char *str)early_param ("early_ioremap_debug" , early_ioremap_debug_setup);static __initdata int after_paging_init; -#define __FIXADDR_TOP (-PAGE_SIZE) -static pte_t bm_pte[(__fix_to_virt (FIX_DBGP_BASE ) - ^__fix_to_virt (FIX_BTMAP_BEGIN )) >>PMD_SHIFT - ? PAGE_SIZE / sizeof(pte_t) : 0] __page_aligned_bss; -#undef __FIXADDR_TOP -static __initdata pte_t *bm_ptep; +static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss;static inline pmd_t *__init early_ioremap_pmd (unsigned long addr) {
@@ -507,8 +502,6 @@ static inline pmd_t * __init early_ioremap_pmd(unsigned long addr)static inline pte_t *__init early_ioremap_pte (unsigned long addr) { -if (!sizeof (bm_pte)) -return &bm_ptep[pte_index (addr)];return &bm_pte[pte_index (addr)]; }
@@ -526,14 +519,8 @@ void __init early_ioremap_init(void) slot_virt[i] =fix_to_virt (FIX_BTMAP_BEGIN -NR_FIX_BTMAPS *i); pmd =early_ioremap_pmd (fix_to_virt (FIX_BTMAP_BEGIN )); -if (sizeof (bm_pte)) { -memset (bm_pte,0 ,sizeof (bm_pte)); -pmd_populate_kernel (&init_mm, pmd, bm_pte); - }else { - bm_ptep =pte_offset_kernel (pmd,0 ); -if (early_ioremap_debug) -printk (KERN_INFO "bm_ptep=%p\n" , bm_ptep); - } +memset (bm_pte,0 ,sizeof (bm_pte)); +pmd_populate_kernel (&init_mm, pmd, bm_pte);/* * The boot-ioremap range spans multiple pmds, for which