From owner-svn-src-head@freebsd.org Wed Apr 27 16:34:30 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AFD2DB1E3CB; Wed, 27 Apr 2016 16:34:30 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6446814DE; Wed, 27 Apr 2016 16:34:30 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3RGYTBI004109; Wed, 27 Apr 2016 16:34:29 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3RGYTV4004108; Wed, 27 Apr 2016 16:34:29 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201604271634.u3RGYTV4004108@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Wed, 27 Apr 2016 16:34:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r298710 - head/sys/dev/pci X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Apr 2016 16:34:30 -0000 Author: jhb Date: Wed Apr 27 16:34:29 2016 New Revision: 298710 URL: https://svnweb.freebsd.org/changeset/base/298710 Log: Fix PCI bus detach to delete child devices. Differential Revision: https://reviews.freebsd.org/D6020 Modified: head/sys/dev/pci/pci.c Modified: head/sys/dev/pci/pci.c ============================================================================== --- head/sys/dev/pci/pci.c Wed Apr 27 16:33:17 2016 (r298709) +++ head/sys/dev/pci/pci.c Wed Apr 27 16:34:29 2016 (r298710) @@ -97,9 +97,7 @@ static int pci_add_map(device_t bus, de struct resource_list *rl, int force, int prefetch); static int pci_probe(device_t dev); static int pci_attach(device_t dev); -#ifdef PCI_RES_BUS static int pci_detach(device_t dev); -#endif static void pci_load_vendor_data(void); static int pci_describe_parse_line(char **ptr, int *vendor, int *device, char **desc); @@ -133,11 +131,7 @@ static device_method_t pci_methods[] = { /* Device interface */ DEVMETHOD(device_probe, pci_probe), DEVMETHOD(device_attach, pci_attach), -#ifdef PCI_RES_BUS DEVMETHOD(device_detach, pci_detach), -#else - DEVMETHOD(device_detach, bus_generic_detach), -#endif DEVMETHOD(device_shutdown, bus_generic_shutdown), DEVMETHOD(device_suspend, bus_generic_suspend), DEVMETHOD(device_resume, pci_resume), @@ -4145,20 +4139,25 @@ pci_attach(device_t dev) return (bus_generic_attach(dev)); } -#ifdef PCI_RES_BUS static int pci_detach(device_t dev) { +#ifdef PCI_RES_BUS struct pci_softc *sc; +#endif int error; error = bus_generic_detach(dev); if (error) return (error); sc = device_get_softc(dev); - return (bus_release_resource(dev, PCI_RES_BUS, 0, sc->sc_bus)); -} +#ifdef PCI_RES_BUS + error = bus_release_resource(dev, PCI_RES_BUS, 0, sc->sc_bus); + if (error) + return (error); #endif + return (device_delete_children(dev)); +} static void pci_set_power_child(device_t dev, device_t child, int state)