From nobody Sat Feb 17 07:19:36 2024 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 4TcKtc57f6z541gD; Sat, 17 Feb 2024 07:19:36 +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 4TcKtc4Hdzz4b8Z; Sat, 17 Feb 2024 07:19:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708154376; 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=jb/QLm+NQ7MsLo4F0/nnWbm8TYLbUTiBL35mYP/bhjg=; b=nQWWOQcFe2l+84xWsBsc03TqhAjjT6Yj7uQy0D027rQqGhpG8CSks6RoKfRlUCHBUL8a6G wmwXitWP1E0/tF+1KQDQTBnE1gom1zSk/13eQroYqNQAoChUIYMEgAHQnVI1kpjq0CMga3 eKrqgAHkz5tULmC6e6teF3WrXPoc0IRqjfZpLRknqWNfC2RApEwJ9U4bIXNCz0zri3/47n 1SuFdd4wQcAZ7mdrEID15xfiJuIXNn05aObqKlCrOkr8vif7MvwbfzQNtuCfwVKs6lPd4q mxbQugGAMTfTewmpwGa2LdUX0WQXLpGnYbf+xb+RFzkXvASYM56LqP9HUyr6Fw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708154376; 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=jb/QLm+NQ7MsLo4F0/nnWbm8TYLbUTiBL35mYP/bhjg=; b=cXyuQpz8khB4tTGH+NrumPQWBP5O8vKqnze4tCs9L9/1tll+g29oBOgzzrGXnsmMqrfPK0 RXBt1QDzfRGndS5HHVQ6Ipg23KS/a3NwmvB0scfYREQspKPwWuaktZBfRSQWmqU4vpX4Ce toUawBjLphmMAxRtkpLMw69d5s0oCAQQe8qF4LmC+4jUcwVLb/BZIE9dhASiRjhkLdAjj5 YfOV82FD/3Embq2PfgayR6lZ5VRzLmUza1G8bACiQSa6AkeyAvZCUK8Q/RVMNEHWgXpihA 0167a0XU8Hq1OWSgmYAlxbeXqoyg+YG8ld0op1LTwPCxHRcfLjeiQXfwcQhfpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708154376; a=rsa-sha256; cv=none; b=w7M4xpW0eLw2Qc6lDMOKwchhcJUgnPrp50SPPiIZ+X5frSd114ma6Z/hvj1Da3YObOYIXJ BQ6frqM5kqd9xl67wA0qih6WZz53jQ1hAFk9TnRZInLg02Jq6EZdOHeR/vpP+DGa6Xhb34 EkF0q5idB4n2HthG5nyRHk8Lpf/8fVMB4f7CjENMKOXFyOPLMpb1Hy7iaoyNaqG9xytRPC BIRR4BjuQBxS/deBupboRvvDetKq1TqCBdZ+QykZ7tiaepeUkfnndVil/CaDFLekUOwhS/ 4weGghcj1iuEHBatHWzM5GSSQZp8QAHdX60SLh5KHPvLQn+dcDZplK2ftC8/dQ== 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 4TcKtc3KT9z100P; Sat, 17 Feb 2024 07:19:36 +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 41H7Ja4h072390; Sat, 17 Feb 2024 07:19:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41H7Jacc072387; Sat, 17 Feb 2024 07:19:36 GMT (envelope-from git) Date: Sat, 17 Feb 2024 07:19:36 GMT Message-Id: <202402170719.41H7Jacc072387@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: cd9d26ed91c0 - main - 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: cd9d26ed91c049dd60919c71badced89e18a882a Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cd9d26ed91c049dd60919c71badced89e18a882a commit cd9d26ed91c049dd60919c71badced89e18a882a Author: John Baldwin AuthorDate: 2024-02-17 07:15:52 +0000 Commit: John Baldwin CommitDate: 2024-02-17 07:19:06 +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_* --- 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 151d77739c4a..f6f38f22beb6 100644 --- a/sys/powerpc/mpc85xx/lbc.c +++ b/sys/powerpc/mpc85xx/lbc.c @@ -792,7 +792,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); } @@ -810,7 +810,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); } @@ -828,7 +828,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); }