Next round of PCI subsystem updates:

 - Break out the /dev/pci driver into a separate file.
 - Kill the COMPAT_OLDPCI support.
 - Make the EISA bridge attach a bit more like the old code; explicitly
   check for the existence of eisa0/isa0 and only attach if they don't
   already exist.  Only make one bus_generic_attach() pass over the
   bridge, once both busses are attached.  Note that the stupid Intel
   bridge's class is entirely unpredictable.
 - Add prototypes and re-layout the core PCI modules in line with
   current coding standards (not a major whitespace change, just moving
   the module data to the top of the file).
 - Remove redundant type-2 bridge support from the core PCI code; the
   PCI-CardBus code does this itself internally.  Remove the now
   entirely redundant header-class-specific support, as well as the
   secondary and subordinate bus number fields.  These are bridge
   attributes now.
 - Add support for PCI Extended Capabilities.
 - Add support for PCI Power Management.  The interface currently
   allows a driver to query and set the power state of a device.
 - Add helper functions to allow drivers to enable/disable busmastering
   and the decoding of I/O and memory ranges.
 - Use PCI_SLOTMAX and PCI_FUNCMAX rather than magic numbers in some
   places.
 - Make the PCI-PCI bridge code a little more paranoid about valid
   I/O and memory decodes.
 - Add some more PCI register definitions for the command and status
   registers.  Correct another bogus definition for type-1 bridges.

1 files changed, 0 insertions, 336 deletions

