Date: Thu, 04 Dec 2003 15:04:11 -0800 From: Peter Wemm <peter@wemm.org> To: John Baldwin <jhb@FreeBSD.org> Cc: Nate Lawson <nate@root.org> Subject: Re: cvs commit: src/sys/i386/acpica madt.c src/sys/i386/i386 local_apic.c mptable.c Message-ID: <20031204230411.E12AD2A7EA@canning.wemm.org> In-Reply-To: <XFMail.20031204131725.jhb@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
John Baldwin wrote:
>
> On 04-Dec-2003 Nate Lawson wrote:
> > On Wed, 3 Dec 2003, John Baldwin wrote:
> >> - Allow the apic device to be disabled via 'hint.apic.0.disabled' from t
he
> >> loader. Note that since this is done in the local APIC code, it works
> >> for both the ACPI and non-ACPI cases.
> >>
> >> Approved by: re (scott / blanket)
> >>
> >> Revision Changes Path
> >> 1.8 +2 -3 src/sys/i386/acpica/madt.c
> >> 1.4 +16 -24 src/sys/i386/i386/local_apic.c
> >> 1.228 +2 -2 src/sys/i386/i386/mptable.c
> >>
> >> static void
> >> apic_init(void *dummy __unused)
> >> {
> >> struct apic_enumerator *enumerator;
> >> + uint64_t apic_base;
> >> int retval, best;
> >>
> >> /* We only support built in local APICs. */
> >> if (!(cpu_feature & CPUID_APIC))
> >> return;
> >>
> >> + /* Don't probe if APIC mode is disabled. */
> >> + if (resource_disabled("apic", 0))
> >> + return;
> >> +
> >
> > Isn't the code that Peter just committed to amd64 redundant with this?
>
> His code only works for the ACPI case and doesn't handle the MP Table
> case.
Correct. But we dont compile in the mptable code by default on the amd64
boxes. I've been meaning to merge this all across anyway.
Cheers,
-Peter
--
Peter Wemm - peter@wemm.org; peter@FreeBSD.org; peter@yahoo-inc.com
"All of this is for nothing if we don't go to the stars" - JMS/B5
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031204230411.E12AD2A7EA>