Newbusify the PCI PDQ (fddi) attachment. This isn't as clean as

the EISA attachment and has not been tested (no hardware!), but at least
it stands a chance at working.  At least it compiles now.

1 files changed, 73 insertions, 355 deletions

diff --git a/sys/dev/pdq/if_fpa.c b/sys/dev/pdq/if_fpa.c
index a5eea3c..9eb3f50 100644
--- a/sys/dev/pdq/if_fpa.c
+++ b/sys/dev/pdq/if_fpa.c
@@ -34,40 +34,23 @@
 #include <sys/param.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
-#if defined(__bsdi__) || defined(__NetBSD__)
-#include <sys/device.h>
-#endif
 
 #include <net/if.h>
 
-#if defined(__FreeBSD__)
-#include "fpa.h"
-#include <sys/eventhandler.h>
 #include <net/ethernet.h>
 #include <net/if_arp.h>
-#include <pci/pcivar.h>
 #include <dev/pdq/pdqvar.h>
 #include <dev/pdq/pdqreg.h>
-#elif defined(__bsdi__)
-#include <i386/isa/isavar.h>
-#include <i386/isa/icu.h>
-#ifndef DRQNONE
-#define	DRQNONE		0
-#endif
-#if _BSDI_VERSION < 199401
-#define IRQSHARE	0
-#endif
-#elif defined(__NetBSD__)
-#include <dev/pci/pcivar.h>
-#include <dev/ic/pdqvar.h>
-#include <dev/ic/pdqreg.h>
-#endif /* __NetBSD__ */
+#include <machine/bus.h>
+#include <machine/resource.h>
+#include <sys/bus.h>
+#include <sys/rman.h>
+#include <pci/pcivar.h>
+#include <pci/pcireg.h>
 
 
 #define	DEC_VENDORID		0x1011
 #define	DEFPA_CHIPID		0x000F
-#define	PCI_VENDORID(x)		((x) & 0xFFFF)
-#define	PCI_CHIPID(x)		(((x) >> 16) & 0xFFFF)
 
 #define	DEFPA_LATENCY	0x88
 
@@ -75,366 +58,101 @@
 #define	PCI_CBMA	0x10	/* Configuration Base Memory Address */
 #define	PCI_CBIO	0x14	/* Configuration Base I/O Address */
 
-#if defined(__FreeBSD__)
-#if NFPA < 4
-#undef NFPA
-#define NFPA	4
-#endif
-static pdq_softc_t *pdqs_pci[NFPA];
-#define	PDQ_PCI_UNIT_TO_SOFTC(unit)	(pdqs_pci[unit])
-#if BSD >= 199506
-#define	pdq_pci_ifwatchdog		NULL
-#endif
-
-#elif defined(__bsdi__)
-extern struct cfdriver fpacd;
-#define	PDQ_PCI_UNIT_TO_SOFTC(unit)	((pdq_softc_t *)fpacd.cd_devs[unit])
-
-#elif defined(__NetBSD__)
-extern struct cfattach fpa_ca;
-extern struct cfdriver fpa_cd;
-#define	PDQ_PCI_UNIT_TO_SOFTC(unit)	((pdq_softc_t *)fpa_cd.cd_devs[unit])
-#define	pdq_pci_ifwatchdog		NULL
-#endif
-
-#ifndef pdq_pci_ifwatchdog
-static ifnet_ret_t
-pdq_pci_ifwatchdog(
-    int unit)
-{
-    pdq_ifwatchdog(&PDQ_PCI_UNIT_TO_SOFTC(unit)->sc_if);
-}
-#endif
-
-#if defined(__FreeBSD__) && BSD >= 199506
 static void
