Skip to contentSkip to conversation

x86: let 'reservetop' functioning right

PATCH In review Liang Li 1 participant 2 messages Mar 25, 2010 – Mar 31, 2010

Subsystems (2)
lore
Share & tools
lore

Liang Li

author
#0 lore raw

PATCH 1/1 x86: let 'reservetop' functioning right

When specify 'reservetop=0xabc000' kernel parameter, kernel will hang on boot due to a early_ioremap bug that relate to commit 8827247ff.

The root cause of boot failure problem is the value of 'slot_virt[i]' was initialized in setup_arch->early_ioremap_init. But later in setup_arch, the function 'parse_early_param' will modify 'FIXADDR_TOP' when 'reservetop=0xbadc0de' being specified.

The simplest fix might be use __fix_to_virt(idx0) to get updated value of 'FIXADDR_TOP' in '__early_ioremap' instead of reference old value from slot_virt[slot] directly.

---
 arch/x86/mm/ioremap.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/mm/ioremap.c +2 -2
index 5eb1ba7..ea82ef0 100644
@@ -537,9 +537,9 @@ __early_ioremap(resource_size_t phys_addr, unsigned long size, pgprot_t prot)
 		--nrpages;
 	}
 	if (early_ioremap_debug)
-		printk(KERN_CONT "%08lx + %08lx\n", offset, slot_virt[slot]);
+		printk(KERN_CONT "%08lx + %08lx\n", offset, __fix_to_virt(idx0));
 
-	prev_map[slot] = (void __iomem *)(offset + slot_virt[slot]);
+	prev_map[slot] = (void __iomem *)(offset + __fix_to_virt(idx0));
 	return prev_map[slot];
 }
 
Signature · 1 line
1.6.6
author
#1 lore raw

Hi Ingo,

Seems the problem still there in 2.6.34-rc3. When pass 'reservetop=0x1000' to x86_32 kernel, kernel hangs on very early boot stage.

Do we have any plan to abandon 'reservetop' or due to some reason that the patch is non-acceptable?

Thanks,
-Liang Li

Quoted 41 lines · Liang Li

When specify 'reservetop=0xabc000' kernel parameter, kernel will hang on boot due to a early_ioremap bug that relate to commit 8827247ff.

The root cause of boot failure problem is the value of 'slot_virt[i]' was initialized in setup_arch->early_ioremap_init. But later in setup_arch, the function 'parse_early_param' will modify 'FIXADDR_TOP' when 'reservetop=0xbadc0de' being specified.

The simplest fix might be use __fix_to_virt(idx0) to get updated value of 'FIXADDR_TOP' in '__early_ioremap' instead of reference old value from slot_virt[slot] directly.

---
 arch/x86/mm/ioremap.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/mm/ioremap.c +2 -2
index 5eb1ba7..ea82ef0 100644
@@ -537,9 +537,9 @@ __early_ioremap(resource_size_t phys_addr, unsigned long size, pgprot_t prot)
 		--nrpages;
 	}
 	if (early_ioremap_debug)
-		printk(KERN_CONT "%08lx + %08lx\n", offset, slot_virt[slot]);
+		printk(KERN_CONT "%08lx + %08lx\n", offset, __fix_to_virt(idx0));
 
-	prev_map[slot] = (void __iomem *)(offset + slot_virt[slot]);
+	prev_map[slot] = (void __iomem *)(offset + __fix_to_virt(idx0));
 	return prev_map[slot];
 }
 
Signature · 7 lines
1.6.6

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/