Date: Thu, 27 Feb 2025 14:17:16 GMT From: John Baldwin <jhb@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 0ed9854b5bf4 - stable/14 - Revert "new-bus: Disable assertions for rman mismatches for activate/deactivate" Message-ID: <202502271417.51REHGut017047@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0ed9854b5bf406b3d2bfda700ed749d3da015050 commit 0ed9854b5bf406b3d2bfda700ed749d3da015050 Author: John Baldwin <jhb@FreeBSD.org> AuthorDate: 2024-03-13 20:19:10 +0000 Commit: John Baldwin <jhb@FreeBSD.org> CommitDate: 2025-02-27 13:09:22 +0000 Revert "new-bus: Disable assertions for rman mismatches for activate/deactivate" With recent fixes to the ACPI and pcib drivers to translate mapping requests of child resources into mappings of sub-ranges of parent resources these assertions should now be true. This reverts commit ed88eef140a1c3d57d546f409c216806dd3da809. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D43691 (cherry picked from commit f980f48f1369cda3f1f5e84e54e45b738bf0dd0b) --- sys/kern/subr_bus.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index f08a7718e071..bd54977cc6f1 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -4377,12 +4377,12 @@ bus_generic_rman_activate_resource(device_t dev, device_t child, int type, int rid, struct resource *r) { struct resource_map map; -#ifdef INVARIANTS_XXX +#ifdef INVARIANTS struct rman *rm; #endif int error; -#ifdef INVARIANTS_XXX +#ifdef INVARIANTS rm = BUS_GET_RMAN(dev, type, rman_get_flags(r)); KASSERT(rman_is_region_manager(r, rm), ("%s: rman %p doesn't match for resource %p", __func__, rm, r)); @@ -4425,12 +4425,12 @@ bus_generic_rman_deactivate_resource(device_t dev, device_t child, int type, int rid, struct resource *r) { struct resource_map map; -#ifdef INVARIANTS_XXX +#ifdef INVARIANTS struct rman *rm; #endif int error; -#ifdef INVARIANTS_XXX +#ifdef INVARIANTS rm = BUS_GET_RMAN(dev, type, rman_get_flags(r)); KASSERT(rman_is_region_manager(r, rm), ("%s: rman %p doesn't match for resource %p", __func__, rm, r));
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202502271417.51REHGut017047>