From nobody Thu Feb 27 14:17:06 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 4Z3YLp29sqz5qG2H; Thu, 27 Feb 2025 14:17:06 +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 4Z3YLp1jZKz3xMW; Thu, 27 Feb 2025 14:17:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740665826; 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=b1bLAbX33IFRPyJYDhH3VaZjYh0LuIroFg8uDl6SpS4=; b=I/mUq5wXBpHiDhB3WUI7vF5m61OdcgMbwFoqw4z/hxEVmixdL5b/hApSUNPPvUZHRQkrmQ AGs4LAaAqbmvT3oRUW6FxsTAHfJcHM4qOFo1USaJByx0b232QFOqojEPnw1AsNfuXFe8Ow o6gkTijDjynfahzkmYstUWHKs7sKzxFcYZRnt+J89CqCnGBgIhVEF53PuK9klf+8iFi8o8 SMrAUOXcbB1C/jVz4Rv58jpdhvBmL8j++5mFdc614qW4+bPd+I+buj4qVqaFtbQ19RUlpR wnYrMWHURj+dR2U1dtXkYpX5ikyoxtD989RpR92w4EgZQuol2MX9Q2BZmmc9VA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740665826; a=rsa-sha256; cv=none; b=PVHCwzkMRpJfZwQPwcQpVQa5rv20kV/Uuk3DcIevG8Od1fzu0RCALDSdaVnyiQJO7B+Vkx cE5tgH/gnvrZgEHlHKjuTUvTJuSyins6i0lRL1cRRxs2H5i/Udedt7n07v304TEULh89cN NPoaNphaZm1BjDS/UyCKzREndUSN/jQgABPF89dyz3SVL62d7LSEJ6kfv4IKEqMBgEUaQ3 vyQTUeGGp6XTeL3HCKLjaK1632Gf/Hs1naoFoRnfo4b7ZN20xnMiNC0yg8YiTIthRBO8NY iW0W1bC/dO/TSMjWQpgHAoAFEVKspeYXdGIMjfdbipvo/hOFrzIUk1cuxcjbdA== 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=1740665826; 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=b1bLAbX33IFRPyJYDhH3VaZjYh0LuIroFg8uDl6SpS4=; b=l4rrCihzkhvqWTnPpf+7a7q+DGH1LluZQuVkFOf46HyMo9QsGj7bTVbia7joJimAzULigl FZLHhCtAMdj/KDSVpra1jhAldk2osfHsRGk0h2Uce57HS7QcMm9wJ/Ix29UYSC9xcw1NJE 7Zc25UHel+AVJATFOpiKmlTB8H+ILhLahcKVdVFyRjvPGxmErIyHeSTz4IyAQtPJQT4yH/ yu456T8Aygvmlr9X2OlByS1zvHIwwptGltVyxgunJLou44FbZPUPFcAdu7NMvfZWLyp/X6 B98vAwR3fYB9pMGicz+YX7vjg/6KDiXdBdlJn8AJwMq8IWXjXRVGn9BaDoX8uw== 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 4Z3YLp12ZRzmqP; Thu, 27 Feb 2025 14:17:06 +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 51REH6cO016746; Thu, 27 Feb 2025 14:17:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51REH6Mt016743; Thu, 27 Feb 2025 14:17:06 GMT (envelope-from git) Date: Thu, 27 Feb 2025 14:17:06 GMT Message-Id: <202502271417.51REH6Mt016743@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: 2abfb125a565 - stable/14 - powerpc mpc85xx: 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: 2abfb125a5658491ad899a41e38f234cc1035632 Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=2abfb125a5658491ad899a41e38f234cc1035632 commit 2abfb125a5658491ad899a41e38f234cc1035632 Author: John Baldwin AuthorDate: 2024-02-17 07:15:52 +0000 Commit: John Baldwin CommitDate: 2025-02-27 13:09:22 +0000 powerpc mpc85xx: 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: 5a7e717fb790 powerpc mpc85xx: Use bus_generic_rman_* (cherry picked from commit cd9d26ed91c049dd60919c71badced89e18a882a) --- sys/powerpc/mpc85xx/lbc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/powerpc/mpc85xx/lbc.c b/sys/powerpc/mpc85xx/lbc.c index 1e17d613438a..47b2f60177b0 100644 --- a/sys/powerpc/mpc85xx/lbc.c +++ b/sys/powerpc/mpc85xx/lbc.c @@ -793,7 +793,7 @@ lbc_release_resource(device_t dev, device_t child, int type, int rid, return (bus_generic_rman_release_resource(dev, child, type, rid, res)); case SYS_RES_IRQ: - return (bus_release_resource(dev, type, rid, res)); + return (bus_generic_release_resource(dev, child, type, rid, res)); default: return (EINVAL); } @@ -811,7 +811,7 @@ lbc_activate_resource(device_t bus, device_t child, int type, int rid, return (bus_generic_rman_activate_resource(bus, child, type, rid, r)); case SYS_RES_IRQ: - return (bus_activate_resource(bus, type, rid, r)); + return (bus_generic_activate_resource(bus, child, type, rid, r)); default: return (EINVAL); } @@ -829,7 +829,7 @@ lbc_deactivate_resource(device_t bus, device_t child, int type, int rid, return (bus_generic_rman_deactivate_resource(bus, child, type, rid, r)); case SYS_RES_IRQ: - return (bus_deactivate_resource(bus, type, rid, r)); + return (bus_generic_deactivate_resource(bus, child, type, rid, r)); default: return (EINVAL); }