From owner-p4-projects@FreeBSD.ORG Mon Jan 28 14:08:17 2013 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1F69519A; Mon, 28 Jan 2013 14:08:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D3CA5198 for ; Mon, 28 Jan 2013 14:08:16 +0000 (UTC) (envelope-from bz@freebsd.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:1900:2254:2068::682:0]) by mx1.freebsd.org (Postfix) with ESMTP id C5039D5A for ; Mon, 28 Jan 2013 14:08:16 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r0SE8G6E064021 for ; Mon, 28 Jan 2013 14:08:16 GMT (envelope-from bz@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r0SE8G0G064018 for perforce@freebsd.org; Mon, 28 Jan 2013 14:08:16 GMT (envelope-from bz@freebsd.org) Date: Mon, 28 Jan 2013 14:08:16 GMT Message-Id: <201301281408.r0SE8G0G064018@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bz@freebsd.org using -f From: "Bjoern A. Zeeb" Subject: PERFORCE change 221567 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.14 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jan 2013 14:08:17 -0000 http://p4web.freebsd.org/@@221567?ac=10 Change 221567 by bz@bz_zenith on 2013/01/28 14:07:29 Make sure we hold the lock for callout_stop() even in early error cases. This fixes panics previously seen if there is a MAC+PHY configured in hints but not present: panic: mutex atse not owned at /sys/kern/kern_mutex.c:153 Reported also by: brooks, rwatson (presumably on old bitfiles) Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/atse/if_atse.c#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/atse/if_atse.c#2 (text+ko) ==== @@ -37,6 +37,8 @@ */ /* * XXX-BZ NOTES: + * - brooks, rwatson report: + * - buffered packet data as SOP arrives * - ifOutBroadcastPkts are only counted if both ether dst and src are all-1s; * seems an IP core bug, they count ether broadcasts as multicast. Is this * still the case? @@ -47,8 +49,6 @@ * hints anymore. * - read ethernet address depending on device unit until loader will do all * magic for us. - * - there is a case when atse_attach fails, that atse_detach is triggering - * a mtx locked assertion. * - resolve all XXX, left as reminders to shake out details later */ @@ -554,18 +554,6 @@ return (0); } -static int -atse_stop(struct atse_softc *sc) -{ - int error; - - ATSE_LOCK(sc); - error = atse_stop_locked(sc); - ATSE_UNLOCK(sc); - - return (error); -} - static uint8_t atse_mchash(struct atse_softc *sc __unused, const uint8_t *addr) { @@ -1590,11 +1578,12 @@ if (ifp->if_capenable & IFCAP_POLLING) ether_poll_deregister(ifp); #endif - callout_stop(&sc->atse_tick); /* Only cleanup if attach succeeded. */ if (device_is_attached(dev)) { - atse_stop(sc); + ATSE_LOCK(sc); + atse_stop_locked(sc); + ATSE_UNLOCK(sc); callout_drain(&sc->atse_tick); ether_ifdetach(ifp); } @@ -1700,27 +1689,41 @@ sc = device_get_softc(dev); - if (sc->atse_txc_mem_res != NULL) + if (sc->atse_txc_mem_res != NULL) { bus_release_resource(dev, SYS_RES_MEMORY, sc->atse_txc_mem_rid, sc->atse_txc_mem_res); - if (sc->atse_tx_mem_res != NULL) + sc->atse_txc_mem_res = NULL; + } + if (sc->atse_tx_mem_res != NULL) { bus_release_resource(dev, SYS_RES_MEMORY, sc->atse_tx_mem_rid, sc->atse_tx_mem_res); - if (sc->atse_tx_irq_res != NULL) + sc->atse_tx_mem_res = NULL; + } + if (sc->atse_tx_irq_res != NULL) { bus_release_resource(dev, SYS_RES_IRQ, sc->atse_tx_irq_rid, sc->atse_tx_irq_res); - if (sc->atse_rxc_mem_res != NULL) + sc->atse_tx_irq_res = NULL; + } + if (sc->atse_rxc_mem_res != NULL) { bus_release_resource(dev, SYS_RES_MEMORY, sc->atse_rxc_mem_rid, sc->atse_rxc_mem_res); - if (sc->atse_rx_mem_res != NULL) + sc->atse_rxc_mem_res = NULL; + } + if (sc->atse_rx_mem_res != NULL) { bus_release_resource(dev, SYS_RES_MEMORY, sc->atse_rx_mem_rid, sc->atse_rx_mem_res); - if (sc->atse_rx_irq_res != NULL) + sc->atse_rx_mem_res = NULL; + } + if (sc->atse_rx_irq_res != NULL) { bus_release_resource(dev, SYS_RES_IRQ, sc->atse_rx_irq_rid, sc->atse_rx_irq_res); - if (sc->atse_mem_res != NULL) + sc->atse_rx_irq_res = NULL; + } + if (sc->atse_mem_res != NULL) { bus_release_resource(dev, SYS_RES_MEMORY, sc->atse_mem_rid, sc->atse_mem_res); + sc->atse_mem_res = NULL; + } } static int