From nobody Wed Mar 13 20:19:31 2024 X-Original-To: dev-commits-src-all@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 4Tw2100pztz5Db3Q; Wed, 13 Mar 2024 20:19:32 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Tw2100CjHz4frm; Wed, 13 Mar 2024 20:19:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1710361172; 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=kIE9eGavlKWTxn1A5nYDmUwh0n2XuEbgDKiyBzNIvfM=; b=nKE7/ZaOn36PNqnDSRP0bg0s++s8CLfpQsIkd3HgBmXlDvkWfUEVvA8zFWU7VEqKy2YzCm VrDa8DE/pi3c3nSy6sWQ4BS4kvcHNy5OPil/uMln++PFLSGtLf4DB2U85Uz4ZAFHnIzQ6T EpgaH6Zu0v+AWZsGQ7JjAQYnG1JKZ86UKiPSxbZQY5vcXNP7zPk6cHg3ugIoZaApQFdRZA fLEGRzIGk5agRIF13qpf6RJlnntUukOIpJ9dc13J4aimCfofdibQzRj8xolPYNbqmb7QPA DPnnTAr39C0gGY+a8psU39HpxUh4MPcSgSOEaFUsTEoQKfdvN6pRhD319SPhiQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1710361172; a=rsa-sha256; cv=none; b=Cco26+edg85Bu9XuykCbw4okZbYywak/8YThlV2fBHw74EE4KlBxwMv2X5OdfrFmfyqILW ne+gWzON7Y3ih+wusdgrWQ18WEJkxbIgdTsvvVVetZNhpSXvCcWge69Ln2rtkJQqMoC2Qs cZjkrJVNbbYiuopuZ3o6Co5gq0vXBz1axrJlpDtJr9BoPgXL9rqIlBp8j2fzxi+Vc5ywn6 Uqhd1vojWFzoeDqo1bVlsGfiqzzP15R19avUZqZya+BQ67HODb14IYJQeUw5scIa5QvRT+ foy9wCAkrBBDwVJu1JD03/aN9ZCMw6sA/lxW0+glxFaHnIY9p6V4Ei+QqeUxBA== 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=1710361172; 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=kIE9eGavlKWTxn1A5nYDmUwh0n2XuEbgDKiyBzNIvfM=; b=mRTtZJ6MNnISL/1DqK8pCdKU7FPin05xx8aIO7zMxgnhNV/vcSsuNEQFg43t7H0jY+J6pn g3k4dNsL5bLnCErl3w9ve84nyTX14TFEminy4APgH5Fwdn6qYsp3NEuMHoQSQA56jq4K3p ar8suKINuj1hUONPOrWrVENA1sHkvHqTQssyp3dVw/OakZIYDyD8CCqDACSTbLtGoFEiTm 0TThaHMFho/r7ECCKo7CfeqrRsUGyuhdbrlrqsvLGGZmQmuIej8vKqQ3vvG5/evOp9BGfO TlNxuGzKoSyRcI7gWXUYLjYKBIgefMi/7dQLfJvfgECk5iUeJyy7zFyYwUiFTg== 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 4Tw20z6wcJzxT2; Wed, 13 Mar 2024 20:19:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42DKJVZZ073008; Wed, 13 Mar 2024 20:19:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42DKJVAr073005; Wed, 13 Mar 2024 20:19:31 GMT (envelope-from git) Date: Wed, 13 Mar 2024 20:19:31 GMT Message-Id: <202403132019.42DKJVAr073005@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: f980f48f1369 - main - Revert "new-bus: Disable assertions for rman mismatches for activate/deactivate" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: f980f48f1369cda3f1f5e84e54e45b738bf0dd0b Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=f980f48f1369cda3f1f5e84e54e45b738bf0dd0b commit f980f48f1369cda3f1f5e84e54e45b738bf0dd0b Author: John Baldwin AuthorDate: 2024-03-13 20:19:10 +0000 Commit: John Baldwin CommitDate: 2024-03-13 20:19:10 +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 --- 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 c06f3df0c9c9..a485e6dd2641 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -4322,12 +4322,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)); @@ -4361,12 +4361,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));