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 */ _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
