From nobody Thu Feb 27 14:17:03 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 4Z3YLm05mZz5qFrR; Thu, 27 Feb 2025 14:17:04 +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 4Z3YLl6h2fz3xGt; Thu, 27 Feb 2025 14:17:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1740665823; 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=VtZGOSUPZfoM+NLdUFw2rdoC5kFkTfIEfHrCRHIRves=; b=RkzXx0wu9RC8Yq29WyVP+JQXp2EhW3+E5WSj9bBjLpumRjU3yB3wjzlfChULaoLxXRjhQm HGjg9/IQ9m3EgUuMQlxJSAikZv5a46HDiOlDslC7JiLw8p/46QBeohTmDws6u9pOPRSXp/ GG1sCsLGFgyH8Me4KHBcrRVfnXVGhkHJ55X7rmpTMjd/khS3+u3WG4zHpYysPo6JiPRrBu 6z4g+DJcNzE7XZDYdhayYZOEAmj1cI6sTGmZ+LuOE3g7Ljq4tn1yi8ZJnbyauYLPsbIrbV 2JH2Flbos4FDRsXZG7KAfpHRB0HeipLDh5vTxSlH5GxKzEMnPB0KoyLUCNvzZw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1740665823; a=rsa-sha256; cv=none; b=DKDgN8opJpl+kxduplEF8flJdR788XPtTzZH4Yq+rjEWb2yX2GjwH1ThRl2UkKmueoYcoX WzVGMT12ewFnQuUMq6LxhNZOdQE9vW4LoseFnOEM4K4SBN/jntj0BsOnBzVSW6TZFDZe/c gTSu928kZ33gKQkGNnj0wBUIqXuSavNaHklhm11Fwy4C6JlN+jfAwld+sHGERaydHJrVJD TXfF0KtWYQCj3jI7uLmGIjLhxK/vbOwJ3VO5Xt3nQdGTrly91SxxKKhqrS5LdkEcweF+le 6DQvOd5/c6SLxqxQ4B9MxoLphFXoAPK0glu+sowbLQtRs/b7k90DJtpVxt0g6Q== 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=1740665823; 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=VtZGOSUPZfoM+NLdUFw2rdoC5kFkTfIEfHrCRHIRves=; b=ufXna5Ta782gXa9KGUJOXun0Yd/cJMmSh3Qu9U0eTeY5ii47DX3B0f1S5+H8f41oyd94vE 1Td5bxZHtVaqLlbjZ4ap6ocTkSQn1X8ZeMnl0cs/kBnJAsBBByo8YHHodmkr470RcFB6cN x/r6T/tMDW/VX3XGpv4QfSxYJRs34CarUX9zvOER8i4aAbtwqmUnk1Sz0y/Z2KiIHgnd6N WD/WEjqrDTk7k6QDkSPeAd26IqpLcGAjMgrkDed4qWU+adQi4qSxl1J8bLksuWX11qZOHI UOCCghLKC/8kLm193r/Rj391l5vUXF24sQPvrveGZstxPkhut+CSq3/RV3mqKw== 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 4Z3YLl6HGnzm7N; Thu, 27 Feb 2025 14:17:03 +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 51REH3jL016675; Thu, 27 Feb 2025 14:17:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51REH3eQ016672; Thu, 27 Feb 2025 14:17:03 GMT (envelope-from git) Date: Thu, 27 Feb 2025 14:17:03 GMT Message-Id: <202502271417.51REH3eQ016672@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: e7cab085e015 - stable/14 - powerpc psim: Fix infinite recursion in bus_adjust_resource method 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: e7cab085e015abce194a2fca2791cbe3d31d117a Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e7cab085e015abce194a2fca2791cbe3d31d117a commit e7cab085e015abce194a2fca2791cbe3d31d117a Author: John Baldwin AuthorDate: 2024-02-16 17:42:30 +0000 Commit: John Baldwin CommitDate: 2025-02-27 13:09:22 +0000 powerpc psim: 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: d7c16b333455 powerpc psim: Use bus_generic_rman_* (cherry picked from commit ccb1b43e20f5a1a0795b14f3ef39d5c2e15b424d) --- sys/powerpc/psim/iobus.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/powerpc/psim/iobus.c b/sys/powerpc/psim/iobus.c index 497ef42d82e6..c572a1fdc12b 100644 --- a/sys/powerpc/psim/iobus.c +++ b/sys/powerpc/psim/iobus.c @@ -352,7 +352,8 @@ iobus_adjust_resource(device_t bus, device_t child, int type, return (bus_generic_rman_adjust_resource(bus, child, type, r, start, end)); case SYS_RES_IRQ: - return (bus_adjust_resource(bus, type, r, start, end)); + return (bus_generic_adjust_resource(bus, child, type, r, start, + end)); default: return (EINVAL); }