-pdq_pci_ifintr(
-    void *arg)
-{
-    (void) pdq_interrupt(((pdq_softc_t *) arg)->sc_pdq);
-}
-#else
-static int
-pdq_pci_ifintr(
-    void *arg)
+pdq_pci_ifintr(void *arg)
 {
-    pdq_softc_t * const sc = (pdq_softc_t *) arg;
-#ifdef __FreeBSD__
-    return pdq_interrupt(sc->sc_pdq);
-#elif defined(__bsdi__) || defined(__NetBSD__)
+    pdq_softc_t *sc;
+
+    sc = device_get_softc(arg);
     (void) pdq_interrupt(sc->sc_pdq);
-    return 1;
-#endif
 }
-#endif /* __FreeBSD && BSD */
-
-#if defined(__FreeBSD__)
-static void pdq_pci_shutdown(void *, int);
 
 /*
- * This is the PCI configuration support.  Since the PDQ is available
- * on both EISA and PCI boards, one must be careful in how defines the
- * PDQ in the config file.
+ * This is the PCI configuration support.
  */
-static const char *
-pdq_pci_probe(
-    pcici_t config_id,
-    pcidi_t device_id)
-{
-    if (PCI_VENDORID(device_id) == DEC_VENDORID &&
-	    PCI_CHIPID(device_id) == DEFPA_CHIPID)
-	return "Digital DEFPA PCI FDDI Controller";
-    return NULL;
-}
-
-static void
-pdq_pci_attach(
-    pcici_t config_id,
-    int unit)
-{
-    pdq_softc_t *sc;
-    vm_offset_t va_csrs, pa_csrs;
-    pdq_uint32_t data;
-
-    if (unit == NFPA) {
-	printf("fpa%d: not configured; kernel is built for only %d device%s.\n",
-	       unit, NFPA, NFPA == 1 ? "" : "s");
-	return;
-    }
-
-    data = pci_conf_read(config_id, PCI_CFLT);
-    if ((data & 0xFF00) < (DEFPA_LATENCY << 8)) {
-	data &= ~0xFF00;
-	data |= DEFPA_LATENCY << 8;
-	pci_conf_write(config_id, PCI_CFLT, data);
-    }
-
-    sc = (pdq_softc_t *) malloc(sizeof(*sc), M_DEVBUF, M_NOWAIT | M_ZERO);
-    if (sc == NULL)
-	return;
-
-    if (!pci_map_mem(config_id, PCI_CBMA, &va_csrs, &pa_csrs)) {
-	free((void *) sc, M_DEVBUF);
-	return;
-    }
-
-    sc->sc_if.if_name = "fpa";
-    sc->sc_if.if_unit = unit;
-    sc->sc_membase = (pdq_bus_memaddr_t) va_csrs;
-    sc->sc_pdq = pdq_initialize(PDQ_BUS_PCI, sc->sc_membase,
-				sc->sc_if.if_name, sc->sc_if.if_unit,
-				(void *) sc, PDQ_DEFPA);
-    if (sc->sc_pdq == NULL) {
-	free((void *) sc, M_DEVBUF);
-	return;
-    }
-    bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, sc->sc_ac.ac_enaddr, 6);
-    pdqs_pci[unit] = sc;
-    pdq_ifattach(sc, pdq_pci_ifwatchdog);
-    pci_map_int(config_id, pdq_pci_ifintr, (void*) sc, &net_imask);
-    EVENTHANDLER_REGISTER(shutdown_post_sync, pdq_pci_shutdown, sc,
-			  SHUTDOWN_PRI_DEFAULT);
-
-}
-
-static void
-pdq_pci_shutdown(
-    void *sc,
-    int howto)
-{
-    pdq_hwreset(((pdq_softc_t *)sc)->sc_pdq);
-}
-
-static u_long pdq_pci_count;
-
-static struct pci_device fpadevice = {
-    "fpa",
-    pdq_pci_probe,
-    pdq_pci_attach,
-    &pdq_pci_count,
-    NULL
-};
-
-COMPAT_PCI_DRIVER (fpa, fpadevice);
-
-#elif defined(__bsdi__)
-
 static int
