Author: nwhitehorn
Date: Sat May 5 16:41:17 2012
New Revision: 235060
URL: http://svn.freebsd.org/changeset/base/235060
Log:
MFC r230993,230994,230995,230999,231003,231026,231046,231149,231908:
Reduce code duplication in Open Firmware based PCI bus drivers, implement
infrastructure for NEW_PCIB, and switch to using NEW_PCIB by default.
Added:
stable/9/sys/powerpc/ofw/ofw_pci.c
- copied, changed from r230993, head/sys/powerpc/ofw/ofw_pci.c
stable/9/sys/powerpc/ofw/ofw_pci.h
- copied unchanged from r230993, head/sys/powerpc/ofw/ofw_pci.h
Modified:
stable/9/sys/conf/files.powerpc
stable/9/sys/powerpc/conf/DEFAULTS
stable/9/sys/powerpc/powermac/cpcht.c
stable/9/sys/powerpc/powermac/grackle.c
stable/9/sys/powerpc/powermac/gracklevar.h
stable/9/sys/powerpc/powermac/uninorthpci.c
stable/9/sys/powerpc/powermac/uninorthvar.h
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/conf/ (props changed)
Modified: stable/9/sys/conf/files.powerpc
==============================================================================
--- stable/9/sys/conf/files.powerpc Sat May 5 16:37:14 2012
(r235059)
+++ stable/9/sys/conf/files.powerpc Sat May 5 16:41:17 2012
(r235060)
@@ -133,6 +133,7 @@ powerpc/mpc85xx/openpic_fdt.c optional f
powerpc/mpc85xx/pci_fdt.c optional pci mpc85xx
powerpc/ofw/ofw_cpu.c optional aim
powerpc/ofw/ofw_machdep.c optional aim
+powerpc/ofw/ofw_pci.c optional pci aim
powerpc/ofw/ofw_pcibus.c optional pci aim
powerpc/ofw/ofw_pcib_pci.c optional pci aim
powerpc/ofw/ofw_real.c optional aim
Modified: stable/9/sys/powerpc/conf/DEFAULTS
==============================================================================
--- stable/9/sys/powerpc/conf/DEFAULTS Sat May 5 16:37:14 2012
(r235059)
+++ stable/9/sys/powerpc/conf/DEFAULTS Sat May 5 16:41:17 2012
(r235060)
@@ -12,3 +12,6 @@ device uart_z8530
options GEOM_PART_APM
options GEOM_PART_MBR
+
+options NEW_PCIB
+
Copied and modified: stable/9/sys/powerpc/ofw/ofw_pci.c (from r230993,
head/sys/powerpc/ofw/ofw_pci.c)
==============================================================================
--- head/sys/powerpc/ofw/ofw_pci.c Sat Feb 4 19:54:13 2012
(r230993, copy source)
+++ stable/9/sys/powerpc/ofw/ofw_pci.c Sat May 5 16:41:17 2012
(r235060)
@@ -71,6 +71,9 @@ static int ofw_pci_activate_resource(de
static int ofw_pci_deactivate_resource(device_t bus,
device_t child, int type, int rid,
struct resource *res);
+static int ofw_pci_adjust_resource(device_t bus, device_t child,
+ int type, struct resource *res, u_long start,
+ u_long end);
/*
* pcib interface.
@@ -106,6 +109,7 @@ static device_method_t ofw_pci_methods[]
DEVMETHOD(bus_release_resource, ofw_pci_release_resource),
DEVMETHOD(bus_activate_resource, ofw_pci_activate_resource),
DEVMETHOD(bus_deactivate_resource, ofw_pci_deactivate_resource),
+ DEVMETHOD(bus_adjust_resource, ofw_pci_adjust_resource),
/* pcib interface */
DEVMETHOD(pcib_maxslots, ofw_pci_maxslots),
@@ -421,6 +425,36 @@ ofw_pci_deactivate_resource(device_t bus
return (rman_deactivate_resource(res));
}
+static int
+ofw_pci_adjust_resource(device_t bus, device_t child, int type,
+ struct resource *res, u_long start, u_long end)
+{
+ struct rman *rm = NULL;
+ struct ofw_pci_softc *sc = device_get_softc(bus);
+
+ KASSERT(!(rman_get_flags(res) & RF_ACTIVE),
+ ("active resources cannot be adjusted"));
+ if (rman_get_flags(res) & RF_ACTIVE)
+ return (EINVAL);
+
+ switch (type) {
+ case SYS_RES_MEMORY:
+ rm = &sc->sc_mem_rman;
+ break;
+ case SYS_RES_IOPORT:
+ rm = &sc->sc_io_rman;
+ break;
+ default:
+ return (ENXIO);
+ }
+
+ if (!rman_is_region_manager(res, rm))
+ return (EINVAL);
+
+ return (rman_adjust_resource(res, start, end));
+}
+
+
static phandle_t
ofw_pci_get_node(device_t bus, device_t dev)
{
Copied: stable/9/sys/powerpc/ofw/ofw_pci.h (from r230993,
head/sys/powerpc/ofw/ofw_pci.h)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/sys/powerpc/ofw/ofw_pci.h Sat May 5 16:41:17 2012
(r235060, copy of r230993, head/sys/powerpc/ofw/ofw_pci.h)
@@ -0,0 +1,74 @@
+/*-
+ * Copyright (c) 2011 Nathan Whitehorn
+ * 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.
+ *
+ * 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$
+ */
+
+#ifndef POWERPC_OFW_OFW_PCI_H
+#define POWERPC_OFW_OFW_PCI_H
+
+/*
+ * Export class definition for inheritance purposes
+ */
+DECLARE_CLASS(ofw_pci_driver);
+
+struct ofw_pci_range {
+ uint32_t pci_hi;
+ uint64_t pci;
+ uint64_t host;
+ uint64_t size;
+};
+
+/*
+ * Quirks for some adapters
+ */
+enum {
+ OFW_PCI_QUIRK_RANGES_ON_CHILDREN = 1,
+};
+
+struct ofw_pci_softc {
+ device_t sc_dev;
+ phandle_t sc_node;
+ int sc_bus;
+
+ int sc_quirks;
+
+ struct ofw_pci_register sc_pcir;
+
+ struct ofw_pci_range *sc_range;
+ int sc_nrange;
+
+ struct rman sc_io_rman;
+ struct rman sc_mem_rman;
+ bus_space_tag_t sc_memt;
+ bus_dma_tag_t sc_dmat;
+
+ struct ofw_bus_iinfo sc_pci_iinfo;
+};
+
+int ofw_pci_attach(device_t dev);
+
+#endif // POWERPC_OFW_OFW_PCI_H
+
Modified: stable/9/sys/powerpc/powermac/cpcht.c
==============================================================================
--- stable/9/sys/powerpc/powermac/cpcht.c Sat May 5 16:37:14 2012
(r235059)
+++ stable/9/sys/powerpc/powermac/cpcht.c Sat May 5 16:41:17 2012
(r235060)
@@ -50,6 +50,7 @@ __FBSDID("$FreeBSD$");
#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/ofw_bus_subr.h>
+#include <powerpc/ofw/ofw_pci.h>
#include <vm/vm.h>
#include <vm/pmap.h>
@@ -66,30 +67,13 @@ static int cpcht_attach(device_t);
static void cpcht_configure_htbridge(device_t, phandle_t);
/*
- * Bus interface.
- */
-static int cpcht_read_ivar(device_t, device_t, int,
- uintptr_t *);
-static struct resource *cpcht_alloc_resource(device_t bus, device_t child,
- int type, int *rid, u_long start, u_long end,
- u_long count, u_int flags);
-static int cpcht_activate_resource(device_t bus, device_t child,
- int type, int rid, struct resource *res);
-static int cpcht_release_resource(device_t bus, device_t child,
- int type, int rid, struct resource *res);
-static int cpcht_deactivate_resource(device_t bus, device_t child,
- int type, int rid, struct resource *res);
-
-/*
* pcib interface.
*/
-static int cpcht_maxslots(device_t);
static u_int32_t cpcht_read_config(device_t, u_int, u_int, u_int,
u_int, int);
static void cpcht_write_config(device_t, u_int, u_int, u_int,
u_int, u_int32_t, int);
-static int cpcht_route_interrupt(device_t bus, device_t dev,
- int pin);
+static int cpcht_route_interrupt(device_t, device_t, int);
static int cpcht_alloc_msi(device_t dev, device_t child,
int count, int maxcount, int *irqs);
static int cpcht_release_msi(device_t dev, device_t child,
@@ -102,12 +86,6 @@ static int cpcht_map_msi(device_t dev,
int irq, uint64_t *addr, uint32_t *data);
/*
- * ofw_bus interface
- */
-
-static phandle_t cpcht_get_node(device_t bus, device_t child);
-
-/*
* Driver methods.
*/
static device_method_t cpcht_methods[] = {
@@ -115,17 +93,7 @@ static device_method_t cpcht_methods[] =
DEVMETHOD(device_probe, cpcht_probe),
DEVMETHOD(device_attach, cpcht_attach),
- /* Bus interface */
- DEVMETHOD(bus_read_ivar, cpcht_read_ivar),
- DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
- DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
- DEVMETHOD(bus_alloc_resource, cpcht_alloc_resource),
- DEVMETHOD(bus_release_resource, cpcht_release_resource),
- DEVMETHOD(bus_activate_resource, cpcht_activate_resource),
- DEVMETHOD(bus_deactivate_resource, cpcht_deactivate_resource),
-
/* pcib interface */
- DEVMETHOD(pcib_maxslots, cpcht_maxslots),
DEVMETHOD(pcib_read_config, cpcht_read_config),
DEVMETHOD(pcib_write_config, cpcht_write_config),
DEVMETHOD(pcib_route_interrupt, cpcht_route_interrupt),
@@ -135,9 +103,6 @@ static device_method_t cpcht_methods[] =
DEVMETHOD(pcib_release_msix, cpcht_release_msix),
DEVMETHOD(pcib_map_msi, cpcht_map_msi),
- /* ofw_bus interface */
- DEVMETHOD(ofw_bus_get_node, cpcht_get_node),
-
DEVMETHOD_END
};
@@ -158,25 +123,17 @@ static struct cpcht_irq *cpcht_irqmap =
uint32_t cpcht_msipic = 0;
struct cpcht_softc {
- device_t sc_dev;
- phandle_t sc_node;
+ struct ofw_pci_softc pci_sc;
vm_offset_t sc_data;
uint64_t sc_populated_slots;
- struct rman sc_mem_rman;
- struct rman sc_io_rman;
struct cpcht_irq htirq_map[128];
struct mtx htirq_mtx;
};
-static driver_t cpcht_driver = {
- "pcib",
- cpcht_methods,
- sizeof(struct cpcht_softc)
-};
-
static devclass_t cpcht_devclass;
-
+DEFINE_CLASS_1(pcib, cpcht_driver, cpcht_methods, sizeof(struct cpcht_softc),
+ ofw_pci_driver);
DRIVER_MODULE(cpcht, nexus, cpcht_driver, cpcht_devclass, 0, 0);
#define CPCHT_IOPORT_BASE 0xf4000000UL /* Hardwired */
@@ -186,17 +143,6 @@ DRIVER_MODULE(cpcht, nexus, cpcht_driver
#define HTAPIC_TRIGGER_LEVEL 0x02
#define HTAPIC_MASK 0x01
-struct cpcht_range {
- u_int32_t pci_hi;
- u_int32_t pci_mid;
- u_int32_t pci_lo;
- u_int32_t junk;
- u_int32_t host_hi;
- u_int32_t host_lo;
- u_int32_t size_hi;
- u_int32_t size_lo;
-};
-
static int
cpcht_probe(device_t dev)
{
@@ -214,7 +160,6 @@ cpcht_probe(device_t dev)
if (strcmp(compatible, "u3-ht") != 0)
return (ENXIO);
-
device_set_desc(dev, "IBM CPC9X5 HyperTransport Tunnel");
return (0);
}
@@ -225,7 +170,7 @@ cpcht_attach(device_t dev)
struct cpcht_softc *sc;
phandle_t node, child;
u_int32_t reg[3];
- int i, error;
+ int i;
node = ofw_bus_get_node(dev);
sc = device_get_softc(dev);
@@ -233,35 +178,21 @@ cpcht_attach(device_t dev)
if (OF_getprop(node, "reg", reg, sizeof(reg)) < 12)
return (ENXIO);
- sc->sc_dev = dev;
- sc->sc_node = node;
+ if (OF_getproplen(node, "ranges") <= 0)
+ sc->pci_sc.sc_quirks = OFW_PCI_QUIRK_RANGES_ON_CHILDREN;
sc->sc_populated_slots = 0;
sc->sc_data = (vm_offset_t)pmap_mapdev(reg[1], reg[2]);
- sc->sc_mem_rman.rm_type = RMAN_ARRAY;
- sc->sc_mem_rman.rm_descr = "CPCHT Device Memory";
- error = rman_init(&sc->sc_mem_rman);
- if (error) {
- device_printf(dev, "rman_init() failed. error = %d\n", error);
- return (error);
- }
-
- sc->sc_io_rman.rm_type = RMAN_ARRAY;
- sc->sc_io_rman.rm_descr = "CPCHT I/O Memory";
- error = rman_init(&sc->sc_io_rman);
- if (error) {
- device_printf(dev, "rman_init() failed. error = %d\n", error);
- return (error);
- }
-
/*
* Set up the resource manager and the HT->MPIC mapping. For cpcht,
* the ranges are properties of the child bridges, and this is also
* where we get the HT interrupts properties.
*/
+#if 0
/* I/O port mappings are usually not in the device tree */
- rman_manage_region(&sc->sc_io_rman, 0, CPCHT_IOPORT_SIZE - 1);
+ rman_manage_region(&sc->pci_sc.sc_io_rman, 0, CPCHT_IOPORT_SIZE - 1);
+#endif
bzero(sc->htirq_map, sizeof(sc->htirq_map));
mtx_init(&sc->htirq_mtx, "cpcht irq", NULL, MTX_DEF);
@@ -273,9 +204,7 @@ cpcht_attach(device_t dev)
/* Now make the mapping table available to the MPIC */
cpcht_irqmap = sc->htirq_map;
- device_add_child(dev, "pci", device_get_unit(dev));
-
- return (bus_generic_attach(dev));
+ return (ofw_pci_attach(dev));
}
static void
@@ -283,16 +212,16 @@ cpcht_configure_htbridge(device_t dev, p
{
struct cpcht_softc *sc;
struct ofw_pci_register pcir;
- struct cpcht_range ranges[7], *rp;
- int nranges, ptr, nextptr;
+ int ptr, nextptr;
uint32_t vend, val;
int i, nirq, irq;
- u_int f, s;
+ u_int b, f, s;
sc = device_get_softc(dev);
if (OF_getprop(child, "reg", &pcir, sizeof(pcir)) == -1)
return;
+ b = OFW_PCI_PHYS_HI_BUS(pcir.phys_hi);
s = OFW_PCI_PHYS_HI_DEVICE(pcir.phys_hi);
f = OFW_PCI_PHYS_HI_FUNCTION(pcir.phys_hi);
@@ -303,32 +232,6 @@ cpcht_configure_htbridge(device_t dev, p
sc->sc_populated_slots |= (1 << s);
/*
- * Next grab this child bus's bus ranges.
- */
- bzero(ranges, sizeof(ranges));
- nranges = OF_getprop(child, "ranges", ranges, sizeof(ranges));
- nranges /= sizeof(ranges[0]);
-
- ranges[6].pci_hi = 0;
- for (rp = ranges; rp < ranges + nranges && rp->pci_hi != 0; rp++) {
- switch (rp->pci_hi & OFW_PCI_PHYS_HI_SPACEMASK) {
- case OFW_PCI_PHYS_HI_SPACE_CONFIG:
- break;
- case OFW_PCI_PHYS_HI_SPACE_IO:
- rman_manage_region(&sc->sc_io_rman, rp->pci_lo,
- rp->pci_lo + rp->size_lo - 1);
- break;
- case OFW_PCI_PHYS_HI_SPACE_MEM32:
- rman_manage_region(&sc->sc_mem_rman, rp->pci_lo,
- rp->pci_lo + rp->size_lo - 1);
- break;
- case OFW_PCI_PHYS_HI_SPACE_MEM64:
- panic("64-bit CPCHT reserved memory!");
- break;
- }
- }
-
- /*
* Next build up any HT->MPIC mappings for this sub-bus. One would
* naively hope that enabling, disabling, and EOIing interrupts would
* cause the appropriate HT bus transactions to that effect. This is
@@ -341,41 +244,41 @@ cpcht_configure_htbridge(device_t dev, p
*/
/* All the devices we are interested in have caps */
- if (!(PCIB_READ_CONFIG(dev, 0, s, f, PCIR_STATUS, 2)
+ if (!(PCIB_READ_CONFIG(dev, b, s, f, PCIR_STATUS, 2)
& PCIM_STATUS_CAPPRESENT))
return;
- nextptr = PCIB_READ_CONFIG(dev, 0, s, f, PCIR_CAP_PTR, 1);
+ nextptr = PCIB_READ_CONFIG(dev, b, s, f, PCIR_CAP_PTR, 1);
while (nextptr != 0) {
ptr = nextptr;
- nextptr = PCIB_READ_CONFIG(dev, 0, s, f,
+ nextptr = PCIB_READ_CONFIG(dev, b, s, f,
ptr + PCICAP_NEXTPTR, 1);
/* Find the HT IRQ capabilities */
- if (PCIB_READ_CONFIG(dev, 0, s, f,
+ if (PCIB_READ_CONFIG(dev, b, s, f,
ptr + PCICAP_ID, 1) != PCIY_HT)
continue;
- val = PCIB_READ_CONFIG(dev, 0, s, f, ptr + PCIR_HT_COMMAND, 2);
+ val = PCIB_READ_CONFIG(dev, b, s, f, ptr + PCIR_HT_COMMAND, 2);
if ((val & PCIM_HTCMD_CAP_MASK) != PCIM_HTCAP_INTERRUPT)
continue;
/* Ask for the IRQ count */
- PCIB_WRITE_CONFIG(dev, 0, s, f, ptr + PCIR_HT_COMMAND, 0x1, 1);
- nirq = PCIB_READ_CONFIG(dev, 0, s, f, ptr + 4, 4);
+ PCIB_WRITE_CONFIG(dev, b, s, f, ptr + PCIR_HT_COMMAND, 0x1, 1);
+ nirq = PCIB_READ_CONFIG(dev, b, s, f, ptr + 4, 4);
nirq = ((nirq >> 16) & 0xff) + 1;
device_printf(dev, "%d HT IRQs on device %d.%d\n", nirq, s, f);
for (i = 0; i < nirq; i++) {
- PCIB_WRITE_CONFIG(dev, 0, s, f,
+ PCIB_WRITE_CONFIG(dev, b, s, f,
ptr + PCIR_HT_COMMAND, 0x10 + (i << 1), 1);
- irq = PCIB_READ_CONFIG(dev, 0, s, f, ptr + 4, 4);
+ irq = PCIB_READ_CONFIG(dev, b, s, f, ptr + 4, 4);
/*
* Mask this interrupt for now.
*/
- PCIB_WRITE_CONFIG(dev, 0, s, f, ptr + 4,
+ PCIB_WRITE_CONFIG(dev, b, s, f, ptr + 4,
irq | HTAPIC_MASK, 4);
irq = (irq >> 16) & 0xff;
@@ -384,10 +287,10 @@ cpcht_configure_htbridge(device_t dev, p
sc->htirq_map[irq].ht_base = sc->sc_data +
(((((s & 0x1f) << 3) | (f & 0x07)) << 8) | (ptr));
- PCIB_WRITE_CONFIG(dev, 0, s, f,
+ PCIB_WRITE_CONFIG(dev, b, s, f,
ptr + PCIR_HT_COMMAND, 0x11 + (i << 1), 1);
sc->htirq_map[irq].eoi_data =
- PCIB_READ_CONFIG(dev, 0, s, f, ptr + 4, 4) |
+ PCIB_READ_CONFIG(dev, b, s, f, ptr + 4, 4) |
0x80000000;
/*
@@ -395,7 +298,7 @@ cpcht_configure_htbridge(device_t dev, p
* in how we signal EOIs. Check if this device was
* made by Apple, and act accordingly.
*/
- vend = PCIB_READ_CONFIG(dev, 0, s, f,
+ vend = PCIB_READ_CONFIG(dev, b, s, f,
PCIR_DEVVENDOR, 4);
if ((vend & 0xffff) == 0x106b)
sc->htirq_map[irq].apple_eoi =
@@ -404,13 +307,6 @@ cpcht_configure_htbridge(device_t dev, p
}
}
-static int
-cpcht_maxslots(device_t dev)
-{
-
- return (PCI_SLOTMAX);
-}
-
static u_int32_t
cpcht_read_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg,
int width)
@@ -474,156 +370,11 @@ cpcht_write_config(device_t dev, u_int b
}
static int
-cpcht_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
-{
- switch (which) {
- case PCIB_IVAR_DOMAIN:
- *result = device_get_unit(dev);
- return (0);
- case PCIB_IVAR_BUS:
- *result = 0; /* Root bus */
- return (0);
- }
-
- return (ENOENT);
-}
-
-static phandle_t
-cpcht_get_node(device_t bus, device_t dev)
-{
- struct cpcht_softc *sc;
-
- sc = device_get_softc(bus);
- /* We only have one child, the PCI bus, which needs our own node. */
- return (sc->sc_node);
-}
-
-static int
cpcht_route_interrupt(device_t bus, device_t dev, int pin)
{
return (pin);
}
-static struct resource *
-cpcht_alloc_resource(device_t bus, device_t child, int type, int *rid,
- u_long start, u_long end, u_long count, u_int flags)
-{
- struct cpcht_softc *sc;
- struct resource *rv;
- struct rman *rm;
- int needactivate;
-
- needactivate = flags & RF_ACTIVE;
- flags &= ~RF_ACTIVE;
-
- sc = device_get_softc(bus);
-
- switch (type) {
- case SYS_RES_IOPORT:
- end = min(end, start + count);
- rm = &sc->sc_io_rman;
- break;
-
- case SYS_RES_MEMORY:
- rm = &sc->sc_mem_rman;
- break;
-
- case SYS_RES_IRQ:
- return (bus_alloc_resource(bus, type, rid, start, end, count,
- flags));
-
- default:
- device_printf(bus, "unknown resource request from %s\n",
- device_get_nameunit(child));
- return (NULL);
- }
-
- rv = rman_reserve_resource(rm, start, end, count, flags, child);
- if (rv == NULL) {
- device_printf(bus, "failed to reserve resource for %s\n",
- device_get_nameunit(child));
- return (NULL);
- }
-
- rman_set_rid(rv, *rid);
-
- if (needactivate) {
- if (bus_activate_resource(child, type, *rid, rv) != 0) {
- device_printf(bus,
- "failed to activate resource for %s\n",
- device_get_nameunit(child));
- rman_release_resource(rv);
- return (NULL);
- }
- }
-
- return (rv);
-}
-
-static int
-cpcht_activate_resource(device_t bus, device_t child, int type, int rid,
- struct resource *res)
-{
- void *p;
-
- if (type == SYS_RES_IRQ)
- return (bus_activate_resource(bus, type, rid, res));
-
- if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) {
- vm_offset_t start;
-
- start = (vm_offset_t)rman_get_start(res);
-
- if (type == SYS_RES_IOPORT)
- start += CPCHT_IOPORT_BASE;
-
- if (bootverbose)
- printf("cpcht mapdev: start %zx, len %ld\n", start,
- rman_get_size(res));
-
- p = pmap_mapdev(start, (vm_size_t)rman_get_size(res));
- if (p == NULL)
- return (ENOMEM);
- rman_set_virtual(res, p);
- rman_set_bustag(res, &bs_le_tag);
- rman_set_bushandle(res, (u_long)p);
- }
-
- return (rman_activate_resource(res));
-}
-
-static int
-cpcht_release_resource(device_t bus, device_t child, int type, int rid,
- struct resource *res)
-{
-
- if (rman_get_flags(res) & RF_ACTIVE) {
- int error = bus_deactivate_resource(child, type, rid, res);
- if (error)
- return error;
- }
-
- return (rman_release_resource(res));
-}
-
-static int
-cpcht_deactivate_resource(device_t bus, device_t child, int type, int rid,
- struct resource *res)
-{
-
- /*
- * If this is a memory resource, unmap it.
- */
- if ((type == SYS_RES_MEMORY) || (type == SYS_RES_IOPORT)) {
- u_int32_t psize;
-
- psize = rman_get_size(res);
- pmap_unmapdev((vm_offset_t)rman_get_virtual(res), psize);
- }
-
- return (rman_deactivate_resource(res));
-}
-
static int
cpcht_alloc_msi(device_t dev, device_t child, int count, int maxcount,
int *irqs)
Modified: stable/9/sys/powerpc/powermac/grackle.c
==============================================================================
--- stable/9/sys/powerpc/powermac/grackle.c Sat May 5 16:37:14 2012
(r235059)
+++ stable/9/sys/powerpc/powermac/grackle.c Sat May 5 16:41:17 2012
(r235060)
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
#include <sys/rman.h>
+#include <powerpc/ofw/ofw_pci.h>
#include <powerpc/powermac/gracklevar.h>
#include <vm/vm.h>
@@ -67,36 +68,12 @@ static int grackle_probe(device_t);
static int grackle_attach(device_t);
/*
- * Bus interface.
- */
-static int grackle_read_ivar(device_t, device_t, int,
- uintptr_t *);
-static struct resource * grackle_alloc_resource(device_t bus,
- device_t child, int type, int *rid, u_long start,
- u_long end, u_long count, u_int flags);
-static int grackle_release_resource(device_t bus, device_t child,
- int type, int rid, struct resource *res);
-static int grackle_activate_resource(device_t bus, device_t child,
- int type, int rid, struct resource *res);
-static int grackle_deactivate_resource(device_t bus,
- device_t child, int type, int rid,
- struct resource *res);
-
-
-/*
* pcib interface.
*/
-static int grackle_maxslots(device_t);
static u_int32_t grackle_read_config(device_t, u_int, u_int, u_int,
u_int, int);
static void grackle_write_config(device_t, u_int, u_int, u_int,
u_int, u_int32_t, int);
-static int grackle_route_interrupt(device_t, device_t, int);
-
-/*
- * ofw_bus interface
- */
-static phandle_t grackle_get_node(device_t bus, device_t dev);
/*
* Local routines.
@@ -113,35 +90,16 @@ static device_method_t grackle_methods[]
DEVMETHOD(device_probe, grackle_probe),
DEVMETHOD(device_attach, grackle_attach),
- /* Bus interface */
- DEVMETHOD(bus_read_ivar, grackle_read_ivar),
- DEVMETHOD(bus_setup_intr, bus_generic_setup_intr),
- DEVMETHOD(bus_teardown_intr, bus_generic_teardown_intr),
- DEVMETHOD(bus_alloc_resource, grackle_alloc_resource),
- DEVMETHOD(bus_release_resource, grackle_release_resource),
- DEVMETHOD(bus_activate_resource, grackle_activate_resource),
- DEVMETHOD(bus_deactivate_resource, grackle_deactivate_resource),
-
/* pcib interface */
- DEVMETHOD(pcib_maxslots, grackle_maxslots),
DEVMETHOD(pcib_read_config, grackle_read_config),
DEVMETHOD(pcib_write_config, grackle_write_config),
- DEVMETHOD(pcib_route_interrupt, grackle_route_interrupt),
-
- /* ofw_bus interface */
- DEVMETHOD(ofw_bus_get_node, grackle_get_node),
DEVMETHOD_END
};
-static driver_t grackle_driver = {
- "pcib",
- grackle_methods,
- sizeof(struct grackle_softc)
-};
-
static devclass_t grackle_devclass;
-
+DEFINE_CLASS_1(pcib, grackle_driver, grackle_methods,
+ sizeof(struct grackle_softc), ofw_pci_driver);
DRIVER_MODULE(grackle, nexus, grackle_driver, grackle_devclass, 0, 0);
static int
@@ -166,21 +124,9 @@ static int
grackle_attach(device_t dev)
{
struct grackle_softc *sc;
- phandle_t node;
- u_int32_t busrange[2];
- struct grackle_range *rp, *io, *mem[2];
- int nmem, i, error;
- node = ofw_bus_get_node(dev);
sc = device_get_softc(dev);
- if (OF_getprop(node, "bus-range", busrange, sizeof(busrange)) != 8)
- return (ENXIO);
-
- sc->sc_dev = dev;
- sc->sc_node = node;
- sc->sc_bus = busrange[0];
-
/*
* The Grackle PCI config addr/data registers are actually in
* PCI space, but since they are needed to actually probe the
@@ -190,83 +136,7 @@ grackle_attach(device_t dev)
sc->sc_addr = (vm_offset_t)pmap_mapdev(GRACKLE_ADDR, PAGE_SIZE);
sc->sc_data = (vm_offset_t)pmap_mapdev(GRACKLE_DATA, PAGE_SIZE);
- bzero(sc->sc_range, sizeof(sc->sc_range));
- sc->sc_nrange = OF_getprop(node, "ranges", sc->sc_range,
- sizeof(sc->sc_range));
-
- if (sc->sc_nrange == -1) {
- device_printf(dev, "could not get ranges\n");
- return (ENXIO);
- }
-
- sc->sc_nrange /= sizeof(sc->sc_range[0]);
-
- sc->sc_range[6].pci_hi = 0;
- io = NULL;
- nmem = 0;
-
- for (rp = sc->sc_range; rp < sc->sc_range + sc->sc_nrange &&
- rp->pci_hi != 0; rp++) {
- switch (rp->pci_hi & OFW_PCI_PHYS_HI_SPACEMASK) {
- case OFW_PCI_PHYS_HI_SPACE_CONFIG:
- break;
- case OFW_PCI_PHYS_HI_SPACE_IO:
- io = rp;
- break;
- case OFW_PCI_PHYS_HI_SPACE_MEM32:
- mem[nmem] = rp;
- nmem++;
- break;
- case OFW_PCI_PHYS_HI_SPACE_MEM64:
- break;
- }
- }
-
- if (io == NULL) {
- device_printf(dev, "can't find io range\n");
- return (ENXIO);
- }
- sc->sc_io_rman.rm_type = RMAN_ARRAY;
- sc->sc_io_rman.rm_descr = "Grackle PCI I/O Ports";
- sc->sc_iostart = io->pci_iospace;
- if (rman_init(&sc->sc_io_rman) != 0 ||
- rman_manage_region(&sc->sc_io_rman, io->pci_lo,
- io->pci_lo + io->size_lo) != 0) {
- panic("grackle_attach: failed to set up I/O rman");
- }
-
- if (nmem == 0) {
- device_printf(dev, "can't find mem ranges\n");
- return (ENXIO);
- }
- sc->sc_mem_rman.rm_type = RMAN_ARRAY;
- sc->sc_mem_rman.rm_descr = "Grackle PCI Memory";
- error = rman_init(&sc->sc_mem_rman);
- if (error) {
- device_printf(dev, "rman_init() failed. error = %d\n", error);
- return (error);
- }
- for (i = 0; i < nmem; i++) {
- error = rman_manage_region(&sc->sc_mem_rman, mem[i]->pci_lo,
- mem[i]->pci_lo + mem[i]->size_lo);
- if (error) {
- device_printf(dev,
- "rman_manage_region() failed. error = %d\n", error);
- return (error);
- }
- }
-
- ofw_bus_setup_iinfo(node, &sc->sc_pci_iinfo, sizeof(cell_t));
-
- device_add_child(dev, "pci", device_get_unit(dev));
- return (bus_generic_attach(dev));
-}
-
-static int
-grackle_maxslots(device_t dev)
-{
-
- return (PCI_SLOTMAX);
+ return (ofw_pci_attach(dev));
}
static u_int32_t
@@ -340,175 +210,6 @@ grackle_write_config(device_t dev, u_int
}
static int
-grackle_route_interrupt(device_t bus, device_t dev, int pin)
-{
- struct grackle_softc *sc;
- struct ofw_pci_register reg;
- uint32_t pintr, mintr;
- phandle_t iparent;
- uint8_t maskbuf[sizeof(reg) + sizeof(pintr)];
-
- sc = device_get_softc(bus);
- pintr = pin;
- if (ofw_bus_lookup_imap(ofw_bus_get_node(dev), &sc->sc_pci_iinfo, ®,
- sizeof(reg), &pintr, sizeof(pintr), &mintr, sizeof(mintr),
- &iparent, maskbuf))
- return (MAP_IRQ(iparent, mintr));
-
- /* Maybe it's a real interrupt, not an intpin */
- if (pin > 4)
- return (pin);
-
- device_printf(bus, "could not route pin %d for device %d.%d\n",
- pin, pci_get_slot(dev), pci_get_function(dev));
- return (PCI_INVALID_IRQ);
-}
-
-static int
-grackle_read_ivar(device_t dev, device_t child, int which, uintptr_t *result)
-{
- struct grackle_softc *sc;
-
- sc = device_get_softc(dev);
-
- switch (which) {
- case PCIB_IVAR_DOMAIN:
- *result = 0;
- return (0);
- case PCIB_IVAR_BUS:
- *result = sc->sc_bus;
- return (0);
- }
-
- return (ENOENT);
-}
-
-static struct resource *
-grackle_alloc_resource(device_t bus, device_t child, int type, int *rid,
- u_long start, u_long end, u_long count, u_int flags)
-{
- struct grackle_softc *sc;
- struct resource *rv;
- struct rman *rm;
- int needactivate;
-
- needactivate = flags & RF_ACTIVE;
- flags &= ~RF_ACTIVE;
-
- sc = device_get_softc(bus);
-
- switch (type) {
- case SYS_RES_MEMORY:
- rm = &sc->sc_mem_rman;
- break;
-
- case SYS_RES_IOPORT:
- rm = &sc->sc_io_rman;
- break;
-
- case SYS_RES_IRQ:
- return (bus_alloc_resource(bus, type, rid, start, end, count,
- flags));
-
- default:
- device_printf(bus, "unknown resource request from %s\n",
- device_get_nameunit(child));
- return (NULL);
- }
-
- rv = rman_reserve_resource(rm, start, end, count, flags, child);
- if (rv == NULL) {
- device_printf(bus, "failed to reserve resource for %s\n",
- device_get_nameunit(child));
- return (NULL);
- }
-
- rman_set_rid(rv, *rid);
-
- if (needactivate) {
- if (bus_activate_resource(child, type, *rid, rv) != 0) {
- device_printf(bus,
- "failed to activate resource for %s\n",
- device_get_nameunit(child));
- rman_release_resource(rv);
- return (NULL);
- }
- }
-
- return (rv);
-}
-
-static int
-grackle_release_resource(device_t bus, device_t child, int type, int rid,
- struct resource *res)
-{
- if (rman_get_flags(res) & RF_ACTIVE) {
- int error = bus_deactivate_resource(child, type, rid, res);
- if (error)
- return error;
- }
-
- return (rman_release_resource(res));
-}
-
-static int
-grackle_activate_resource(device_t bus, device_t child, int type, int rid,
- struct resource *res)
-{
- struct grackle_softc *sc;
- void *p;
-
- sc = device_get_softc(bus);
-
- if (type == SYS_RES_IRQ) {
- return (bus_activate_resource(bus, type, rid, res));
- }
- if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) {
- vm_offset_t start;
-
- start = (vm_offset_t)rman_get_start(res);
- /*
- * For i/o-ports, convert the start address to the
- * MPC106 PCI i/o window
- */
- if (type == SYS_RES_IOPORT)
- start += sc->sc_iostart;
-
- if (bootverbose)
- printf("grackle mapdev: start %zx, len %ld\n", start,
- rman_get_size(res));
-
- p = pmap_mapdev(start, (vm_size_t)rman_get_size(res));
- if (p == NULL)
- return (ENOMEM);
-
- rman_set_virtual(res, p);
- rman_set_bustag(res, &bs_le_tag);
- rman_set_bushandle(res, (u_long)p);
- }
-
- return (rman_activate_resource(res));
-}
-
-static int
-grackle_deactivate_resource(device_t bus, device_t child, int type, int rid,
- struct resource *res)
-{
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
