From owner-p4-projects@FreeBSD.ORG Sun Mar 2 23:46:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3EA451065670; Sun, 2 Mar 2008 23:46:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2A4E106566B for ; Sun, 2 Mar 2008 23:46:55 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CC9428FC1A for ; Sun, 2 Mar 2008 23:46:55 +0000 (UTC) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m22Nkt1k047735 for ; Sun, 2 Mar 2008 23:46:55 GMT (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m22Nktbh047733 for perforce@freebsd.org; Sun, 2 Mar 2008 23:46:55 GMT (envelope-from marcel@freebsd.org) Date: Sun, 2 Mar 2008 23:46:55 GMT Message-Id: <200803022346.m22Nktbh047733@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Cc: Subject: PERFORCE change 136703 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Mar 2008 23:46:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=136703 Change 136703 by marcel@marcel_xcllnt on 2008/03/02 23:46:50 Fix quicc(4) WRT resource handling. Affected files ... .. //depot/projects/e500/sys/dev/quicc/quicc_bfe.h#3 edit .. //depot/projects/e500/sys/dev/quicc/quicc_bfe_ocp.c#2 edit .. //depot/projects/e500/sys/dev/quicc/quicc_core.c#4 edit .. //depot/projects/e500/sys/powerpc/conf/MPC85XX#4 edit Differences ... ==== //depot/projects/e500/sys/dev/quicc/quicc_bfe.h#3 (text+ko) ==== @@ -44,6 +44,7 @@ void *sc_icookie; int sc_irid; + struct rman sc_rman; struct quicc_device *sc_device; u_int sc_clock; ==== //depot/projects/e500/sys/dev/quicc/quicc_bfe_ocp.c#2 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include #include ==== //depot/projects/e500/sys/dev/quicc/quicc_core.c#4 (text+ko) ==== @@ -64,7 +64,7 @@ MALLOC_DEFINE(M_QUICC, "QUICC", "QUICC driver"); struct quicc_device { - struct resource qd_rres; + struct rman *qd_rman; struct resource_list qd_rlist; device_t qd_dev; int qd_devtype; @@ -115,6 +115,23 @@ if (sc->sc_rres == NULL) return (ENXIO); + start = rman_get_start(sc->sc_rres); + size = rman_get_size(sc->sc_rres); + + sc->sc_rman.rm_start = start; + sc->sc_rman.rm_end = start + size - 1; + sc->sc_rman.rm_type = RMAN_ARRAY; + sc->sc_rman.rm_descr = "QUICC resources"; + error = rman_init(&sc->sc_rman); + if (!error) + error = rman_manage_region(&sc->sc_rman, start, + start + size - 1); + if (error) { + bus_release_resource(dev, sc->sc_rtype, sc->sc_rrid, + sc->sc_rres); + return (error); + } + /* * Allocate interrupt resource. */ @@ -161,16 +178,11 @@ M_WAITOK | M_ZERO); qd->qd_devtype = QUICC_DEVTYPE_SCC; + qd->qd_rman = &sc->sc_rman; resource_list_init(&qd->qd_rlist); - start = rman_get_start(sc->sc_rres); - size = rman_get_size(sc->sc_rres); resource_list_add(&qd->qd_rlist, sc->sc_rtype, 0, start, - start + size - 1, size); - rle = resource_list_find(&qd->qd_rlist, sc->sc_rtype, 0); - rle->res = &qd->qd_rres; - rman_set_bushandle(rle->res, rman_get_bushandle(sc->sc_rres)); - rman_set_bustag(rle->res, rman_get_bustag(sc->sc_rres)); + start + size - 1, size); resource_list_add(&qd->qd_rlist, SYS_RES_IRQ, 0, 0xf00, 0xf00, 1); rle = resource_list_find(&qd->qd_rlist, SYS_RES_IRQ, 0); @@ -178,7 +190,7 @@ qd->qd_dev = device_add_child(dev, NULL, -1); device_set_ivars(qd->qd_dev, (void *)qd); - error = device_probe_and_attach(qd->qd_dev); + error = device_probe_and_attach(qd->qd_dev); /* Enable all SCC interrupts. */ quicc_write4(sc->sc_rres, QUICC_REG_SIMR_L, 0x00f00000); @@ -256,7 +268,18 @@ qd = device_get_ivars(child); rle = resource_list_find(&qd->qd_rlist, type, *rid); - return (rle != NULL) ? rle->res : NULL; + if (rle == NULL) + return (NULL); + + if (rle->res == NULL) { + rle->res = rman_reserve_resource(qd->qd_rman, rle->start, + rle->start + rle->count - 1, rle->count, flags, child); + if (rle->res != NULL) { + rman_set_bustag(rle->res, &bs_be_tag); + rman_set_bushandle(rle->res, rle->start); + } + } + return (rle->res); } int ==== //depot/projects/e500/sys/powerpc/conf/MPC85XX#4 (text+ko) ==== @@ -52,7 +52,7 @@ device miibus device pci device pty -#device quicc +device quicc device random #device rl device scbus