-pdq_pci_match(
-    pci_devaddr_t *pa)
+pdq_pci_probe(device_t dev)
 {
-    int irq;
-    int id;
-
-    id = pci_inl(pa, PCI_VENDOR_ID);
-    if (PCI_VENDORID(id) != DEC_VENDORID || PCI_CHIPID(id) != DEFPA_CHIPID)
+    if (pci_get_vendor(dev) == DEC_VENDORID &&
+	    pci_get_device(dev) == DEFPA_CHIPID) {
+	device_set_desc(dev, "Digital DEFPA PCI FDDI Controller");
 	return 0;
-
-    irq = pci_inl(pa, PCI_I_LINE) & 0xFF;
-    if (irq == 0 || irq >= 16)
-	return 0;
-
-    return 1;
+    }
+    return ENXIO;
 }
 
-int
-pdq_pci_probe(
-    struct device *parent,
-    struct cfdata *cf,
-    void *aux)
+static int
+pdq_pci_attach(device_t dev)
 {
-    struct isa_attach_args *ia = (struct isa_attach_args *) aux;
-    pdq_uint32_t irq, data;
-    pci_devaddr_t *pa;
-
-    pa = pci_scan(pdq_pci_match);
-    if (pa == NULL)
-	return 0;
-
-    irq = (1 << (pci_inl(pa, PCI_I_LINE) & 0xFF));
-
-    if (ia->ia_irq != IRQUNK && irq != ia->ia_irq) {
-	printf("fpa%d: error: desired IRQ of %d does not match device's actual IRQ of %d\n",
-	       cf->cf_unit,
-	       ffs(ia->ia_irq) - 1, ffs(irq) - 1);
-	return 0;
-    }
-    if (ia->ia_irq == IRQUNK) {
-	(void) isa_irqalloc(irq);
-	ia->ia_irq = irq;
-    }
-
-    /* PCI bus masters don't use host DMA channels */
-    ia->ia_drq = DRQNONE;
-
-    /* Get the memory base address; assume the BIOS set it up correctly */
-    ia->ia_maddr = (caddr_t) (pci_inl(pa, PCI_CBMA) & ~7);
-    pci_outl(pa, PCI_CBMA, 0xFFFFFFFF);
-    ia->ia_msize = ((~pci_inl(pa, PCI_CBMA)) | 7) + 1;
-    pci_outl(pa, PCI_CBMA, (int) ia->ia_maddr);
-
-    /* Disable I/O space access */
-    pci_outl(pa, PCI_COMMAND, pci_inl(pa, PCI_COMMAND) & ~1);
-    ia->ia_iobase = 0;
-    ia->ia_iosize = 0;
-
-    /* Make sure the latency timer is what the DEFPA likes */
-    data = pci_inl(pa, PCI_CFLT);
-    if ((data & 0xFF00) < (DEFPA_LATENCY << 8)) {
-	data &= ~0xFF00;
-	data |= DEFPA_LATENCY << 8;
-	pci_outl(pa, PCI_CFLT, data);
+    pdq_softc_t *sc;
+    int data;
+    struct resource *memres, *irqres;
+    int rid;
+    void *ih;
+
+    memres = NULL;
+    irqres = NULL;
+    sc = device_get_softc(dev);
+
+    data = pci_read_config(dev, PCIR_LATTIMER, 1);
+    if (data < DEFPA_LATENCY) {
+	data = DEFPA_LATENCY;
+	pci_write_config(dev, PCIR_LATTIMER, data, 1);
     }
-    ia->ia_irq |= IRQSHARE;
-
-    return 1;
-}
 
-void
-pdq_pci_attach(
-    struct device *parent,
-    struct device *self,
-    void *aux)
-{
-    pdq_softc_t *sc = (pdq_softc_t *) self;
-    register struct isa_attach_args *ia = (struct isa_attach_args *) aux;
-    register struct ifnet *ifp = &sc->sc_if;
-    int i;
+    rid = PCI_CBMA;
+    memres = bus_alloc_resource(dev, SYS_RES_MEMORY, &rid, 0, ~0, 1, RF_ACTIVE);
+    if (!memres)
+	goto bad;
 
-    sc->sc_if.if_unit = sc->sc_dev.dv_unit;
     sc->sc_if.if_name = "fpa";
-    sc->sc_if.if_flags = 0;
-    sc->sc_membase = (pdq_bus_memaddr_t) mapphys((vm_offset_t)ia->ia_maddr, ia->ia_msize);
-
+    sc->sc_if.if_unit = device_get_unit(dev);
+    sc->sc_membase = (pdq_bus_memaddr_t) rman_get_virtual(memres);
     sc->sc_pdq = pdq_initialize(PDQ_BUS_PCI, sc->sc_membase,
 				sc->sc_if.if_name, sc->sc_if.if_unit,
 				(void *) sc, PDQ_DEFPA);
-    if (sc->sc_pdq == NULL) {
-	printf("fpa%d: initialization failed\n", sc->sc_if.if_unit);
-	return;
-    }
-
+    if (sc->sc_pdq == NULL)
+	goto bad;
     bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, sc->sc_ac.ac_enaddr, 6);
-
-    pdq_ifattach(sc, pdq_pci_ifwatchdog);
-
-    isa_establish(&sc->sc_id, &sc->sc_dev);
-
-    sc->sc_ih.ih_fun = pdq_pci_ifintr;
-    sc->sc_ih.ih_arg = (void *)sc;
-    intr_establish(ia->ia_irq, &sc->sc_ih, DV_NET);
-
-    sc->sc_ats.func = (void (*)(void *)) pdq_hwreset;
-    sc->sc_ats.arg = (void *) sc->sc_pdq;
-    atshutdown(&sc->sc_ats, ATSH_ADD);
-}
-
-struct cfdriver fpacd = {
-    0, "fpa", pdq_pci_probe, pdq_pci_attach,
-#if _BSDI_VERSION >= 199401
-    DV_IFNET,
-#endif
-    sizeof(pdq_softc_t)
-};
-
-#elif defined(__NetBSD__)
-
-static int
-pdq_pci_match(
-    struct device *parent,
-    void *match,
-    void *aux)
-{
-    struct pci_attach_args *pa = (struct pci_attach_args *) aux;
-
-    if (PCI_VENDORID(pa->pa_id) != DEC_VENDORID)
-	return 0;
-    if (PCI_CHIPID(pa->pa_id) == DEFPA_CHIPID)
-	return 1;
-
+    pdq_ifattach(sc, NULL);
+    rid = 0;
+    irqres = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1,
+				       RF_SHAREABLE | RF_ACTIVE);
+    if (!irqres)
+	goto bad;
+    if (bus_setup_intr(dev, irqres, INTR_TYPE_NET, pdq_pci_ifintr,
+		       (void *)dev, &ih))
+	goto bad;
     return 0;
