d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some early Macintosh GPIO controllers don't provide reg properties for

Browse Source 
interrupt-only GPIOs. Honor this, and allow interrupt attachment, but not
read/write access for such devices.

Reported by:	Niels Eliasen
This commit is contained in:
nwhitehorn 2009-01-12 01:36:01 +00:00
parent 53dabe7d04
commit 87790de246
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/powerpc/powermac/macgpio.c
View File

@ -172,8 +172,14 @@ macgpio_attach(device_t dev)
if (OF_getprop(child,"reg",&dinfo->gpio_num, if (OF_getprop(child,"reg",&dinfo->gpio_num,
sizeof(dinfo->gpio_num)) != sizeof(dinfo->gpio_num)) { sizeof(dinfo->gpio_num)) != sizeof(dinfo->gpio_num)) {
free(dinfo, M_MACGPIO); /*
continue; * Some early GPIO controllers don't provide GPIO
* numbers for GPIOs designed only to provide
* interrupt resources. We should still allow these
* to attach, but with caution.
*/
dinfo->gpio_num = -1;
} }
resource_list_init(&dinfo->mdi_resources); resource_list_init(&dinfo->mdi_resources);
@ -217,7 +223,7 @@ macgpio_print_child(device_t dev, device_t child)
printf(" gpio %d", dinfo->gpio_num - GPIO_BASE); printf(" gpio %d", dinfo->gpio_num - GPIO_BASE);
else if (dinfo->gpio_num >= GPIO_EXTINT_BASE) else if (dinfo->gpio_num >= GPIO_EXTINT_BASE)
printf(" extint-gpio %d", dinfo->gpio_num - GPIO_EXTINT_BASE); printf(" extint-gpio %d", dinfo->gpio_num - GPIO_EXTINT_BASE);
else else if (dinfo->gpio_num >= 0)
printf(" addr 0x%02x", dinfo->gpio_num); /* should not happen */ printf(" addr 0x%02x", dinfo->gpio_num); /* should not happen */
resource_list_print_type(&dinfo->mdi_resources, "irq", SYS_RES_IRQ, resource_list_print_type(&dinfo->mdi_resources, "irq", SYS_RES_IRQ,
@ -240,7 +246,8 @@ macgpio_probe_nomatch(device_t dev, device_t child)
if ((type = ofw_bus_get_type(child)) == NULL) if ((type = ofw_bus_get_type(child)) == NULL)
type = "(unknown)"; type = "(unknown)";
device_printf(dev, "<%s, %s>", type, ofw_bus_get_name(child)); device_printf(dev, "<%s, %s>", type, ofw_bus_get_name(child));
printf(" gpio %d",dinfo->gpio_num); if (dinfo->gpio_num >= 0)
printf(" gpio %d",dinfo->gpio_num);
resource_list_print_type(&dinfo->mdi_resources, "irq", resource_list_print_type(&dinfo->mdi_resources, "irq",
SYS_RES_IRQ, "%ld"); SYS_RES_IRQ, "%ld");
printf(" (no driver attached)\n"); printf(" (no driver attached)\n");
@ -279,9 +286,11 @@ macgpio_activate_resource(device_t bus, device_t child, int type, int rid,
if (type != SYS_RES_IRQ) if (type != SYS_RES_IRQ)
return ENXIO; return ENXIO;
val = bus_read_1(sc->sc_gpios,dinfo->gpio_num); if (dinfo->gpio_num >= 0) {
val |= 0x80; val = bus_read_1(sc->sc_gpios,dinfo->gpio_num);
bus_write_1(sc->sc_gpios,dinfo->gpio_num,val); val |= 0x80;
bus_write_1(sc->sc_gpios,dinfo->gpio_num,val);
}
return (bus_activate_resource(bus, type, rid, res)); return (bus_activate_resource(bus, type, rid, res));
} }
@ -301,9 +310,11 @@ macgpio_deactivate_resource(device_t bus, device_t child, int type, int rid,
if (type != SYS_RES_IRQ) if (type != SYS_RES_IRQ)
return ENXIO; return ENXIO;
val = bus_read_1(sc->sc_gpios,dinfo->gpio_num); if (dinfo->gpio_num >= 0) {
val &= ~0x80; val = bus_read_1(sc->sc_gpios,dinfo->gpio_num);
bus_write_1(sc->sc_gpios,dinfo->gpio_num,val); val &= ~0x80;
bus_write_1(sc->sc_gpios,dinfo->gpio_num,val);
}
return (bus_deactivate_resource(bus, type, rid, res)); return (bus_deactivate_resource(bus, type, rid, res));
} }
@ -317,6 +328,9 @@ macgpio_read(device_t dev)
sc = device_get_softc(device_get_parent(dev)); sc = device_get_softc(device_get_parent(dev));
dinfo = device_get_ivars(dev); dinfo = device_get_ivars(dev);
if (dinfo->gpio_num < 0)
return (0);
return (bus_read_1(sc->sc_gpios,dinfo->gpio_num)); return (bus_read_1(sc->sc_gpios,dinfo->gpio_num));
} }
@ -329,6 +343,9 @@ macgpio_write(device_t dev, uint8_t val)
sc = device_get_softc(device_get_parent(dev)); sc = device_get_softc(device_get_parent(dev));
dinfo = device_get_ivars(dev); dinfo = device_get_ivars(dev);
if (dinfo->gpio_num < 0)
return;
bus_write_1(sc->sc_gpios,dinfo->gpio_num,val); bus_write_1(sc->sc_gpios,dinfo->gpio_num,val);
} }