From owner-cvs-all@FreeBSD.ORG  Thu Dec  4 15:04:15 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 3A33C16A4CE; Thu,  4 Dec 2003 15:04:15 -0800 (PST)
Received: from canning.wemm.org (canning.wemm.org [192.203.228.65])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 0776C43FE9; Thu,  4 Dec 2003 15:04:12 -0800 (PST)
	(envelope-from peter@wemm.org)
Received: from wemm.org (localhost [127.0.0.1])
	by canning.wemm.org (Postfix) with ESMTP
	id E12AD2A7EA; Thu,  4 Dec 2003 15:04:11 -0800 (PST)
	(envelope-from peter@wemm.org)
X-Mailer: exmh version 2.6.3 04/04/2003 with nmh-1.0.4
To: John Baldwin <jhb@FreeBSD.org>
In-Reply-To: <XFMail.20031204131725.jhb@FreeBSD.org> 
Date: Thu, 04 Dec 2003 15:04:11 -0800
From: Peter Wemm <peter@wemm.org>
Message-Id: <20031204230411.E12AD2A7EA@canning.wemm.org>
cc: cvs-src@FreeBSD.org
cc: src-committers@FreeBSD.org
cc: cvs-all@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 
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Dec 2003 23:04:15 -0000

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