+
+bad:
+    if (memres)
+	bus_release_resource(dev, SYS_RES_MEMORY, PCI_CBMA, memres);
+    if (irqres)
+	bus_release_resource(dev, SYS_RES_IRQ, 0, irqres);
+    return ENXIO;
 }
 
 static void
-pdq_pci_attach(
-    struct device * const parent,
-    struct device * const self,
-    void * const aux)
+pdq_pci_shutdown(device_t dev)
 {
-    pdq_softc_t * const sc = (pdq_softc_t *) self;
-    struct pci_attach_args * const pa = (struct pci_attach_args *) aux;
-    pdq_uint32_t data;
-    pci_intr_handle_t intrhandle;
-    const char *intrstr;
-#ifdef PDQ_IOMAPPED
-    bus_io_addr_t iobase;
-    bus_io_size_t iosize;
-#else
-    bus_mem_addr_t membase;
-    bus_mem_size_t memsize;
-#endif
-
-    data = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_CFLT);
-    if ((data & 0xFF00) < (DEFPA_LATENCY << 8)) {
-	data &= ~0xFF00;
-	data |= DEFPA_LATENCY << 8;
-	pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_CFLT, data);
-    }
-
-    sc->sc_bc = pa->pa_bc;
-    bcopy(sc->sc_dev.dv_xname, sc->sc_if.if_xname, IFNAMSIZ);
-    sc->sc_if.if_flags = 0;
-    sc->sc_if.if_softc = sc;
-
-#ifdef PDQ_IOMAPPED
-    if (pci_io_find(pa->pa_pc, pa->pa_tag, PCI_CBIO, &iobase, &iosize)
-	    || bus_io_map(pa->pa_bc, iobase, iosize, &sc->sc_iobase))
-	return;
-#else
-    if (pci_mem_find(pa->pa_pc, pa->pa_tag, PCI_CBMA, &membase, &memsize, NULL)
-	    || bus_mem_map(pa->pa_bc, membase, memsize, 0, &sc->sc_membase))
-	return;
-#endif
-
-    sc->sc_pdq = pdq_initialize(sc->sc_bc, sc->sc_membase,
-				sc->sc_if.if_xname, 0,
-				(void *) sc, PDQ_DEFPA);
-    if (sc->sc_pdq == NULL) {
-	printf("%s: initialization failed\n", sc->sc_dev.dv_xname);
-	return;
-    }
-
-    bcopy((caddr_t) sc->sc_pdq->pdq_hwaddr.lanaddr_bytes, sc->sc_ac.ac_enaddr, 6);
-    pdq_ifattach(sc, pdq_pci_ifwatchdog);
-
-    if (pci_intr_map(pa->pa_pc, pa->pa_intrtag, pa->pa_intrpin,
-		     pa->pa_intrline, &intrhandle)) {
-	printf("%s: couldn't map interrupt\n", self->dv_xname);
-	return;
-    }
-    intrstr = pci_intr_string(pa->pa_pc, intrhandle);
-    sc->sc_ih = pci_intr_establish(pa->pa_pc, intrhandle, IPL_NET, pdq_pci_ifintr, sc);
-    if (sc->sc_ih == NULL) {
-	printf("%s: couldn't establish interrupt", self->dv_xname);
-	if (intrstr != NULL)
-	    printf(" at %s", intrstr);
-	printf("\n");
-	return;
-    }
+    pdq_softc_t *sc;
 
