Attachment 311827 Details for Bug 455423 – Upstream fix for this issue

[patch] Upstream fix for this issue

70 (text/plain), 6.20 KB, created by Prarit Bhargava on 2008-07-15 14:02:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2008-07-15 14:02:23 UTC

Size: 6.20 KB

patch

obsolete

>Return-path: <git-commits-head-owner@vger.kernel.org>
>Envelope-to: arjan@infradead.org
>Delivery-date: Fri, 18 Apr 2008 17:06:32 +0000
>Received: from vger.kernel.org ([209.132.176.167])
>	by pentafluge.infradead.org with esmtp (Exim 4.68 #1 (Red Hat Linux))
>	id 1Jmu2i-0008QN-86
>	for arjan@infradead.org; Fri, 18 Apr 2008 17:06:32 +0000
>Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
>	id S1755780AbYDRRGb (ORCPT <rfc822;arjan@infradead.org>);
>	Fri, 18 Apr 2008 13:06:31 -0400
>Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755808AbYDRRGb
>	(ORCPT <rfc822;git-commits-head-outgoing>);
>	Fri, 18 Apr 2008 13:06:31 -0400
>Received: from hera.kernel.org ([140.211.167.34]:39417 "EHLO hera.kernel.org"
>	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
>	id S1755780AbYDRRGa (ORCPT
>	<rfc822;git-commits-head@vger.kernel.org>);
>	Fri, 18 Apr 2008 13:06:30 -0400
>Received: from hera.kernel.org (IDENT:U2FsdGVkX19keA3AwfYZ68B2PfQSAh6gZlG8vKoFTLo@localhost [127.0.0.1])
>	by hera.kernel.org (8.13.8/8.13.8) with ESMTP id m3IH6ToL010759
>	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO)
>	for <git-commits-head@vger.kernel.org>; Fri, 18 Apr 2008 17:06:29 GMT
>Received: (from dwmw2@localhost)
>	by hera.kernel.org (8.13.8/8.13.1/Submit) id m3IH6S4M010733
>	for git-commits-head@vger.kernel.org; Fri, 18 Apr 2008 17:06:28 GMT
>Date:	Fri, 18 Apr 2008 17:06:28 GMT
>Message-Id: <200804181706.m3IH6S4M010733@hera.kernel.org>
>From:	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
>To:	git-commits-head@vger.kernel.org
>Subject: x86: insert_resorce for lapic addr after e820_reserve_resources
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>X-Git-Commit: 1e934dda0c77c8ad13fdda02074f2cfcea118a56
>X-Git-Parent: 3def3d6ddf43dbe20c00c3cbc38dfacc8586998f
>X-Spam-Status: No, score=-4.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00
>	autolearn=ham version=3.2.3
>X-Spam-Checker-Version:	SpamAssassin 3.2.3 (2007-08-08) on hera.kernel.org
>Sender:	git-commits-head-owner@vger.kernel.org
>Precedence: bulk
>List-ID: <git-commits-head.vger.kernel.org>
>X-Mailing-List:	git-commits-head@vger.kernel.org
>
>Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1e934dda0c77c8ad13fdda02074f2cfcea118a56
>Commit:     1e934dda0c77c8ad13fdda02074f2cfcea118a56
>Parent:     3def3d6ddf43dbe20c00c3cbc38dfacc8586998f
>Author:     Yinghai Lu <Yinghai.Lu@Sun.COM>
>AuthorDate: Fri Feb 22 13:37:26 2008 -0800
>Committer:  Ingo Molnar <mingo@elte.hu>
>CommitDate: Thu Apr 17 17:40:49 2008 +0200
>
>    x86: insert_resorce for lapic addr after e820_reserve_resources
>    
>    when comparing the e820 direct from BIOS, and the one by kexec:
>    
>     BIOS-provided physical RAM map:
>    - BIOS-e820: 0000000000000000 - 0000000000097400 (usable)
>    + BIOS-e820: 0000000000000100 - 0000000000097400 (usable)
>      BIOS-e820: 0000000000097400 - 00000000000a0000 (reserved)
>      BIOS-e820: 00000000000e6000 - 0000000000100000 (reserved)
>      BIOS-e820: 0000000000100000 - 00000000dffa0000 (usable)
>    - BIOS-e820: 00000000dffae000 - 00000000dffb0000 type 9
>    + BIOS-e820: 00000000dffae000 - 00000000dffb0000 (reserved)
>      BIOS-e820: 00000000dffb0000 - 00000000dffbe000 (ACPI data)
>      BIOS-e820: 00000000dffbe000 - 00000000dfff0000 (ACPI NVS)
>      BIOS-e820: 00000000dfff0000 - 00000000e0000000 (reserved)
>      BIOS-e820: 00000000fec00000 - 00000000fec01000 (reserved)
>    - BIOS-e820: 00000000fee00000 - 00000000fee01000 (reserved)
>                 =======> that is the local apic address... somewhere we lost it
>      BIOS-e820: 00000000ff700000 - 0000000100000000 (reserved)
>      BIOS-e820: 0000000100000000 - 0000004020000000 (usable)
>    
>    found one entry about reserved is missing for the kernel by kexec.
>    
>    it turns out init_apic_mappings is called before e820_reserve_resources
>    in setup_arch. but e820_reserve_resources is using request_resource.
>    it will not handle the conflicts.
>    
>    there are three ways to fix it:
>    
>    1. change request_resource in e820_reserve_resources to to insert_resource
>    2. move init_apic_mappings after e820_reserve_resources
>    3. use late_initcall to insert lapic resource.
>    
>    this patch is using method 3, that is less intrusive.
>    
>    in later version could consider to use method 1.
>    
>    before patch
>    fed20000-ffffffff : PCI Bus #00
>      fee00000-fee00fff : Local APIC
>      fefff000-feffffff : pnp 00:09
>      ff700000-ffffffff : reserved
>    
>    with patch will get map in first kernel
>    
>    fed20000-ffffffff : PCI Bus #00
>      fee00000-fee00fff : Local APIC
>        fee00000-fee00fff : reserved
>      fefff000-feffffff : pnp 00:09
>      ff700000-ffffffff : reserved
>    
>    Signed-off-by: Yinghai Lu <yinghai.lu@sun.com>
>    Signed-off-by: Ingo Molnar <mingo@elte.hu>
>---
> arch/x86/kernel/apic_64.c |   23 ++++++++++++++++++-----
> 1 files changed, 18 insertions(+), 5 deletions(-)
>
>diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
>index 7d8ffda..ac2405e 100644
>--- a/arch/x86/kernel/apic_64.c
>+++ b/arch/x86/kernel/apic_64.c
>@@ -881,11 +881,6 @@ void __init init_apic_mappings(void)
> 	apic_printk(APIC_VERBOSE, "mapped APIC to %16lx (%16lx)\n",
> 				APIC_BASE, apic_phys);
> 
>-	/* Put local APIC into the resource map. */
>-	lapic_resource.start = apic_phys;
>-	lapic_resource.end = lapic_resource.start + PAGE_SIZE - 1;
>-	insert_resource(&iomem_resource, &lapic_resource);
>-
> 	/*
> 	 * Fetch the APIC ID of the BSP in case we have a
> 	 * default configuration (or the MP table is broken).
>@@ -1300,3 +1295,21 @@ static __init int setup_apicpmtimer(char *s)
> }
> __setup("apicpmtimer", setup_apicpmtimer);
> 
>+static int __init lapic_insert_resource(void)
>+{
>+	if (!apic_phys)
>+		return -1;
>+
>+	/* Put local APIC into the resource map. */
>+	lapic_resource.start = apic_phys;
>+	lapic_resource.end = lapic_resource.start + PAGE_SIZE - 1;
>+	insert_resource(&iomem_resource, &lapic_resource);
>+
>+	return 0;
>+}
>+
>+/*
>+ * need call insert after e820_reserve_resources()
>+ * that is using request_resource
>+ */
>+late_initcall(lapic_insert_resource);
>--
>To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
>the body of a message to majordomo@vger.kernel.org
>More majordomo info at  http://vger.kernel.org/majordomo-info.html

Actions: View | Diff

Attachments on bug 455423: 311827