Prevent repeated deallocation of a resource.

Also deactivate resource if needed.

Discussed with: jrtc27
Differential Revision: https://reviews.freebsd.org/D32458
This commit is contained in:
Ruslan Bukin 2021-10-12 20:13:44 +01:00
parent 775f6f4595
commit aeb76076c6

View File

@ -307,6 +307,7 @@ pci_host_generic_core_release_resource(device_t dev, device_t child, int type,
{
struct generic_pcie_core_softc *sc;
struct rman *rm;
int error;
sc = device_get_softc(dev);
@ -319,7 +320,12 @@ pci_host_generic_core_release_resource(device_t dev, device_t child, int type,
rm = generic_pcie_rman(sc, type, rman_get_flags(res));
if (rm != NULL) {
KASSERT(rman_is_region_manager(res, rm), ("rman mismatch"));
rman_release_resource(res);
if (rman_get_flags(res) & RF_ACTIVE) {
error = bus_deactivate_resource(child, type, rid, res);
if (error)
return (error);
}
return (rman_release_resource(res));
}
return (bus_generic_release_resource(dev, child, type, rid, res));