-    sc->sc_ats = shutdownhook_establish((void (*)(void *)) pdq_hwreset, sc->sc_pdq);
-    if (sc->sc_ats == NULL)
-	printf("%s: warning: couldn't establish shutdown hook\n", self->dv_xname);
-    if (intrstr != NULL)
-	printf("%s: interrupting at %s\n", self->dv_xname, intrstr);
+    sc = device_get_softc(dev);
+    pdq_hwreset(sc->sc_pdq);
 }
 
-struct cfattach fpa_ca = {
-    sizeof(pdq_softc_t), pdq_pci_match, pdq_pci_attach
+static device_method_t pdq_pci_methods[] = {
+    /* Device interface */
+    DEVMETHOD(device_probe,	pdq_pci_probe),
+    DEVMETHOD(device_attach,	pdq_pci_attach),
+    DEVMETHOD(device_shutdown,	pdq_pci_shutdown),
+    { 0, 0 }
 };
-
-struct cfdriver fpa_cd = {
-    0, "fpa", DV_IFNET
+static driver_t pdq_pci_driver = {
+    "fpa",
+    pdq_pci_methods,
+    sizeof(pdq_softc_t),
 };
-
-#endif /* __NetBSD__ */
+static devclass_t pdq_devclass;
+DRIVER_MODULE(if_fpa, pci, pdq_pci_driver, pdq_devclass, 0, 0);