From nobody Thu Feb 27 14:17:16 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Z3YM02bdkz5qFxB; Thu, 27 Feb 2025 14:17:16 +0000 (UTC) (envelope-from git@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z3YM027x7z3xDH; Thu, 27 Feb 2025 14:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740665836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=diA3GpNGK0FHDQGDtjNVL3p7BnNSg/yAlNjLvzidHZ0=; b=d697H0WIy3uvEer9WcR9mi9TNktQvPwtEY2Z+zHXoiJZlNo5WPSP3V3xmC6FerfjQaWSaU +Xvc39JFa/eSSZYXDx2PMx5oFZbU8qlPTFwX8Ti3U0Frhfw7BEbRPmQ8rDlz5IfzvgIb9q SzjzhRpLd5awkBouKs6tGcWa4ojmEdbqnqg6Dz0eQkf66DawXM7bxtnti/CvGiTBCrq/+T jGlKSFHamdPXh5F/8UQYI7CzjMhJfHILpJqzHLryZbyVT7oGuuT9kjbmwiL2JPvV1q7qd+ nOeTpsSwVfjhGj4Et84jwekhpSg8juMYaF5kISubm0pUeCs2ruBoQMKhFWBSAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740665836; a=rsa-sha256; cv=none; b=wDJTG6hgGZfMHqR4PuMsBEFUD7QPUQLTrE0zaz9hB30gFSeQ5nkCp9fbFpdBlk946+/V9c BtJHgwuaj8JGB4GW+tmUZaz1flnZF8qCqh34LsLqpYkuFwPW33OlVhfbj5SEYAoYUdldX5 y6Y2agaDzhmPRmPqAPJ6PaQP9cc37jD39L49sHAktTjkgyZ+m1uXs+mu+HZbe0WxgvBKk8 Z+7CKATuKCMbQ87Iot1DNXkDXPcDZQffkJVV0Zs/xqvA2kIompq8qU4zPinzkSNI7pwoDq UCIN+e5dMsiHGevOmuDpR2IadtFinnXBMpQbRgClYtRmHssu9HY57cLs24WPsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740665836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=diA3GpNGK0FHDQGDtjNVL3p7BnNSg/yAlNjLvzidHZ0=; b=yIX8SwyCImRSftzIUQR92YWuSUetW0VWQJulEtLAF1hBcE/3zs4y3dYdfwqMSEXvw5JiU0 5GsUyt+l3Em2pWMKaJbkTe4OAB5jyjJKCkTOSl9aqnGYEWdLIMTOpuUUEfHDp327Tre6pd PHJpx1WGcTIvAxmR7OkJd/Pjl+VgCa+9hKJlppxaZMb/O7+hOV/t4zXNPuA9XHGPQhfdGO VvGdENb8BZHytckpX0t8icIZ8QlLdfqoNbIqZfRsx1/p2Fm2YyvJ1p5sWqSxr9BWiomNuq DyDzjgZit9ko0E3Ut/q4d1DS2r9KxZhKi/rBFvfFsmHnbRhh6V8fB1273yE2kw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Z3YM01kMhzmqT; Thu, 27 Feb 2025 14:17:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51REHGe2017050; Thu, 27 Feb 2025 14:17:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51REHGut017047; Thu, 27 Feb 2025 14:17:16 GMT (envelope-from git) Date: Thu, 27 Feb 2025 14:17:16 GMT Message-Id: <202502271417.51REHGut017047@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 0ed9854b5bf4 - stable/14 - Revert "new-bus: Disable assertions for rman mismatches for activate/deactivate" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0ed9854b5bf406b3d2bfda700ed749d3da015050 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=0ed9854b5bf406b3d2bfda700ed749d3da015050 commit 0ed9854b5bf406b3d2bfda700ed749d3da015050 Author: John Baldwin AuthorDate: 2024-03-13 20:19:10 +0000 Commit: John Baldwin 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));