diff --git a/sys/pci/pci_compat.c b/sys/pci/pci_compat.c
deleted file mode 100644
index 401680d..0000000
--- a/sys/pci/pci_compat.c
+++ /dev/null
@@ -1,336 +0,0 @@
-/*
- * Copyright (c) 1997, Stefan Esser <se@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 unmodified, 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.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 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 "opt_bus.h"
-
-/* for compatibility to FreeBSD-2.2 and 3.x versions of PCI code */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/malloc.h>
-#include <sys/module.h>
-
-#include <vm/vm.h>
-#include <vm/pmap.h>
-
-#include <sys/bus.h>
-#include <machine/bus.h>
-#include <sys/rman.h>
-#include <machine/resource.h>
-#include <sys/interrupt.h>
-
-#include <sys/pciio.h>
-#include <pci/pcireg.h>
-#include <pci/pcivar.h>
-
-#ifdef APIC_IO
-#include <machine/smp.h>
-#endif
-
-/* ------------------------------------------------------------------------- */
-
-u_long
-pci_conf_read(pcici_t cfg, u_long reg)
-{
-	return (pci_read_config(cfg->dev, reg, 4));
-}
-
-void
-pci_conf_write(pcici_t cfg, u_long reg, u_long data)
-{
-	pci_write_config(cfg->dev, reg, data, 4);
-}
-
-int
-pci_cfgread (pcicfgregs *cfg, int reg, int bytes)
-{
-	return (pci_read_config(cfg->dev, reg, bytes));
-}
-
-void
-pci_cfgwrite (pcicfgregs *cfg, int reg, int data, int bytes)
-{
-	pci_write_config(cfg->dev, reg, data, bytes);
-}
-
-int
-pci_map_port(pcici_t cfg, u_long reg, pci_port_t* pa)
-{
-	int rid;
-	struct resource *res;
-
-	rid = reg;
-	res = bus_alloc_resource(cfg->dev, SYS_RES_IOPORT, &rid,
-				 0, ~0, 1, RF_ACTIVE);
-	if (res) {
-		*pa = rman_get_start(res);
-		return (1);
-	}
-	return (0);
-}
-
-int
-pci_map_mem(pcici_t cfg, u_long reg, vm_offset_t* va, vm_offset_t* pa)
-{
-	int rid;
-	struct resource *res;
-
-	rid = reg;
-	res = bus_alloc_resource(cfg->dev, SYS_RES_MEMORY, &rid,
-				 0, ~0, 1, RF_ACTIVE);
-	if (res) {
-		*pa = rman_get_start(res);
-		*va = (vm_offset_t) rman_get_virtual(res);
-		return (1);
-	}
-	return (0);
-}
-
-int
-pci_map_int(pcici_t cfg, pci_inthand_t *handler, void *arg, intrmask_t *maskptr)
-{
-	return (pci_map_int_right(cfg, handler, arg, maskptr, 0));
-}
-
-int
-pci_map_int_right(pcici_t cfg, pci_inthand_t *handler, void *arg,
-		  intrmask_t *maskptr, u_int intflags)
-{
-	int error;
-#ifdef APIC_IO
-	int nextpin, muxcnt;
-#endif
-	if (cfg->intpin != 0) {
-		int irq = cfg->intline;
-		int rid = 0;
-		struct resource *res;
-		int flags = 0;
-		int resflags = RF_SHAREABLE|RF_ACTIVE;
-		void *ih;
-
-#ifdef INTR_FAST
-		if (intflags & INTR_FAST)
-			flags |= INTR_FAST;
-		if (intflags & INTR_EXCL)
-			resflags &= ~RF_SHAREABLE;
-#endif
-
-		res = bus_alloc_resource(cfg->dev, SYS_RES_IRQ, &rid,
-					 irq, irq, 1, resflags);
-		if (!res) {
-			printf("pci_map_int: can't allocate interrupt\n");
-			return 0;
-		}
-
-		/*
-		 * This is ugly. Translate the mask into an interrupt type.
-		 */
-		if (maskptr == &tty_imask)
-			flags |= INTR_TYPE_TTY;
-		else if (maskptr == &bio_imask)
-			flags |= INTR_TYPE_BIO;
-		else if (maskptr == &net_imask)
-			flags |= INTR_TYPE_NET;
-		else if (maskptr == &cam_imask)
-			flags |= INTR_TYPE_CAM;
-
-		error = BUS_SETUP_INTR(device_get_parent(cfg->dev), cfg->dev,
-				       res, flags, handler, arg, &ih);
-		if (error != 0)
-			return 0;
-
-#ifdef NEW_BUS_PCI
-		/*
-		 * XXX this apic stuff looks totally busted.  It should
-		 * move to the nexus code which actually registers the
-		 * interrupt.
-		 */
-#endif
-
-#ifdef APIC_IO
-		nextpin = next_apic_irq(irq);
-		
-		if (nextpin < 0)
-			return 1;
-
-		/* 
-		 * Attempt handling of some broken mp tables.
-		 *
-		 * It's OK to yell (since the mp tables are broken).
-		 * 
-		 * Hanging in the boot is not OK
-		 */
-
-		muxcnt = 2;
-		nextpin = next_apic_irq(nextpin);
-		while (muxcnt < 5 && nextpin >= 0) {
-			muxcnt++;
-			nextpin = next_apic_irq(nextpin);
-		}
-		if (muxcnt >= 5) {
-			printf("bogus MP table, more than 4 IO APIC pins connected to the same PCI device or ISA/EISA interrupt\n");
-			return 0;
-		}
-		
-		printf("bogus MP table, %d IO APIC pins connected to the same PCI device or ISA/EISA interrupt\n", muxcnt);
-
-		nextpin = next_apic_irq(irq);
-		while (nextpin >= 0) {
-			rid = 0;
-			res = bus_alloc_resource(cfg->dev, SYS_RES_IRQ, &rid,
-						 nextpin, nextpin, 1,
-						 resflags);
-			if (!res) {
-				printf("pci_map_int: can't allocate extra interrupt\n");
-				return 0;
-			}
-			error = BUS_SETUP_INTR(device_get_parent(cfg->dev),
-					       cfg->dev, res, flags,
-					       handler, arg, &ih);
-			if (error != 0) {
-				printf("pci_map_int: BUS_SETUP_INTR failed\n");
-				return 0;
-			}
-			printf("Registered extra interrupt handler for int %d (in addition to int %d)\n", nextpin, irq);
-			nextpin = next_apic_irq(nextpin);
-		}
-#endif
-	}
-	return (1);
-}
-
-int
-pci_unmap_int(pcici_t cfg)
-{
-	return (0); /* not supported, yet, since cfg doesn't know about idesc */
-}
-
-pcici_t
-pci_get_parent_from_tag(pcici_t tag)
-{
-	return (pcici_t)pci_devlist_get_parent(tag);
-}
-
-int
-pci_get_bus_from_tag(pcici_t tag)
-{
-	return tag->bus;
-}
-
-/*
- * A simple driver to wrap the old pci driver mechanism for back-compat.
- */
-
-static int
-pci_compat_probe(device_t dev)
-{
-	struct pci_device *dvp;
-	struct pci_devinfo *dinfo;
-	pcicfgregs *cfg;
-	const char *name;
-	int error;
-	
-	dinfo = device_get_ivars(dev);
-	cfg = &dinfo->cfg;
-	dvp = device_get_driver(dev)->priv;
-
-	/*
-	 * Do the wrapped probe.
-	 */
-	error = ENXIO;
-	if (dvp && dvp->pd_probe) {
-		name = dvp->pd_probe(cfg, (cfg->device << 16) + cfg->vendor);
-		if (name) {
-			device_set_desc_copy(dev, name);
-			/* Allow newbus drivers to match "better" */
-			error = -200;
-		}
-	}
-
-	return error;
-}
-
-static int
-pci_compat_attach(device_t dev)
-{
-	struct pci_device *dvp;
-	struct pci_devinfo *dinfo;
-	pcicfgregs *cfg;
-	int unit;
-
-	dinfo = device_get_ivars(dev);
-	cfg = &dinfo->cfg;
-	dvp = device_get_driver(dev)->priv;
-
-	unit = device_get_unit(dev);
-	if (unit > *dvp->pd_count)
-		*dvp->pd_count = unit;
-	if (dvp->pd_attach)
-		dvp->pd_attach(cfg, unit);
-	device_printf(dev, "driver is using old-style compatability shims\n");
-	return 0;
-}
-
-static device_method_t pci_compat_methods[] = {
-	/* Device interface */
-	DEVMETHOD(device_probe,		pci_compat_probe),
-	DEVMETHOD(device_attach,	pci_compat_attach),
-
-	{ 0, 0 }
-};
-
-/*
- * Create a new style driver around each old pci driver.
- */
-int
-compat_pci_handler(module_t mod, int type, void *data)
-{
-	struct pci_device *dvp = (struct pci_device *)data;
-	driver_t *driver;
-	devclass_t pci_devclass = devclass_find("pci");
-
-	switch (type) {
-	case MOD_LOAD:
-		driver = malloc(sizeof(driver_t), M_DEVBUF, M_NOWAIT | M_ZERO);
-		if (!driver)
-			return ENOMEM;
-		driver->name = dvp->pd_name;
-		driver->methods = pci_compat_methods;
-		driver->size = sizeof(struct pci_devinfo *);
-		driver->priv = dvp;
-		devclass_add_driver(pci_devclass, driver);
-		break;
-	case MOD_UNLOAD:
-		printf("%s: module unload not supported!\n", dvp->pd_name);
-		return EOPNOTSUPP;
-	default:
-		break;
-	}
-	return 0;
-}