svn commit: r215059 - in stable/8/sys: amd64/amd64 conf i386/i386
x86/x86
Attilio Rao
attilio at FreeBSD.org
Tue Nov 9 21:18:33 UTC 2010
Author: attilio
Date: Tue Nov 9 21:18:32 2010
New Revision: 215059
URL: http://svn.freebsd.org/changeset/base/215059
Log:
MFC r214446, r214516:
Move mptable support to x86/ subtree.
Sponsored by: Sandvine Incorporated
Added:
stable/8/sys/x86/x86/mptable.c
- copied, changed from r215054, stable/8/sys/i386/i386/mptable.c
stable/8/sys/x86/x86/mptable_pci.c
- copied unchanged from r215054, stable/8/sys/i386/i386/mptable_pci.c
Deleted:
stable/8/sys/amd64/amd64/mptable.c
stable/8/sys/amd64/amd64/mptable_pci.c
stable/8/sys/i386/i386/mptable.c
stable/8/sys/i386/i386/mptable_pci.c
Modified:
stable/8/sys/conf/files.amd64
stable/8/sys/conf/files.i386
stable/8/sys/conf/files.pc98
stable/8/sys/conf/options.amd64
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/conf/files.amd64
==============================================================================
--- stable/8/sys/conf/files.amd64 Tue Nov 9 21:06:26 2010 (r215058)
+++ stable/8/sys/conf/files.amd64 Tue Nov 9 21:18:32 2010 (r215059)
@@ -123,8 +123,6 @@ amd64/amd64/minidump_machdep.c standard
amd64/amd64/mp_machdep.c optional smp
amd64/amd64/mp_watchdog.c optional mp_watchdog smp
amd64/amd64/mpboot.S optional smp
-amd64/amd64/mptable.c optional mptable
-amd64/amd64/mptable_pci.c optional mptable pci
amd64/amd64/msi.c optional pci
amd64/amd64/nexus.c standard
amd64/amd64/pmap.c standard
@@ -319,3 +317,5 @@ x86/isa/nmi.c standard
x86/pci/qpi.c standard
x86/x86/dump_machdep.c standard
x86/x86/mca.c standard
+x86/x86/mptable.c optional mptable
+x86/x86/mptable_pci.c optional mptable pci
Modified: stable/8/sys/conf/files.i386
==============================================================================
--- stable/8/sys/conf/files.i386 Tue Nov 9 21:06:26 2010 (r215058)
+++ stable/8/sys/conf/files.i386 Tue Nov 9 21:18:32 2010 (r215059)
@@ -288,9 +288,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/i386/mptable.c optional apic native
i386/xen/mptable.c optional apic xen
-i386/i386/mptable_pci.c optional apic pci
i386/i386/msi.c optional apic pci
i386/i386/nexus.c standard
i386/i386/perfmon.c optional perfmon
@@ -394,3 +392,5 @@ x86/isa/nmi.c standard
x86/pci/qpi.c standard
x86/x86/dump_machdep.c standard
x86/x86/mca.c standard
+x86/x86/mptable.c optional apic native
+x86/x86/mptable_pci.c optional apic pci
Modified: stable/8/sys/conf/files.pc98
==============================================================================
--- stable/8/sys/conf/files.pc98 Tue Nov 9 21:06:26 2010 (r215058)
+++ stable/8/sys/conf/files.pc98 Tue Nov 9 21:18:32 2010 (r215059)
@@ -158,8 +158,6 @@ i386/i386/mp_clock.c optional smp
i386/i386/mp_machdep.c optional smp
i386/i386/mp_watchdog.c optional mp_watchdog smp
i386/i386/mpboot.s optional smp
-i386/i386/mptable.c optional apic
-i386/i386/mptable_pci.c optional apic pci
i386/i386/msi.c optional apic pci
i386/i386/nexus.c standard
i386/i386/perfmon.c optional perfmon
@@ -258,3 +256,5 @@ x86/isa/atpic.c optional atpic
x86/isa/isa.c optional isa
x86/x86/dump_machdep.c standard
x86/x86/mca.c standard
+x86/x86/mptable.c optional apic
+x86/x86/mptable_pci.c optional apic pci
Modified: stable/8/sys/conf/options.amd64
==============================================================================
--- stable/8/sys/conf/options.amd64 Tue Nov 9 21:06:26 2010 (r215058)
+++ stable/8/sys/conf/options.amd64 Tue Nov 9 21:18:32 2010 (r215059)
@@ -6,6 +6,7 @@ AUTO_EOI_2 opt_auto_eoi.h
MAXMEM
PERFMON
PMAP_SHPGPERPROC opt_pmap.h
+MPTABLE_FORCE_HTT
MP_WATCHDOG
# Options for emulators. These should only be used at config time, so
Copied and modified: stable/8/sys/x86/x86/mptable.c (from r215054, stable/8/sys/i386/i386/mptable.c)
==============================================================================
--- stable/8/sys/i386/i386/mptable.c Tue Nov 9 20:46:41 2010 (r215054, copy source)
+++ stable/8/sys/x86/x86/mptable.c Tue Nov 9 21:18:32 2010 (r215059)
@@ -51,7 +51,11 @@ __FBSDID("$FreeBSD$");
/* string defined by the Intel MP Spec as identifying the MP table */
#define MP_SIG 0x5f504d5f /* _MP_ */
+#ifdef __amd64__
+#define MAX_LAPIC_ID 63 /* Max local APIC ID for HTT fixup */
+#else
#define MAX_LAPIC_ID 31 /* Max local APIC ID for HTT fixup */
+#endif
#ifdef PC98
#define BIOS_BASE (0xe8000)
Copied: stable/8/sys/x86/x86/mptable_pci.c (from r215054, stable/8/sys/i386/i386/mptable_pci.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/8/sys/x86/x86/mptable_pci.c Tue Nov 9 21:18:32 2010 (r215059, copy of r215054, stable/8/sys/i386/i386/mptable_pci.c)
@@ -0,0 +1,200 @@
+/*-
+ * Copyright (c) 2003 John Baldwin <jhb at FreeBSD.org>
+ * 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. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 3. Neither the name of the author nor the names of any co-contributors
+ * may 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.
+ */
+
+/*
+ * Host to PCI and PCI to PCI bridge drivers that use the MP Table to route
+ * interrupts from PCI devices to I/O APICs.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/bus.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/pci/pcib_private.h>
+#include <machine/legacyvar.h>
+#include <machine/mptable.h>
+#include <machine/pci_cfgreg.h>
+
+#include "pcib_if.h"
+
+/* Host to PCI bridge driver. */
+
+static int
+mptable_hostb_probe(device_t dev)
+{
+
+ if (pci_cfgregopen() == 0)
+ return (ENXIO);
+ if (mptable_pci_probe_table(pcib_get_bus(dev)) != 0)
+ return (ENXIO);
+ device_set_desc(dev, "MPTable Host-PCI bridge");
+ return (0);
+}
+
+static int
+mptable_hostb_attach(device_t dev)
+{
+
+ device_add_child(dev, "pci", pcib_get_bus(dev));
+ return (bus_generic_attach(dev));
+}
+
+/* Pass MSI requests up to the nexus. */
+static int
+mptable_hostb_alloc_msi(device_t pcib, device_t dev, int count, int maxcount,
+ int *irqs)
+{
+ device_t bus;
+
+ bus = device_get_parent(pcib);
+ return (PCIB_ALLOC_MSI(device_get_parent(bus), dev, count, maxcount,
+ irqs));
+}
+
+static int
+mptable_hostb_alloc_msix(device_t pcib, device_t dev, int *irq)
+{
+ device_t bus;
+
+ bus = device_get_parent(pcib);
+ return (PCIB_ALLOC_MSIX(device_get_parent(bus), dev, irq));
+}
+
+static int
+mptable_hostb_map_msi(device_t pcib, device_t dev, int irq, uint64_t *addr,
+ uint32_t *data)
+{
+ device_t bus;
+
+ bus = device_get_parent(pcib);
+ return (PCIB_MAP_MSI(device_get_parent(bus), dev, irq, addr, data));
+}
+
+static device_method_t mptable_hostb_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, mptable_hostb_probe),
+ DEVMETHOD(device_attach, mptable_hostb_attach),
+ DEVMETHOD(device_shutdown, bus_generic_shutdown),
+ DEVMETHOD(device_suspend, bus_generic_suspend),
+ DEVMETHOD(device_resume, bus_generic_resume),
+
+ /* Bus interface */
+ DEVMETHOD(bus_print_child, bus_generic_print_child),
+ DEVMETHOD(bus_read_ivar, legacy_pcib_read_ivar),
+ DEVMETHOD(bus_write_ivar, legacy_pcib_write_ivar),
+ DEVMETHOD(bus_alloc_resource, legacy_pcib_alloc_resource),
+ DEVMETHOD(bus_release_resource, bus_generic_release_resource),
+ DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
+ DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
+ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
+ DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
+
+ /* pcib interface */
+ DEVMETHOD(pcib_maxslots, legacy_pcib_maxslots),
+ DEVMETHOD(pcib_read_config, legacy_pcib_read_config),
+ DEVMETHOD(pcib_write_config, legacy_pcib_write_config),
+ DEVMETHOD(pcib_route_interrupt, mptable_pci_route_interrupt),
+ DEVMETHOD(pcib_alloc_msi, mptable_hostb_alloc_msi),
+ DEVMETHOD(pcib_release_msi, pcib_release_msi),
+ DEVMETHOD(pcib_alloc_msix, mptable_hostb_alloc_msix),
+ DEVMETHOD(pcib_release_msix, pcib_release_msix),
+ DEVMETHOD(pcib_map_msi, mptable_hostb_map_msi),
+
+ { 0, 0 }
+};
+
+static devclass_t hostb_devclass;
+
+DEFINE_CLASS_0(pcib, mptable_hostb_driver, mptable_hostb_methods, 1);
+DRIVER_MODULE(mptable_pcib, legacy, mptable_hostb_driver, hostb_devclass, 0, 0);
+
+/* PCI to PCI bridge driver. */
+
+static int
+mptable_pcib_probe(device_t dev)
+{
+ int bus;
+
+ if ((pci_get_class(dev) != PCIC_BRIDGE) ||
+ (pci_get_subclass(dev) != PCIS_BRIDGE_PCI))
+ return (ENXIO);
+ bus = pci_read_config(dev, PCIR_SECBUS_1, 1);
+ if (bus == 0)
+ return (ENXIO);
+ if (mptable_pci_probe_table(bus) != 0)
+ return (ENXIO);
+ device_set_desc(dev, "MPTable PCI-PCI bridge");
+ return (-1000);
+}
+
+static device_method_t mptable_pcib_pci_methods[] = {
+ /* Device interface */
+ DEVMETHOD(device_probe, mptable_pcib_probe),
+ DEVMETHOD(device_attach, pcib_attach),
+ DEVMETHOD(device_shutdown, bus_generic_shutdown),
+ DEVMETHOD(device_suspend, bus_generic_suspend),
+ DEVMETHOD(device_resume, bus_generic_resume),
+
+ /* Bus interface */
+ DEVMETHOD(bus_print_child, bus_generic_print_child),
+ DEVMETHOD(bus_read_ivar, pcib_read_ivar),
+ DEVMETHOD(bus_write_ivar, pcib_write_ivar),
+ DEVMETHOD(bus_alloc_resource, pcib_alloc_resource),
+ DEVMETHOD(bus_release_resource, bus_generic_release_resource),
+ DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
+ DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
+ DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
+ DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
+
+ /* pcib interface */
+ DEVMETHOD(pcib_maxslots, pcib_maxslots),
+ DEVMETHOD(pcib_read_config, pcib_read_config),
+ DEVMETHOD(pcib_write_config, pcib_write_config),
+ DEVMETHOD(pcib_route_interrupt, mptable_pci_route_interrupt),
+ DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi),
+ DEVMETHOD(pcib_release_msi, pcib_release_msi),
+ DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix),
+ DEVMETHOD(pcib_release_msix, pcib_release_msix),
+ DEVMETHOD(pcib_map_msi, pcib_map_msi),
+
+ {0, 0}
+};
+
+static devclass_t pcib_devclass;
+
+DEFINE_CLASS_0(pcib, mptable_pcib_driver, mptable_pcib_pci_methods,
+ sizeof(struct pcib_softc));
+DRIVER_MODULE(mptable_pcib, pci, mptable_pcib_driver, pcib_devclass, 0, 0);
More information about the svn-src-all
mailing list