5fdd34ee20
field. Perform vcpu enumeration for Xen PV and HVM environments and convert all Xen drivers to use vcpu_id instead of a hard coded assumption of the mapping algorithm (acpi or apic ID) in use. Submitted by: Roger Pau Monné Sponsored by: Citrix Systems R&D Reviewed by: gibbs Approved by: re (blanket Xen) amd64/include/pcpu.h: i386/include/pcpu.h: Add vcpu_id to the amd64 and i386 pcpu structures. dev/xen/timer/timer.c x86/xen/xen_intr.c Use new vcpu_id instead of assuming acpi_id == vcpu_id. i386/xen/mp_machdep.c: i386/xen/mptable.c x86/xen/hvm.c: Perform Xen HVM and Xen full PV vcpu_id mapping. x86/xen/hvm.c: x86/acpica/madt.c Change SYSINIT ordering of acpi CPU enumeration so that it is guaranteed to be available at the time of Xen HVM vcpu id mapping.
110 lines
2.6 KiB
C
110 lines
2.6 KiB
C
/*-
|
|
* Copyright (c) 2003 John Baldwin <jhb@FreeBSD.org>
|
|
* 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 <sys/cdefs.h>
|
|
__FBSDID("$FreeBSD$");
|
|
|
|
#include <sys/param.h>
|
|
#include <sys/bus.h>
|
|
#include <sys/kernel.h>
|
|
|
|
#include <vm/vm.h>
|
|
#include <vm/vm_param.h>
|
|
#include <vm/pmap.h>
|
|
|
|
#include <machine/frame.h>
|
|
#include <machine/intr_machdep.h>
|
|
#include <machine/apicvar.h>
|
|
|
|
#include <xen/hypervisor.h>
|
|
#include <xen/xen-os.h>
|
|
#include <machine/smp.h>
|
|
#include <xen/interface/vcpu.h>
|
|
|
|
|
|
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(vcpu_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);
|