From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757579AbZCDTur (ORCPT ); Wed, 4 Mar 2009 14:50:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755880AbZCDTuh (ORCPT ); Wed, 4 Mar 2009 14:50:37 -0500 Received: from mx3.mail.elte.hu ([157.181.1.138]:35864 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755867AbZCDTuh (ORCPT ); Wed, 4 Mar 2009 14:50:37 -0500 Date: Wed, 4 Mar 2009 20:50:14 +0100 From: Ingo Molnar To: Yinghai Lu Cc: Thomas Gleixner , "H. Peter Anvin" , Andrew Morton , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH] x86: ioremap mptable Message-ID: <20090304195014.GA21488@elte.hu> References: <49AE485B.8000902@kernel.org> <49AE4901.3090801@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <49AE4901.3090801@kernel.org> User-Agent: Mutt/1.5.18 (2008-05-17) X-ELTE-VirusStatus: clean X-ELTE-SpamScore: -1.5 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.3 -1.5 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Yinghai Lu wrote: > > Impact: fix boot with mptable above max_low_mapped > > try to use early_ioremap to map mpc to make sure it works even it is > at end of ram on system. > > Signed-off-by: Yinghai Lu > Reported-and-tested-by: Kevin O'Connor > > --- > arch/x86/kernel/mpparse.c | 26 +++++++++++++++++++++++--- > 1 file changed, 23 insertions(+), 3 deletions(-) > > Index: linux-2.6/arch/x86/kernel/mpparse.c > =================================================================== > --- linux-2.6.orig/arch/x86/kernel/mpparse.c > +++ linux-2.6/arch/x86/kernel/mpparse.c > @@ -558,6 +558,19 @@ static inline void __init construct_defa > > static struct mpf_intel *mpf_found; > > +static unsigned long __init get_mpc_size(unsigned long physptr) > +{ > + struct mpc_table *mpc; > + unsigned long size; > + > + mpc = early_ioremap(physptr, PAGE_SIZE); > + size = mpc->length; > + early_iounmap(mpc, PAGE_SIZE); > + apic_printk(APIC_VERBOSE, " mpc: %lx-%lx\n", physptr, physptr + size); > + > + return size; > +} > + > /* > * Scan the memory blocks for an SMP configuration block. > */ > @@ -611,12 +624,16 @@ static void __init __get_smp_config(unsi > construct_default_ISA_mptable(mpf->feature1); > > } else if (mpf->physptr) { > + struct mpc_table *mpc; > + unsigned long size; > > + size = get_mpc_size(mpf->physptr); > + mpc = early_ioremap(mpf->physptr, size); > /* > * Read the physical hardware table. Anything here will > * override the defaults. > */ > - if (!smp_read_mpc(phys_to_virt(mpf->physptr), early)) { > + if (!smp_read_mpc(mpc, early)) { > #ifdef CONFIG_X86_LOCAL_APIC > smp_found_config = 0; > #endif > @@ -624,8 +641,10 @@ static void __init __get_smp_config(unsi > "BIOS bug, MP table errors detected!...\n"); > printk(KERN_ERR "... disabling SMP support. " > "(tell your hw vendor)\n"); > + early_iounmap(mpc, size); > return; > } > + early_iounmap(mpc, size); > > if (early) > return; the whole "else if" branch here: } else if (mpf->physptr) { should move into a helper function, not just get_mpc_size(). Ingo