From owner-svn-src-all@FreeBSD.ORG Mon Jan 12 01:36:01 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ADEC7106564A; Mon, 12 Jan 2009 01:36:01 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 913B98FC0C; Mon, 12 Jan 2009 01:36:01 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0C1a1ps044429; Mon, 12 Jan 2009 01:36:01 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0C1a182044428; Mon, 12 Jan 2009 01:36:01 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <200901120136.n0C1a182044428@svn.freebsd.org> From: Nathan Whitehorn Date: Mon, 12 Jan 2009 01:36:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r187071 - head/sys/powerpc/powermac X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Jan 2009 01:36:02 -0000 Author: nwhitehorn Date: Mon Jan 12 01:36:01 2009 New Revision: 187071 URL: http://svn.freebsd.org/changeset/base/187071 Log: Some early Macintosh GPIO controllers don't provide reg properties for interrupt-only GPIOs. Honor this, and allow interrupt attachment, but not read/write access for such devices. Reported by: Niels Eliasen Modified: head/sys/powerpc/powermac/macgpio.c Modified: head/sys/powerpc/powermac/macgpio.c ============================================================================== --- head/sys/powerpc/powermac/macgpio.c Mon Jan 12 01:19:38 2009 (r187070) +++ head/sys/powerpc/powermac/macgpio.c Mon Jan 12 01:36:01 2009 (r187071) @@ -172,8 +172,14 @@ macgpio_attach(device_t dev) if (OF_getprop(child,"reg",&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); @@ -217,7 +223,7 @@ macgpio_print_child(device_t dev, device printf(" gpio %d", dinfo->gpio_num - GPIO_BASE); else if (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 */ resource_list_print_type(&dinfo->mdi_resources, "irq", SYS_RES_IRQ, @@ -240,7 +246,8 @@ macgpio_probe_nomatch(device_t dev, devi if ((type = ofw_bus_get_type(child)) == NULL) type = "(unknown)"; 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", SYS_RES_IRQ, "%ld"); printf(" (no driver attached)\n"); @@ -279,9 +286,11 @@ macgpio_activate_resource(device_t bus, if (type != SYS_RES_IRQ) return ENXIO; - val = bus_read_1(sc->sc_gpios,dinfo->gpio_num); - val |= 0x80; - bus_write_1(sc->sc_gpios,dinfo->gpio_num,val); + if (dinfo->gpio_num >= 0) { + val = bus_read_1(sc->sc_gpios,dinfo->gpio_num); + val |= 0x80; + bus_write_1(sc->sc_gpios,dinfo->gpio_num,val); + } return (bus_activate_resource(bus, type, rid, res)); } @@ -301,9 +310,11 @@ macgpio_deactivate_resource(device_t bus if (type != SYS_RES_IRQ) return ENXIO; - val = bus_read_1(sc->sc_gpios,dinfo->gpio_num); - val &= ~0x80; - bus_write_1(sc->sc_gpios,dinfo->gpio_num,val); + if (dinfo->gpio_num >= 0) { + val = bus_read_1(sc->sc_gpios,dinfo->gpio_num); + val &= ~0x80; + bus_write_1(sc->sc_gpios,dinfo->gpio_num,val); + } 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)); dinfo = device_get_ivars(dev); + if (dinfo->gpio_num < 0) + return (0); + 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)); dinfo = device_get_ivars(dev); + if (dinfo->gpio_num < 0) + return; + bus_write_1(sc->sc_gpios,dinfo->gpio_num,val); }