From nobody Thu Feb 27 14:17:02 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 4Z3YLk6b3Bz5qFrQ; Thu, 27 Feb 2025 14:17:02 +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 4Z3YLk5vk0z3x9n; Thu, 27 Feb 2025 14:17:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740665822; 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=h7Wd3oeJn3BJr6+ayToR04QQRUmSq/NV9s4mMpucBJ0=; b=PdCsRe+NIP0iS/Fsnbfq49tI9gUL4qsJivssJQLAzRN0jtFt+JeyY3Uv0LwK0utMzVI+TW NPM7eKinSshXZxxY7T98vmB9lj3G+a+/Fhc2sBUhu+il1Z+U2sVuQCDMrbKfDgHaJ/Guw0 4t9HrEJwszsTBveOT0Tbdsw3/O/1dx6QhA1ZlTKMBo9zDTtpr41Tig4A5jzZoD4YIb1LZz 8DXLrrvy+OFHQ5Unx3IllC5FGz07ZrPM6nY1E7KhYkdmLe65XeJ/3Vj1DkwHBLaSSuc05z P1JBVmuescXDkUe02T5dCkF6pEKvf2c5SboItouyZiwBt7GLfDJ2rcfswxV/SA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740665822; a=rsa-sha256; cv=none; b=hlvRAoBuYchgM96/74sd01QN+LXNBVHgLQJ4+lDsvzEHE2HYJWn7dlLZ/uS8vuMHXJlKKO JEr1dlzSAtKlXDv49FykxlZu/X2fWf1vdem+a0+8nkwLT2eCmFqo122AgmSaombUdXdM4C ToxCzmHprLwaurTcTwmFyAgXcE3EeRizFpWMK/5L9ImOuDyuUn5yEMiflzN2Hws+rb2ji/ nX/pIYp7dtBT4v3pGC6lIOH0Tsvnsxgh4cHNclbHEgKQhAxnnCNAhYPYA96NSoKTyVVdE7 tEfd/IHMcdiCeCeD/fvlOQws26VuFT6rqfb69H9Jp+BLDsqC1HRzLPyCQ3lADw== 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=1740665822; 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=h7Wd3oeJn3BJr6+ayToR04QQRUmSq/NV9s4mMpucBJ0=; b=diZOX5yNYgwz3BbDc6Ftokw1f6rLFlx2lWGMaIpCirqXoNtXUrOM+vA18Lvq4iCUKs3HGO TPuTuFCTfaBOIzOo0/VotJ6fDe65QspCQjrsYPFIE/SkeLsk2qA8zK534v/T5yZl/y/EGg cgc34qBeu8RxdfBE9MVNlWbySi6+FaQR5bLw2r0UKP1ID/3NLBi90zeOhvq8RYJMz+nrqE QSgowlXG5mNsnlXEcnV7V0pSqb3R6ZJ0eKD4kQSBW+0uI1ABt4Efh3Ov9Z3qyXsasoDO1m 6+n5PLgAb/vx2fszd7k+XwnUMREnWcII3NfowoMrCqfgbo7KeDcnXcCkrlZvZQ== 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 4Z3YLk5WGZzmQH; Thu, 27 Feb 2025 14:17:02 +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 51REH2vv016641; Thu, 27 Feb 2025 14:17:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51REH23f016638; Thu, 27 Feb 2025 14:17:02 GMT (envelope-from git) Date: Thu, 27 Feb 2025 14:17:02 GMT Message-Id: <202502271417.51REH23f016638@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: 4a0f4ccf6ae7 - stable/14 - powerpc mpc85xx: Fix infinite recursion in bus_adjust_resource method 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: 4a0f4ccf6ae7b0428da5015cc35eeafe01a5442d Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4a0f4ccf6ae7b0428da5015cc35eeafe01a5442d commit 4a0f4ccf6ae7b0428da5015cc35eeafe01a5442d Author: John Baldwin AuthorDate: 2024-02-16 17:40:34 +0000 Commit: John Baldwin CommitDate: 2025-02-27 13:09:21 +0000 powerpc mpc85xx: Fix infinite recursion in bus_adjust_resource method The default case needs to call bus_generic_adjust_resource to pass the request up the tree, not bus_adjust_resource which will just call this method again. Fixes: 5a7e717fb790 powerpc mpc85xx: Use bus_generic_rman_* (cherry picked from commit 68a3ff041129208ea98a3bd5142061176ab4165e) --- sys/powerpc/mpc85xx/lbc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/powerpc/mpc85xx/lbc.c b/sys/powerpc/mpc85xx/lbc.c index 52e28a5fb1cb..1e17d613438a 100644 --- a/sys/powerpc/mpc85xx/lbc.c +++ b/sys/powerpc/mpc85xx/lbc.c @@ -774,7 +774,8 @@ lbc_adjust_resource(device_t dev, device_t child, int type, struct resource *r, return (bus_generic_rman_adjust_resource(dev, child, type, r, start, end)); case SYS_RES_IRQ: - return (bus_adjust_resource(dev, type, r, start, end)); + return (bus_generic_adjust_resource(dev, child, type, r, start, + end)); default: return (EINVAL); }