From nobody Fri Feb 16 17:43:46 2024 X-Original-To: dev-commits-src-main@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 4TbznH1ksBz53tL3; Fri, 16 Feb 2024 17:43:47 +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 4TbznH0LjHz58BN; Fri, 16 Feb 2024 17:43:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708105427; 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=J9OR27v5VKhvI2p1BgEpRnLLvzopexkmrqPdc4HGhhE=; b=OXGB+cvvb0uAFVXGaKtTWypSywC05mC/ALylcUHicx9qyHFEeF7sTX2BfuEx6u2HL9ySNE f2DFVceIItVqxNJJ+XK0ISn0ueWZkYkgJOotnn0o+ZWDbDJWaxo2Osjz99JGXXLwDbsHLI 9SQBJyxd8liu/sB/OSYoosczsET5BukGAcacsbvv4/Gser+tW4rgG8EaxJR7s2wQZkQ7Ne oFRFej3Ak8v533ouXhXuR4pjNIwUu/g7rBkm/5gPrbmKxbtw+nJ5pxsEgpiFB9y0OQy1EM efecm34jyob5C+8eZc7RkPcS5OOIAw8v1wcT67Nvk41MxpR0g3ABGd/qO5wR2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708105427; 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=J9OR27v5VKhvI2p1BgEpRnLLvzopexkmrqPdc4HGhhE=; b=yIDKNYxC3ekkUVlOBO9ccotm64c4mWz736IYpi3zF4Ee+L+xvuJKJ/WpXzllTfIpB1ZGUE wpl1ceYmO6hpy2UMDReURiLyTVYizgnPobQTFaR2/3LWEfjsayULU6CSS3qPszBU1k1Bfs Jw2Q5kqJuebSMftK7gT0SMuUu/vGzQSQWtTA04CSXPGkUC1FPcB/KzUVuZ7WAxI1GBo0dq Nfk1jwMoBy8igvrElZIN5ZbD/7VQ8T6ixubRHeBwvgjuApqPlOrdbFHSjN17OAPFcY+Pn9 DY6P76e6ZVQ5Yu8DBwFbF6rNaHzCXxwuLdeqKPP6H4t9s/g0WyFk14lmRQZ0/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708105427; a=rsa-sha256; cv=none; b=MK9M5aiwMkHHgnwRDGqjXuQvuhHyhD+EaMHss4YEnF+bCxoaO+/k9APCux35Hhh5p7wIUK BAT6/CfS7zuSbNZP6ngKeNGnORZMmb5IFmaWxWIvSd0IHhVtuuZ4ipAHBonsItN54ChCQU Lm9KSmtCa10GzDsRwQ93Pl/5hLARehgfig+I7XaSe7rs3WvfUeJKJPbBXsIXUEVGKwHubV Baipqkg8UiQj/ph7cNGnF4GfOaKwmhTFNmyAq3PnGCdyESikjKDzgLVnLCteNVP7kM3cWS AE9fHQdMJaWZnoZEWlQM/OzOo28LcAfqmhY/gZFzF5coWbmPF1KViQEobQkaoA== 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 4TbznG6XCVzZR8; Fri, 16 Feb 2024 17:43:46 +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 41GHhkS3006139; Fri, 16 Feb 2024 17:43:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41GHhkRZ006136; Fri, 16 Feb 2024 17:43:46 GMT (envelope-from git) Date: Fri, 16 Feb 2024 17:43:46 GMT Message-Id: <202402161743.41GHhkRZ006136@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: ccb1b43e20f5 - main - powerpc psim: Fix infinite recursion in bus_adjust_resource method List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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: ccb1b43e20f5a1a0795b14f3ef39d5c2e15b424d Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ccb1b43e20f5a1a0795b14f3ef39d5c2e15b424d commit ccb1b43e20f5a1a0795b14f3ef39d5c2e15b424d Author: John Baldwin AuthorDate: 2024-02-16 17:42:30 +0000 Commit: John Baldwin CommitDate: 2024-02-16 17:42:30 +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_* --- 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); }