From owner-svn-src-all@freebsd.org Mon Jan 14 21:46:57 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 526E61488DFC; Mon, 14 Jan 2019 21:46:57 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E4AA7778A0; Mon, 14 Jan 2019 21:46:56 +0000 (UTC) (envelope-from gonzo@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D2B068CF0; Mon, 14 Jan 2019 21:46:56 +0000 (UTC) (envelope-from gonzo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x0ELkuD2020973; Mon, 14 Jan 2019 21:46:56 GMT (envelope-from gonzo@FreeBSD.org) Received: (from gonzo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x0ELkutw020972; Mon, 14 Jan 2019 21:46:56 GMT (envelope-from gonzo@FreeBSD.org) Message-Id: <201901142146.x0ELkutw020972@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gonzo set sender to gonzo@FreeBSD.org using -f From: Oleksandr Tymoshenko Date: Mon, 14 Jan 2019 21:46:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r343025 - stable/12/sys/arm/mv X-SVN-Group: stable-12 X-SVN-Commit-Author: gonzo X-SVN-Commit-Paths: stable/12/sys/arm/mv X-SVN-Commit-Revision: 343025 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E4AA7778A0 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.94)[-0.941,0]; NEURAL_HAM_LONG(-1.00)[-0.999,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 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, 14 Jan 2019 21:46:57 -0000 Author: gonzo Date: Mon Jan 14 21:46:56 2019 New Revision: 343025 URL: https://svnweb.freebsd.org/changeset/base/343025 Log: MFC r341406, r342106 r341406: Fix PCI driver unload for Marvell PCI controller Add generic implementation for bus_deactivate_resource method. Without it bus_release_resource fails with "Failed to release active resource" message r342106: [mv_pci] Do not attempt to attach disabled PCI ports Fail probe for PCI port if the respective FDT node is not enabled Differential Revision: https://reviews.freebsd.org/D18385 Modified: stable/12/sys/arm/mv/mv_pci.c stable/12/sys/arm/mv/mv_pci_ctrl.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/arm/mv/mv_pci.c ============================================================================== --- stable/12/sys/arm/mv/mv_pci.c Mon Jan 14 18:40:37 2019 (r343024) +++ stable/12/sys/arm/mv/mv_pci.c Mon Jan 14 21:46:56 2019 (r343025) @@ -429,6 +429,9 @@ mv_pcib_probe(device_t self) OF_parent(node), "marvell,armada-370-pcie"))) return (ENXIO); + if (!ofw_bus_status_okay(self)) + return (ENXIO); + device_set_desc(self, "Marvell Integrated PCI/PCI-E Controller"); return (BUS_PROBE_DEFAULT); } Modified: stable/12/sys/arm/mv/mv_pci_ctrl.c ============================================================================== --- stable/12/sys/arm/mv/mv_pci_ctrl.c Mon Jan 14 18:40:37 2019 (r343024) +++ stable/12/sys/arm/mv/mv_pci_ctrl.c Mon Jan 14 21:46:56 2019 (r343025) @@ -97,6 +97,7 @@ static device_method_t mv_pcib_ctrl_methods[] = { DEVMETHOD(bus_alloc_resource, mv_pcib_ctrl_alloc_resource), DEVMETHOD(bus_release_resource, bus_generic_release_resource), DEVMETHOD(bus_activate_resource, bus_generic_activate_resource), + DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource), DEVMETHOD(bus_setup_intr, bus_generic_setup_intr), /* ofw_bus interface */