From owner-svn-src-projects@FreeBSD.ORG Fri Oct 4 01:39:21 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 1C8BBE28; Fri, 4 Oct 2013 01:39:21 +0000 (UTC) (envelope-from cherry@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EE7A92C75; Fri, 4 Oct 2013 01:39:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r941dKR8071284; Fri, 4 Oct 2013 01:39:20 GMT (envelope-from cherry@svn.freebsd.org) Received: (from cherry@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r941dKML071281; Fri, 4 Oct 2013 01:39:20 GMT (envelope-from cherry@svn.freebsd.org) Message-Id: <201310040139.r941dKML071281@svn.freebsd.org> From: "Cherry G. Mathew" Date: Fri, 4 Oct 2013 01:39:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r256035 - in projects/amd64_xen_pv/sys: conf i386/xen x86/xen X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Oct 2013 01:39:21 -0000 Author: cherry Date: Fri Oct 4 01:39:20 2013 New Revision: 256035 URL: http://svnweb.freebsd.org/changeset/base/256035 Log: Make the i386 xen/pv mptable.c common for amd64/i386 Approved by: gibbs(implicit) Added: projects/amd64_xen_pv/sys/x86/xen/mptable.c - copied unchanged from r255919, projects/amd64_xen_pv/sys/i386/xen/mptable.c Deleted: projects/amd64_xen_pv/sys/i386/xen/mptable.c Modified: projects/amd64_xen_pv/sys/conf/files.amd64 projects/amd64_xen_pv/sys/conf/files.i386 Modified: projects/amd64_xen_pv/sys/conf/files.amd64 ============================================================================== --- projects/amd64_xen_pv/sys/conf/files.amd64 Thu Oct 3 23:56:38 2013 (r256034) +++ projects/amd64_xen_pv/sys/conf/files.amd64 Fri Oct 4 01:39:20 2013 (r256035) @@ -565,4 +565,5 @@ x86/x86/msi.c optional native pci x86/x86/nexus.c standard x86/x86/tsc.c standard x86/xen/hvm.c optional xenhvm +x86/xen/mptable.c optional xen x86/xen/xen_intr.c optional xen | xenhvm Modified: projects/amd64_xen_pv/sys/conf/files.i386 ============================================================================== --- projects/amd64_xen_pv/sys/conf/files.i386 Thu Oct 3 23:56:38 2013 (r256034) +++ projects/amd64_xen_pv/sys/conf/files.i386 Fri Oct 4 01:39:20 2013 (r256035) @@ -461,7 +461,7 @@ i386/i386/mp_machdep.c optional native i386/xen/mp_machdep.c optional xen smp i386/i386/mp_watchdog.c optional mp_watchdog smp i386/i386/mpboot.s optional smp native -i386/xen/mptable.c optional apic xen +x86/xen/mptable.c optional apic xen i386/i386/perfmon.c optional perfmon i386/i386/pmap.c optional native i386/xen/pmap.c optional xen Copied: projects/amd64_xen_pv/sys/x86/xen/mptable.c (from r255919, projects/amd64_xen_pv/sys/i386/xen/mptable.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/amd64_xen_pv/sys/x86/xen/mptable.c Fri Oct 4 01:39:20 2013 (r256035, copy of r255919, projects/amd64_xen_pv/sys/i386/xen/mptable.c) @@ -0,0 +1,109 @@ +/*- + * Copyright (c) 2003 John Baldwin + * Copyright (c) 1996, by Steve Passe + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. The name of the developer may NOT be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include + +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include + + +static int mptable_probe(void); +static int mptable_probe_cpus(void); +static void mptable_register(void *dummy); +static int mptable_setup_local(void); +static int mptable_setup_io(void); + +static struct apic_enumerator mptable_enumerator = { + "MPTable", + mptable_probe, + mptable_probe_cpus, + mptable_setup_local, + mptable_setup_io +}; + +static int +mptable_probe(void) +{ + + return (-100); +} + +static int +mptable_probe_cpus(void) +{ + int i, rc; + + for (i = 0; i < MAXCPU; i++) { + rc = HYPERVISOR_vcpu_op(VCPUOP_is_up, i, NULL); + if (rc >= 0) + cpu_add(i, (i == 0)); + } + + return (0); +} + +/* + * Initialize the local APIC on the BSP. + */ +static int +mptable_setup_local(void) +{ + + PCPU_SET(apic_id, 0); + PCPU_SET(acpi_id, 0); + return (0); +} + +static int +mptable_setup_io(void) +{ + + return (0); +} + +static void +mptable_register(void *dummy __unused) +{ + + apic_register_enumerator(&mptable_enumerator); +} +SYSINIT(mptable_register, SI_SUB_TUNABLES - 1, SI_ORDER_FIRST, mptable_register, + NULL);