PERFORCE change 65335 for review
John Baldwin
jhb at FreeBSD.org
Wed Nov 17 07:53:29 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=65335
Change 65335 by jhb at jhb_slimer on 2004/11/17 15:52:59
IFC @65332.
Affected files ...
.. //depot/projects/smpng/sys/dev/mc146818/mc146818reg.h#2 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_cpu_sparc64.c#7 integrate
.. //depot/projects/smpng/sys/kern/kern_intr.c#61 integrate
.. //depot/projects/smpng/sys/modules/uart/Makefile#6 integrate
.. //depot/projects/smpng/sys/sparc64/isa/isa.c#13 integrate
Differences ...
==== //depot/projects/smpng/sys/dev/mc146818/mc146818reg.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/mc146818/mc146818reg.h,v 1.3 2000/05/01 19:54:23 peter Exp $ */
+/* $FreeBSD: src/sys/dev/mc146818/mc146818reg.h,v 1.4 2004/11/17 14:46:13 marius Exp $ */
/* $NetBSD: mc146818reg.h,v 1.2 1997/03/12 06:53:42 cgd Exp $ */
/*
==== //depot/projects/smpng/sys/dev/uart/uart_cpu_sparc64.c#7 (text+ko) ====
@@ -25,30 +25,20 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.12 2004/08/15 02:17:20 marius Exp $");
-
-#include "opt_isa.h"
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_cpu_sparc64.c,v 1.13 2004/11/17 14:44:09 marius Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <machine/bus.h>
#include <machine/bus_private.h>
-#include <machine/resource.h>
-#include <dev/ofw/ofw_bus.h>
#include <dev/ofw/openfirm.h>
#include <machine/ofw_machdep.h>
-#include <isa/isavar.h>
-
#include <dev/uart/uart.h>
-#include <dev/uart/uart_bus.h>
#include <dev/uart/uart_cpu.h>
-#include <sparc64/pci/ofw_pci.h>
-#include <sparc64/isa/ofw_isa.h>
-
bus_space_tag_t uart_bus_space_io;
bus_space_tag_t uart_bus_space_mem;
@@ -252,35 +242,5 @@
void
uart_cpu_identify(driver_t *driver, device_t parent)
{
-#ifdef DEV_ISA
- char buf[32];
- struct isa_regs reg;
- device_t child;
- phandle_t node;
- ofw_isa_intr_t intr;
-#endif
-#ifdef DEV_ISA
- if (strcmp(device_get_name(parent), "isa") == 0) {
- if ((node = ofw_bus_get_node(device_get_parent(parent))) == 0)
- return;
- for (node = OF_child(node); node != 0; node = OF_peer(node)) {
- if (OF_getprop(node, "name", buf, sizeof(buf)) == -1)
- continue;
- if (strcmp(buf, "serial") != 0)
- continue;
- if ((OF_getprop(node, "reg", ®,
- sizeof(reg)) == -1) ||
- (OF_getprop(node, "interrupts", &intr,
- sizeof(intr)) == -1))
- continue;
- if ((child = BUS_ADD_CHILD(parent, ISA_ORDER_SENSITIVE,
- uart_driver_name, -1)) == NULL)
- return;
- bus_set_resource(child, SYS_RES_IOPORT, 0,
- ISA_REG_PHYS(®), reg.size);
- bus_set_resource(child, SYS_RES_IRQ, 0, intr, 1);
- }
- }
-#endif
}
==== //depot/projects/smpng/sys/kern/kern_intr.c#61 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.119 2004/11/16 16:09:46 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_intr.c,v 1.120 2004/11/17 14:39:41 jhb Exp $");
#include "opt_ddb.h"
@@ -554,22 +554,14 @@
*
* If this interrupt source is currently storming,
* then throttle it to only fire the handler once
- * per clock tick. Each second we go out of storming
- * mode to see if the storm has subsided.
+ * per clock tick.
*
* If this interrupt source is not currently
* storming, but the number of back to back
* interrupts exceeds the storm threshold, then
* enter storming mode.
*/
- if (storming) {
- tsleep(&count, td->td_priority, "istorm", 1);
- if (count > hz) {
- storming = 0;
- count = 0;
- } else
- count++;
- } else if (intr_storm_threshold != 0 &&
+ if (!storming && intr_storm_threshold != 0 &&
count >= intr_storm_threshold) {
if (!warned) {
printf(
@@ -578,8 +570,10 @@
warned = 1;
}
storming = 1;
- count = 0;
- } else
+ }
+ if (storming)
+ tsleep(&count, td->td_priority, "istorm", 1);
+ else
count++;
if (ithd->it_enable != NULL)
==== //depot/projects/smpng/sys/modules/uart/Makefile#6 (text+ko) ====
@@ -1,12 +1,10 @@
-# $FreeBSD: src/sys/modules/uart/Makefile,v 1.11 2004/08/14 23:54:27 marius Exp $
+# $FreeBSD: src/sys/modules/uart/Makefile,v 1.12 2004/11/17 14:44:10 marius Exp $
.PATH: ${.CURDIR}/../../dev/uart
.if ${MACHINE_ARCH} == "sparc64"
uart_bus_ebus= uart_bus_ebus.c
ofw_bus_if= ofw_bus_if.h
-ofw_pci_if= ofw_pci_if.h
-opt_isa= opt_isa.h
.endif
KMOD= uart
@@ -14,10 +12,7 @@
uart_bus_pci.c uart_bus_puc.c uart_core.c uart_cpu_${MACHINE}.c \
uart_dbg.c uart_dev_i8251.c uart_dev_ns8250.c uart_dev_sab82532.c \
uart_dev_z8530.c uart_if.c uart_subr.c uart_tty.c
-SRCS+= bus_if.h card_if.h device_if.h isa_if.h ${ofw_bus_if} ${ofw_pci_if} \
- ${opt_isa} pci_if.h power_if.h uart_if.h pccarddevs.h
-
-opt_isa.h:
- echo "#define DEV_ISA 1" > ${.TARGET}
+SRCS+= bus_if.h card_if.h device_if.h isa_if.h ${ofw_bus_if} pci_if.h \
+ power_if.h uart_if.h pccarddevs.h
.include <bsd.kmod.mk>
==== //depot/projects/smpng/sys/sparc64/isa/isa.c#13 (text+ko) ====
@@ -25,10 +25,11 @@
* SUCH DAMAGE.
*
* from: FreeBSD: src/sys/alpha/isa/isa.c,v 1.26 2001/07/11
- *
- * $FreeBSD: src/sys/sparc64/isa/isa.c,v 1.13 2004/08/12 17:41:32 marius Exp $
*/
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD: src/sys/sparc64/isa/isa.c,v 1.14 2004/11/17 14:44:10 marius Exp $");
+
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
@@ -66,11 +67,13 @@
device_t isa_bus_device;
static phandle_t isab_node;
+static struct isa_ranges *isab_ranges;
+static int isab_nrange;
static ofw_pci_intr_t isa_ino[8];
-struct ofw_bus_iinfo isa_iinfo;
+static struct ofw_bus_iinfo isa_iinfo;
/*
- * XXX: This is really partly partly PCI-specific, but unfortunately is
+ * XXX: This is really partly PCI-specific, but unfortunately is
* differently enough to have to duplicate it here...
*/
#define ISAB_RANGE_PHYS(r) \
@@ -82,7 +85,7 @@
#define INRANGE(x, start, end) ((x) >= (start) && (x) <= (end))
-static int isa_route_intr_res(device_t, u_long, u_long);
+static void isa_setup_children(device_t, phandle_t);
intrmask_t
isa_irq_pending(void)
@@ -105,16 +108,14 @@
isa_init(device_t dev)
{
device_t bridge;
- phandle_t node;
- ofw_isa_intr_t ino;
- struct isa_ranges *br;
- int nbr, i;
+ int i;
/* The parent of the bus must be a PCI-ISA bridge. */
bridge = device_get_parent(dev);
isab_node = ofw_bus_get_node(bridge);
- nbr = OF_getprop_alloc(isab_node, "ranges", sizeof(*br), (void **)&br);
- if (nbr <= 0)
+ isab_nrange = OF_getprop_alloc(isab_node, "ranges",
+ sizeof(*isab_ranges), (void **)&isab_ranges);
+ if (isab_nrange <= 0)
panic("isa_init: cannot get bridge range property");
ofw_bus_setup_iinfo(isab_node, &isa_iinfo, sizeof(ofw_isa_intr_t));
@@ -123,54 +124,175 @@
* This is really a bad kludge; however, it is needed to provide
* isa_irq_pending(), which is unfortunately still used by some
* drivers.
+ * XXX: The only driver still using isa_irq_pending() is sio(4)
+ * which we don't use on sparc64. Should we just drop support
+ * for isa_irq_pending()?
*/
for (i = 0; i < 8; i++)
isa_ino[i] = PCI_INVALID_IRQ;
- for (node = OF_child(isab_node); node != 0; node = OF_peer(node)) {
- if (OF_getprop(node, "interrupts", &ino, sizeof(ino)) == -1)
- continue;
- if (ino > 7)
- panic("isa_init: XXX: ino too large");
- isa_ino[ino] = ofw_isa_route_intr(bridge, node, &isa_iinfo,
- ino);
- }
+
+ isa_setup_children(dev, isab_node);
- for (nbr -= 1; nbr >= 0; nbr--) {
- switch(ISAB_RANGE_SPACE(br + nbr)) {
+ for (i = isab_nrange - 1; i >= 0; i--) {
+ switch(ISAB_RANGE_SPACE(&isab_ranges[i])) {
case ISAR_SPACE_IO:
/* This is probably always 0. */
- isa_io_base = ISAB_RANGE_PHYS(&br[nbr]);
- isa_io_limit = br[nbr].size;
+ isa_io_base = ISAB_RANGE_PHYS(&isab_ranges[i]);
+ isa_io_limit = isab_ranges[i].size;
isa_io_hdl = OFW_PCI_GET_BUS_HANDLE(bridge,
SYS_RES_IOPORT, isa_io_base, &isa_io_bt);
break;
case ISAR_SPACE_MEM:
/* This is probably always 0. */
- isa_mem_base = ISAB_RANGE_PHYS(&br[nbr]);
- isa_mem_limit = br[nbr].size;
+ isa_mem_base = ISAB_RANGE_PHYS(&isab_ranges[i]);
+ isa_mem_limit = isab_ranges[i].size;
isa_mem_hdl = OFW_PCI_GET_BUS_HANDLE(bridge,
SYS_RES_MEMORY, isa_mem_base, &isa_mem_bt);
break;
}
}
- free(br, M_OFWPROP);
}
-static int
-isa_route_intr_res(device_t bus, u_long start, u_long end)
+struct ofw_isa_pnp_map {
+ const char *name;
+ uint32_t id;
+};
+
+static struct ofw_isa_pnp_map pnp_map[] = {
+ { "SUNW,lomh", 0x0000ae4e }, /* SUN0000 */
+ { "dma", 0x0002d041 }, /* PNP0200 */
+ { "floppy", 0x0007d041 }, /* PNP0700 */
+ { "rtc", 0x000bd041 }, /* PNP0B00 */
+ { "flashprom", 0x0100ae4e }, /* SUN0001 */
+ { "parallel", 0x0104d041 }, /* PNP0401 */
+ { "serial", 0x0105d041 }, /* PNP0501 */
+ { "kb_ps2", 0x0303d041 }, /* PNP0303 */
+ { "kdmouse", 0x030fd041 }, /* PNP0F03 */
+ { "power", 0x0c0cd041 }, /* PNP0C0C */
+ { NULL, 0x0 }
+};
+
+static void
+isa_setup_children(device_t dev, phandle_t parent)
{
- int res;
+ struct isa_regs *regs;
+ device_t cdev;
+ u_int64_t end, start;
+ ofw_isa_intr_t *intrs, rintr;
+ phandle_t node;
+ uint32_t *drqs, *regidx;
+ int i, ndrq, nintr, nreg, nregidx, rtype;
+ char *name;
+
+ /*
+ * Loop through children and fake up PnP devices for them.
+ * Their resources are added as fully mapped and specified because
+ * adjusting the resources and the resource list entries respectively
+ * in isa_alloc_resource() causes trouble with drivers which use
+ * rman_get_start(), pass-through or allocate and release resources
+ * multiple times, etc. Adjusting the resources might be better off
+ * in a bus_activate_resource method but the common ISA code doesn't
+ * allow for an isa_activate_resource().
+ */
+ for (node = OF_child(parent); node != 0; node = OF_peer(node)) {
+ if ((OF_getprop_alloc(node, "name", 1, (void **)&name)) == -1)
+ continue;
+
+ /*
+ * Keyboard and mouse controllers hang off of the `8042'
+ * node but we have no real use for the `8042' itself.
+ */
+ if (strcmp(name, "8042") == 0) {
+ isa_setup_children(dev, node);
+ free(name, M_OFWPROP);
+ continue;
+ }
+
+ for (i = 0; pnp_map[i].name != NULL; i++)
+ if (strcmp(pnp_map[i].name, name) == 0)
+ break;
+ if (i == (sizeof(pnp_map) / sizeof(*pnp_map)) - 1) {
+ printf("isa_setup_children: no PnP map entry for node "
+ "0x%lx: %s\n", (unsigned long)node, name);
+ continue;
+ }
+
+ if ((cdev = BUS_ADD_CHILD(dev, ISA_ORDER_PNP, NULL, -1)) ==
+ NULL)
+ panic("isa_setup_children: BUS_ADD_CHILD failed");
+ isa_set_logicalid(cdev, pnp_map[i].id);
+ isa_set_vendorid(cdev, pnp_map[i].id);
+
+ nreg = OF_getprop_alloc(node, "reg", sizeof(*regs),
+ (void **)®s);
+ for (i = 0; i < nreg; i++) {
+ start = ISA_REG_PHYS(®s[i]);
+ end = start + regs[i].size - 1;
+ rtype = ofw_isa_range_map(isab_ranges, isab_nrange,
+ &start, &end, NULL);
+ bus_set_resource(cdev, rtype, i, start,
+ end - start + 1);
+ }
+ if (nreg == -1 && parent != isab_node) {
+ /*
+ * The "reg" property still might be an index into
+ * the set of registers of the parent device like
+ * with the nodes hanging off of the `8042' node.
+ */
+ nregidx = OF_getprop_alloc(node, "reg", sizeof(*regidx),
+ (void **)®idx);
+ if (nregidx > 2)
+ panic("isa_setup_children: impossible number "
+ "of register indices");
+ if (nregidx != -1 && (nreg = OF_getprop_alloc(parent,
+ "reg", sizeof(*regs), (void **)®s)) >= nregidx) {
+ for (i = 0; i < nregidx; i++) {
+ start = ISA_REG_PHYS(®s[regidx[i]]);
+ end = start + regs[regidx[i]].size - 1;
+ rtype = ofw_isa_range_map(isab_ranges,
+ isab_nrange, &start, &end, NULL);
+ bus_set_resource(cdev, rtype, i, start,
+ end - start + 1);
+ }
+ }
+ if (regidx != NULL)
+ free(regidx, M_OFWPROP);
+ }
+ if (regs != NULL)
+ free(regs, M_OFWPROP);
+
+ nintr = OF_getprop_alloc(node, "interrupts", sizeof(*intrs),
+ (void **)&intrs);
+ for (i = 0; i < nintr; i++) {
+ if (intrs[i] > 7)
+ panic("isa_setup_children: intr too large");
+ rintr = ofw_isa_route_intr(device_get_parent(dev), node,
+ &isa_iinfo, intrs[i]);
+ if (rintr == PCI_INVALID_IRQ)
+ panic("isa_setup_children: could not map ISA "
+ "interrupt %d", intrs[i]);
+ isa_ino[intrs[i]] = rintr;
+ bus_set_resource(cdev, SYS_RES_IRQ, i, rintr, 1);
+ }
+ if (intrs != NULL)
+ free(intrs, M_OFWPROP);
+
+ ndrq = OF_getprop_alloc(node, "dma-channel", sizeof(*drqs),
+ (void **)&drqs);
+ for (i = 0; i < ndrq; i++)
+ bus_set_resource(cdev, SYS_RES_DRQ, i, drqs[i], 1);
+ if (drqs != NULL)
+ free(drqs, M_OFWPROP);
+
+ /*
+ * Devices using DMA hang off of the `dma' node instead of
+ * directly from the ISA bridge node.
+ */
+ if (strcmp(name, "dma") == 0)
+ isa_setup_children(dev, node);
- if (start != end) {
- panic("isa_route_intr_res: allocation of interrupt range not "
- "supported (0x%lx - 0x%lx)", start, end);
+ free(name, M_OFWPROP);
}
- if (start > 7)
- panic("isa_route_intr_res: start out of isa range");
- res = isa_ino[start];
- if (res == PCI_INVALID_IRQ)
- device_printf(bus, "could not map interrupt %d\n", res);
- return (res);
}
struct resource *
@@ -217,93 +339,45 @@
}
/*
- * Add the base, change default allocations to be between base and
- * limit, and reject allocations if a resource type is not enabled.
+ * Sanity check if the resource in the respective entry is fully
+ * mapped and specified and its type allocable. A driver could
+ * have added an out of range resource on its own.
*/
- base = limit = 0;
- switch(type) {
- case SYS_RES_MEMORY:
- if (isa_mem_bt == NULL)
+ if (!passthrough) {
+ if ((rle = resource_list_find(rl, type, *rid)) == NULL)
return (NULL);
- base = isa_mem_base;
- limit = base + isa_mem_limit;
- break;
- case SYS_RES_IOPORT:
- if (isa_io_bt == NULL)
- return (NULL);
- base = isa_io_base;
- limit = base + isa_io_limit;
- break;
- case SYS_RES_IRQ:
- if (isdefault && passthrough)
- panic("isa_alloc_resource: cannot pass through default "
- "irq allocation");
- if (!isdefault) {
- start = end = isa_route_intr_res(bus, start, end);
- if (start == PCI_INVALID_IRQ)
- return (NULL);
- }
- break;
- default:
- panic("isa_alloc_resource: unsupported resource type %d", type);
- }
- if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) {
- start = ulmin(start + base, limit);
- end = ulmin(end + base, limit);
- }
-
- /*
- * This inlines a modified resource_list_alloc(); this is needed
- * because the resources need to have offsets added to them, which
- * cannot be done beforehand without patching the resource list entries
- * (which is ugly).
- */
- if (passthrough) {
- return (BUS_ALLOC_RESOURCE(device_get_parent(bus), child,
- type, rid, start, end, count, flags));
- }
-
- rle = resource_list_find(rl, type, *rid);
- if (rle == NULL)
- return (NULL); /* no resource of that type/rid */
-
- if (rle->res != NULL)
- panic("isa_alloc_resource: resource entry is busy");
-
- if (isdefault) {
- start = rle->start;
- count = ulmax(count, rle->count);
- end = ulmax(rle->end, start + count - 1);
+ base = limit = 0;
switch (type) {
case SYS_RES_MEMORY:
+ if (isa_mem_bt == NULL)
+ return (NULL);
+ base = isa_mem_base;
+ limit = base + isa_mem_limit;
+ break;
case SYS_RES_IOPORT:
- start += base;
- end += base;
- if (!INRANGE(start, base, limit) ||
- !INRANGE(end, base, limit))
+ if (isa_io_bt == NULL)
return (NULL);
+ base = isa_io_base;
+ limit = base + isa_io_limit;
break;
case SYS_RES_IRQ:
- start = end = isa_route_intr_res(bus, start, end);
- if (start == PCI_INVALID_IRQ)
+ if (rle->start != rle->end || rle->start <= 7)
return (NULL);
break;
+ case SYS_RES_DRQ:
+ break;
+ default:
+ return (NULL);
}
+ if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) {
+ if (!INRANGE(rle->start, base, limit) ||
+ !INRANGE(rle->end, base, limit))
+ return (NULL);
+ }
}
- rle->res = BUS_ALLOC_RESOURCE(device_get_parent(bus), child,
- type, rid, start, end, count, flags);
-
- /*
- * Record the new range.
- */
- if (rle->res != NULL) {
- rle->start = rman_get_start(rle->res) - base;
- rle->end = rman_get_end(rle->res) - base;
- rle->count = count;
- }
-
- return (rle->res);
+ return (resource_list_alloc(rl, bus, child, type, rid, start, end,
+ count, flags));
}
int
More information about the p4-projects
mailing list