From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: [to-be-updated] x86-fix-handling-of-the-reservetop-boot-option.patch removed from -mm tree Date: Fri, 30 Apr 2010 12:10:22 -0700 Message-ID: <201004301910.o3UJAM1W006312@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:53604 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934297Ab0D3TL3 (ORCPT ); Fri, 30 Apr 2010 15:11:29 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: liang.li@windriver.com, akpm@linux-foundation.org, hpa@zytor.com, jeremy.fitzhardinge@citrix.com, konrad.wilk@oracle.com, mingo@elte.hu, tglx@linutronix.de, wangchen@cn.fujitsu.comy The patch titled x86: fix handling of the 'reservetop' boot option has been removed from the -mm tree. Its filename was x86-fix-handling-of-the-reservetop-boot-option.patch This patch was dropped because an updated version will be merged The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: x86: fix handling of the 'reservetop' boot option From: Liang Li When specifying the 'reservetop=0xbadc0de' kernel parameter, the kernel will stop booting due to a early_ioremap bug that relate to commit 8827247ff ("x86: don't define __this_fixmap_does_not_exist()"). 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. Signed-off-by: Liang Li Cc: Wang Chen Cc: Ingo Molnar Cc: Thomas Gleixner Cc: "H. Peter Anvin" Cc: Yinghai Lu Cc: Andrew Morton Cc: Jeremy Fitzhardinge Cc: Konrad Rzeszutek Wilk Signed-off-by: Andrew Morton --- arch/x86/include/asm/io.h | 1 + arch/x86/mm/ioremap.c | 15 +++++++++++++++ arch/x86/mm/pgtable_32.c | 1 + 3 files changed, 17 insertions(+) diff -puN arch/x86/include/asm/io.h~x86-fix-handling-of-the-reservetop-boot-option arch/x86/include/asm/io.h --- a/arch/x86/include/asm/io.h~x86-fix-handling-of-the-reservetop-boot-option +++ a/arch/x86/include/asm/io.h @@ -347,6 +347,7 @@ extern void __iomem *early_ioremap(resou extern void __iomem *early_memremap(resource_size_t phys_addr, unsigned long size); extern void early_iounmap(void __iomem *addr, unsigned long size); +extern void fixup_early_ioremap(void); #define IO_SPACE_LIMIT 0xffff diff -puN arch/x86/mm/ioremap.c~x86-fix-handling-of-the-reservetop-boot-option arch/x86/mm/ioremap.c --- a/arch/x86/mm/ioremap.c~x86-fix-handling-of-the-reservetop-boot-option +++ a/arch/x86/mm/ioremap.c @@ -448,6 +448,21 @@ static inline void __init early_clear_fi static void __iomem *prev_map[FIX_BTMAPS_SLOTS] __initdata; static unsigned long prev_size[FIX_BTMAPS_SLOTS] __initdata; +void __init fixup_early_ioremap(void) +{ + int i; + for (i = 0; i < FIX_BTMAPS_SLOTS; i++) { + if (prev_map[i]) + break; + } + + if (i < FIX_BTMAPS_SLOTS) + BUG_ON(1); + + early_ioremap_init(); + return; +} + static int __init check_early_ioremap_leak(void) { int count = 0; diff -puN arch/x86/mm/pgtable_32.c~x86-fix-handling-of-the-reservetop-boot-option arch/x86/mm/pgtable_32.c --- a/arch/x86/mm/pgtable_32.c~x86-fix-handling-of-the-reservetop-boot-option +++ a/arch/x86/mm/pgtable_32.c @@ -127,6 +127,7 @@ static int __init parse_reservetop(char address = memparse(arg, &arg); reserve_top_address(address); + fixup_early_ioremap(); return 0; } early_param("reservetop", parse_reservetop); _ Patches currently in -mm which might be from liang.li@windriver.com are x86-fix-handling-of-the-reservetop-boot-option.patch