From nobody Thu Feb 27 14:17:07 2025 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 4Z3YLq2Qcrz5qG2J; Thu, 27 Feb 2025 14:17:07 +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 4Z3YLq207bz3xH2; Thu, 27 Feb 2025 14:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740665827; 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=zvtayANn1VHjv/z+T+oPa+EGnUSK6AdKtfjLAQN5bRE=; b=ezEhM1BxCcgWE75LDt45NjIG9xsFrq1lYvsEcQKVOTuf50KPNeY9oBAgDuwUGiMToVvGsq VwNSaNW1pBe8wO62Yw9SAWQvLtBq5w+xZuZ28W7oVa5MgkQoi9EkjYulDuBrk1h9/ytYlU Wg22ctqQZt/JZpYvykl+pDS4Eq4PfE+T3h8Kc+NvXIw+uu6ugWFdUzl1mvN9lSCrw2wfYV Joy3/iayEhkwVc5Yq73JLOEeA5wUjCT8Z+XmYA8nKeM3ASX+oF+iaUGQT8NFG4bacJecgZ HuBTOQ41DBjpG7NGKYcjCSdurQH/M1Y1vKINBuge20KE2XzlVycFVUor5pJeiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740665827; a=rsa-sha256; cv=none; b=OWcRgaew9SThkdQhbfAk9ScT6OjiNw46scT7DRtG1ckOH56mGliNsas1vudx9miWmVv2bM gTQdC/XXUDzCoPI/woOxBzP+/vYFdtwGh/0z5dSIHY3kExsh3931btRwTNkyjcBJhdLuzp vqp7j25mYnfiq4hNBFRAkP3D9ySXmgBm2sDuxGjVppqEEn5oWyf8r+h/6lvrUYF64+3gxR 083Iac5xNDDg1kL5B/CKq56mKVFmu7wzyRnpUyQA0v5ywpsYkMLqn2UYGkD7yPC4Xlrwtr eMIobcFpccya2wgxmAO98FjcTBwbTqUP8KbcCHgtsiUAZam/dfOdrxDyKWGciQ== 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=1740665827; 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=zvtayANn1VHjv/z+T+oPa+EGnUSK6AdKtfjLAQN5bRE=; b=vH8yep0RHBU8WetZwhbhYT2omKQAHpUx1sWKhKAU69BiGIzeBVLTgpHzyUuT4hU/U/QdOU VHH2QFoRm1HW7KgfXO6xT/i9bs27+ZwCCq3fMfwcnUPXMw2gsLfHb0ltKSTbkl2ZemtVov vURFHYqRhrUlL+ZfkKjw3TUR9NrF8Woj7IoM+7z2RFqL4sveC5QCc3ZgEobC/bZgWuMMmV lERhuVMsBTrlzTnaJbSbBp6WxixFi4P52TvJ+1GqxI2qbmOU2vv61BCAyQ+NBtJ22X6uCh GGV45BeTXoB7z2RKMHtZMG/6SvSPYa4udvX6WsRfspyznGJn2uPXQ+s7jqn2/w== 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 4Z3YLq1blNzmqQ; Thu, 27 Feb 2025 14:17:07 +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 51REH7J7016785; Thu, 27 Feb 2025 14:17:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51REH7Me016782; Thu, 27 Feb 2025 14:17:07 GMT (envelope-from git) Date: Thu, 27 Feb 2025 14:17:07 GMT Message-Id: <202502271417.51REH7Me016782@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: 1ee7a9a25053 - stable/14 - powerpc psim: Fix infinite recursion in multiple bus methods 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-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/stable/14 X-Git-Reftype: branch X-Git-Commit: 1ee7a9a2505398989ecbf44a73d56c945de8561b Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=1ee7a9a2505398989ecbf44a73d56c945de8561b commit 1ee7a9a2505398989ecbf44a73d56c945de8561b Author: John Baldwin AuthorDate: 2024-02-17 07:17:42 +0000 Commit: John Baldwin CommitDate: 2025-02-27 13:09:22 +0000 powerpc psim: Fix infinite recursion in multiple bus methods Similar to 68a3ff041129208ea98a3bd5142061176ab4165e, the default case needs to call bus_generic_* to pass the request up the tree, not bus_* which will just call this method again. Fixes: d7c16b333455 powerpc psim: Use bus_generic_rman_* (cherry picked from commit 61d9bd21e9d6c3f876c4c8549fafaaaa4de75983) --- sys/powerpc/psim/iobus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/powerpc/psim/iobus.c b/sys/powerpc/psim/iobus.c index c572a1fdc12b..eea0255aa21c 100644 --- a/sys/powerpc/psim/iobus.c +++ b/sys/powerpc/psim/iobus.c @@ -370,7 +370,7 @@ iobus_release_resource(device_t bus, device_t child, int type, int rid, return (bus_generic_rman_release_resource(bus, child, type, rid, res)); case SYS_RES_IRQ: - return (bus_release_resource(bus, type, rid, res)); + return (bus_generic_release_resource(bus, child, type, rid, res)); default: return (EINVAL); } @@ -383,7 +383,7 @@ iobus_activate_resource(device_t bus, device_t child, int type, int rid, switch (type) { case SYS_RES_IRQ: - return (bus_activate_resource(bus, type, rid, res)); + return (bus_generic_activate_resource(bus, child, type, rid, res)); case SYS_RES_IOPORT: case SYS_RES_MEMORY: return (bus_generic_rman_activate_resource(bus, child, type, @@ -400,7 +400,7 @@ iobus_deactivate_resource(device_t bus, device_t child, int type, int rid, switch (type) { case SYS_RES_IRQ: - return (bus_deactivate_resource(bus, type, rid, res)); + return (bus_generic_deactivate_resource(bus, child, type, rid, res)); case SYS_RES_IOPORT: case SYS_RES_MEMORY: return (bus_generic_rman_deactivate_resource(bus, child, type,