From nobody Sat Feb 17 07:19:37 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 4TcKtd687rz541Y0; Sat, 17 Feb 2024 07:19:37 +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 4TcKtd5GxSz4bLN; Sat, 17 Feb 2024 07:19:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708154377; 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=2EMiande2YYTyVc0bI4UfWOCt9YSP8Fwonrj3CMuT2k=; b=FM93o3mNI8TDq/upUHqN6tPzMUVy09CVQAbncsBERKzB4oHYwakJU9LLurBxl8bTKOD+6s oL6ztNecdK13EXGoPE/d7/DGV85AUenaG69p9RCnr0edcNK5a0UGwIoBQJZlVAms5A8DM/ lrISdB5Du5zDtHjhh853ShCPXkmNEhx211AD4cQXggJuR3kRj5FQEHv5Vk8zJaKX56yg4H 5iRkjb/pjCjio+jPz0Ao3H0y0zX7Ofw+nMftSbvLwC8aR6WQesO27X7ccaOHUP/7/42g/G +1dSd1zG5PBg1ewHHYCc6fTVTYwfzOpOgmlQNuFq4yD3QaJgUUX+1t2oy+6XWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708154377; 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=2EMiande2YYTyVc0bI4UfWOCt9YSP8Fwonrj3CMuT2k=; b=suSDS5yBHvSXeQKG4oMXOmNPL9q5ftn7XtHfQid4kpLIyI3TsFNNcp1/2YL7H34hjsUpNG ayH/myLngBs8C6oNOIO3gaGbmIQbX5VS08uZ23vQbm6ufYR2j13T94GmSbiBF7f8vJAHwA sbNvJ0BNOCwjRNyDDRtn8uALrUx3r9szLjXb93st2MVae88/qxggytVIakkymIfLJRrvYE wBXODti2QHHnZNHqKuTGgSH6fH/x5izBIUNgGalFB6gIviDZo8eyP5C7Vj70LmrDBl7ab6 4/7eFJlci39Qp+bkfvR5CP8pzRYyRZUj4bQ6GKcMSpHLycuETzOXOxQrMqDneA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708154377; a=rsa-sha256; cv=none; b=ffaBRagvVd9fZlsaVPvk0qf4IpMy/rY/SZsMiw3/KGkQZ7mT+aOHQqA+LH/QiukR9UhWoL khdxt36cVNypow7BvIdhuhYeDfSk3ahRvLcVzMxA3LQDs/e+dfmyqJMxIn6qhylN/Lg7zO Y0jjfD1PzNiamvRMv90hwoZiMjxlddpaYmkRU/9BWu97pTodTsIByvATq9MD9YFCsav/KO r/H0OXTlOzDmxwyYlpTHSMv9ZJE0WyqPKLYJojKH7xRv2KJepj1aBY6hN+BAsPBeVF03wS 6W98QBLhfnJa191yV0CymWd433XlgJVEMe18Dzi8EiZuE6JGrR3QkOilIzkggg== 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 4TcKtd4LdxzyfY; Sat, 17 Feb 2024 07:19:37 +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 41H7JbLU072444; Sat, 17 Feb 2024 07:19:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41H7Jb92072441; Sat, 17 Feb 2024 07:19:37 GMT (envelope-from git) Date: Sat, 17 Feb 2024 07:19:37 GMT Message-Id: <202402170719.41H7Jb92072441@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: 61d9bd21e9d6 - main - powerpc psim: Fix infinite recursion in multiple bus methods 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: 61d9bd21e9d6c3f876c4c8549fafaaaa4de75983 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=61d9bd21e9d6c3f876c4c8549fafaaaa4de75983 commit 61d9bd21e9d6c3f876c4c8549fafaaaa4de75983 Author: John Baldwin AuthorDate: 2024-02-17 07:17:42 +0000 Commit: John Baldwin CommitDate: 2024-02-17 07:19:06 +0000 powerpc psim: 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: d7c16b333455 powerpc psim: Use bus_generic_rman_* --- sys/powerpc/psim/iobus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/powerpc/psim/iobus.c b/sys/powerpc/psim/iobus.c index c572a1fdc12b..eea0255aa21c 100644 --- a/sys/powerpc/psim/iobus.c +++ b/sys/powerpc/psim/iobus.c @@ -370,7 +370,7 @@ iobus_release_resource(device_t bus, device_t child, int type, int rid, return (bus_generic_rman_release_resource(bus, child, type, rid, res)); case SYS_RES_IRQ: - return (bus_release_resource(bus, type, rid, res)); + return (bus_generic_release_resource(bus, child, type, rid, res)); default: return (EINVAL); } @@ -383,7 +383,7 @@ iobus_activate_resource(device_t bus, device_t child, int type, int rid, switch (type) { case SYS_RES_IRQ: - return (bus_activate_resource(bus, type, rid, res)); + return (bus_generic_activate_resource(bus, child, type, rid, res)); case SYS_RES_IOPORT: case SYS_RES_MEMORY: return (bus_generic_rman_activate_resource(bus, child, type, @@ -400,7 +400,7 @@ iobus_deactivate_resource(device_t bus, device_t child, int type, int rid, switch (type) { case SYS_RES_IRQ: - return (bus_deactivate_resource(bus, type, rid, res)); + return (bus_generic_deactivate_resource(bus, child, type, rid, res)); case SYS_RES_IOPORT: case SYS_RES_MEMORY: return (bus_generic_rman_deactivate_resource(bus, child, type,