Next phase in the PCI subsystem cleanup.

 - Move PCI core code to dev/pci.
 - Split bridge code out into separate modules.
 - Remove the descriptive strings from the bridge drivers.  If you
   want to know what a device is, use pciconf.  Add support for
   broadly identifying devices based on class/subclass, and for
   parsing a preloaded device identification database so that if
   you want to waste the memory, you can identify *anything* we know
   about.
 - Remove machine-dependant code from the core PCI code.  APIC interrupt
   mapping is performed by shadowing the intline register in machine-
   dependant code.
 - Bring interrupt routing support to the Alpha
   (although many platforms don't yet support routing or mapping
   interrupts entirely correctly).  This resulted in spamming
   <sys/bus.h> into more places than it really should have gone.
 - Put sys/dev on the kernel/modules include path.  This avoids
   having to change *all* the pci*.h includes.

1 files changed, 116 insertions, 0 deletions

diff --git a/sys/dev/pci/fixup_pci.c b/sys/dev/pci/fixup_pci.c
new file mode 100644
index 0000000..c2b57eb
--- /dev/null
+++ b/sys/dev/pci/fixup_pci.c
@@ -0,0 +1,116 @@
+/*-
+ * Copyright (c) 1994,1995 Stefan Esser, Wolfgang StanglMeier
+ * Copyright (c) 2000 Michael Smith <msmith@freebsd.org>
+ * Copyright (c) 2000 BSDi
+ * 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. The name of the author 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.
+ *
+ *	$FreeBSD$
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/malloc.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
+
+#include <pci/pcivar.h>
+#include <pci/pcireg.h>
+
+/*
+ * Chipset fixups.
+ *
+ * These routines are invoked during the probe phase for devices which
+ * typically don't have specific device drivers, but which require
+ * some cleaning up.
+ */
+
+static int	fixup_pci_probe(device_t dev);
+static void	fixbushigh_i1225(device_t dev);
+static void	fixwsc_natoma(device_t dev);
+
+static device_method_t fixup_pci_methods[] = {
+    /* Device interface */
+    DEVMETHOD(device_probe,		fixup_pci_probe),
+    DEVMETHOD(device_attach,		bus_generic_attach),
+    { 0, 0 }
+};
+
+static driver_t fixup_pci_driver = {
+    "fixup_pci",
+    fixup_pci_methods,
+    0,
+};
+
+static devclass_t fixup_pci_devclass;
+
+DRIVER_MODULE(fixup_pci, pci, fixup_pci_driver, fixup_pci_devclass, 0, 0);
+
+static int
+fixup_pci_probe(device_t dev)
+{
+    switch (pci_get_devid(dev)) {
+    case 0x12258086:		/* Intel 82454KX/GX (Orion) */
+	fixbushigh_i1225(dev);
+	break;
+    case 0x12378086:		/* Intel 82440FX (Natoma) */
+	fixwsc_natoma(dev);
+	break;
+    }
+    return(ENXIO);
+}
+
+static void
+fixbushigh_i1225(device_t dev)
+{
+    int		supbus;
+
+    supbus = pci_read_config(dev, 0x41, 1);
+    if (supbus != 0xff) {
+	pci_set_secondarybus(dev, supbus + 1);
+	pci_set_subordinatebus(dev, supbus + 1);
+    }
+}
+
+static void
+fixwsc_natoma(device_t dev)
+{
+    int		pmccfg;
+
+    pmccfg = pci_read_config(dev, 0x50, 2);
+#if defined(SMP)
+    if (pmccfg & 0x8000) {
+	printf("Correcting Natoma config for SMP\n");
+	pmccfg &= ~0x8000;
+	pci_write_config(dev, 0x50, 2, pmccfg);
+    }
+#else
+    if ((pmccfg & 0x8000) == 0) {
+	printf("Correcting Natoma config for non-SMP\n");
+	pmccfg |= 0x8000;
+	pci_write_config(dev, 0x50, 2, pmccfg);
+    }
+#endif
+}