From nobody Fri Feb 16 17:43:45 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 4TbznG0pLcz53tL2; Fri, 16 Feb 2024 17:43:46 +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 4TbznF6rr3z57sL; Fri, 16 Feb 2024 17:43:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708105426; 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=rWixekZFVsO4wPqCri4cy6mp2V5fvfEG1Mj1Z7T8nSc=; b=kc+Gnb3t3Mk8yWI9k6IOXL4idjTTixeeklbVOuIKbJG2v2z78pqLU2XREIs2gbDw6+mN6Z P/JGWL7ppN37TdbUOpfh3+cKG5jT8CHMfy03cf+E7hUhYgVfezsK+9FrnNaF7FAAwWfzTZ OgaMieyBEywvHjpewaujWQR9L1erzk317Lyk8txpvcq4WvAplVmMx05fmqGfH547JWq/mA 2S91p+Oby5Ctw15RsiSG2XifuSXgimzy6Pa8rQ0+fRwscB4OrIQonA06g0OjP4DN7CtfBx 54AeXG/FpT9pE/Hx7Kip77Nnm8Jjnyzy02mi+I90tkKVhww9GnbXKa0QLHWxJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708105426; 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=rWixekZFVsO4wPqCri4cy6mp2V5fvfEG1Mj1Z7T8nSc=; b=oOwtkiznx444ujzVIipSTel+AaVrIou0cZ3vXR7WnEG9hgcvyBg21PYM1BB5bPb41rwcdd 15X6ZtM8auf3GIAXY/EK5ufxgJnpEx+xvv9UUQARz1FciRKzGI7q8eE5uvlunoH5QjFUkP OCL/lJ1csJ2VF2d+Ld2kCm7i9eb7ouNZH9vSCuJIntm4i9aVAQCE/eIAaf+vw+oEfDo1jd XEhgNNqvXF97gp2yeL+Q0SXy2j3HW88F5spoq8F2kz31ZfGStmUAw9rint5VcmfLmC79JS l7GOj+vcmhNUtB00NZmH36IHq9UloQon6Yj4QJW/L57IZzFvriMRFkq1tlUelg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708105426; a=rsa-sha256; cv=none; b=dNnqnuwXABimgp2Vb6C3Lvuqq9xJePWz6afm3xrpjmc5eZ1MHGTQiqmD6XKOXL6IUSJOpv FRzYHbfBg2oJZIFc7c1ExoT2jm5w8SHJW3cLGUIdJU5Kxz7a1tcAYAjmPlJ7mecaWTty6Q FCNdgps+KE6PzkLfasQsCmrY0aknaXLpsSiGyHZ/8okYnW53K/Tqwprf6var6Zi4oTavA0 kRkZi2la6UQuOLE0cNGCux/EjsFx5a5LMncgUQVFf3vQlV9HAXyr53wfLcWtEfWmMejqmU YMUkpaZ5H2vJ7TSF5BZUkWPNYY0xapxRifCSwYMu1nrbpd69fzU1toyoPBSOrg== 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 4TbznF5vbrzZTK; Fri, 16 Feb 2024 17:43:45 +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 41GHhj1V006087; Fri, 16 Feb 2024 17:43:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41GHhjOs006084; Fri, 16 Feb 2024 17:43:45 GMT (envelope-from git) Date: Fri, 16 Feb 2024 17:43:45 GMT Message-Id: <202402161743.41GHhjOs006084@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: 68a3ff041129 - main - powerpc mpc85xx: 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: 68a3ff041129208ea98a3bd5142061176ab4165e Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=68a3ff041129208ea98a3bd5142061176ab4165e commit 68a3ff041129208ea98a3bd5142061176ab4165e Author: John Baldwin AuthorDate: 2024-02-16 17:40:34 +0000 Commit: John Baldwin CommitDate: 2024-02-16 17:40:34 +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_* --- 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 7db2d49955a3..151d77739c4a 100644 --- a/sys/powerpc/mpc85xx/lbc.c +++ b/sys/powerpc/mpc85xx/lbc.c @@ -773,7 +773,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); }