From nobody Tue Apr 08 10:49:19 2025 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 4ZX2rc370hz5sC93; Tue, 08 Apr 2025 10:49:20 +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 4ZX2rb3C89z3kXV; Tue, 08 Apr 2025 10:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744109359; 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=kxp7I+js8Fbgxha5wo1QFtauA7FofcvZv/6+l739TGw=; b=mz6kst0LDPWE8eQLdGjgzYERy/cQcweXd3KXow+Cjjo+Y9F12XQ6nFa0niuF7faSb3mWhU RuxDbmTXo5IE63y6FrfakZqE7aKGCJx3mhpJpqJhZp4zm68ujDUjSbmhsc1E8o8In4RyoK vHAy///ucxiyn8qgEZzJ30Il6kuejZn8CjY392L8hIWJp1NhzgTpZVzkPTS8gKOzcOMoIG RpqDBPzgp9Ul7fdbunaa8+5I9an5bkKHtr7AliKwqQ1nFJ0N4ZQa5Kb8sahUo4UGYw4IVq hI9wlCRRDObvfnjv82BxXbRUvI8mLrwQkZR2anlJ6Zolf+gw/kpROJuPtihcQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744109359; a=rsa-sha256; cv=none; b=amXytrVtccucaH48z7xf2PP7Di2BZrvdg3ocwafea0DRY7NQ+X0dPkD48cD8jTjcGk7oQ6 1Tmb1YubzYZS4pMUjbuPMuXQlMOL9gl0uWgmf88KHT3RzuAL9OYESUO11vNXxeUWt204HD f/fPeYLAlTRI5IwEwu7oYnI1qfTdyLuaI5EBTp4cpbLHoldDX09adJ1yfLs4VLPLOwW/Fg AE+qsxfuPjgUMr1ePFB2VKdxA/Qtlp1CttijRMrMaQc3PpYq3HJGU8i5tEn4tWPG9G4R8o nbWvtpVcT51rohpsGpJm6PvnMyJEOejtmNum5HqqKRQT0UTMYU89f9A2+cpYSg== 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=1744109359; 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=kxp7I+js8Fbgxha5wo1QFtauA7FofcvZv/6+l739TGw=; b=qI50wxpgdzRmnDufaBhwfXs0SR8Mzm6hhIjz5Au0/l2Zp+5SoADb1zc/NuRoOw4TScqSTq opfaMRUAe5BJdmMeX9zHSda3PEzlC3910+l9IEteKuxgJAvWkCnxSuOvorfyqSE2DTwhyw srXYDtZ6Go+1VRMhFmK7Jg9PgXSUbq/i/nYKNbLDZ/PSvNjzYKQpHq9Fcq9kjMEvkyB5iJ yyy/gdcDnes1HFOyA8qnUDk+jEv+CyTXehe/u/NE5+7Y24lfIScmb6UG9q40VD9xHPcxyN vw9kSOFB/SeeE/H1CDgprWkJfimPYdnSvhGgZiQCHGQvZeAshvS/ijH33yR/oQ== 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 4ZX2rb2m3qzCZm; Tue, 08 Apr 2025 10:49:19 +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 538AnJuL002290; Tue, 8 Apr 2025 10:49:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 538AnJDA002287; Tue, 8 Apr 2025 10:49:19 GMT (envelope-from git) Date: Tue, 8 Apr 2025 10:49:19 GMT Message-Id: <202504081049.538AnJDA002287@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 17c67ba24df0 - main - sys: Move Marvell specific fdt code to sys/arm/mv 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 17c67ba24df03c5c04f5149265aa514786dc220b Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=17c67ba24df03c5c04f5149265aa514786dc220b commit 17c67ba24df03c5c04f5149265aa514786dc220b Author: Andrew Turner AuthorDate: 2025-04-08 10:46:51 +0000 Commit: Andrew Turner CommitDate: 2025-04-08 10:48:28 +0000 sys: Move Marvell specific fdt code to sys/arm/mv fdt_immr_* are only used by the armv7 Marvell code. Move setting the variables there as no new code should need to set them. Reviewed by: cognet Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D49535 --- sys/arm/mv/armadaxp/armadaxp_mp.c | 1 + sys/arm/mv/mv_armv7_machdep.c | 36 +++++++++++++++++++++++++++++++++--- sys/arm/mv/mvvar.h | 3 +++ sys/dev/fdt/fdt_common.c | 36 ------------------------------------ sys/dev/fdt/fdt_common.h | 4 ---- 5 files changed, 37 insertions(+), 43 deletions(-) diff --git a/sys/arm/mv/armadaxp/armadaxp_mp.c b/sys/arm/mv/armadaxp/armadaxp_mp.c index 75a119e0cec9..34cdc611a21f 100644 --- a/sys/arm/mv/armadaxp/armadaxp_mp.c +++ b/sys/arm/mv/armadaxp/armadaxp_mp.c @@ -46,6 +46,7 @@ #include #include +#include #include diff --git a/sys/arm/mv/mv_armv7_machdep.c b/sys/arm/mv/mv_armv7_machdep.c index 4fe59d2fe7df..c4c3280e4078 100644 --- a/sys/arm/mv/mv_armv7_machdep.c +++ b/sys/arm/mv/mv_armv7_machdep.c @@ -103,6 +103,10 @@ void mv_axp_platform_mp_setmaxid(platform_t plate); void mv_axp_platform_mp_start_ap(platform_t plate); #endif +vm_paddr_t fdt_immr_pa; +vm_offset_t fdt_immr_va; +static vm_offset_t fdt_immr_size; + #define MPP_PIN_MAX 68 #define MPP_PIN_CELLS 2 #define MPP_PINS_PER_REG 8 @@ -270,9 +274,35 @@ static int mv_platform_probe_and_attach(platform_t plate) { - if (fdt_immr_addr(MV_BASE) != 0) - while (1); - return (0); + phandle_t node; + u_long base, size; + int r; + + /* + * Try to access the SOC node directly i.e. through /aliases/. + */ + if ((node = OF_finddevice("soc")) != -1) + if (ofw_bus_node_is_compatible(node, "simple-bus")) + goto moveon; + /* + * Find the node the long way. + */ + if ((node = OF_finddevice("/")) == -1) + goto errout; + + if ((node = fdt_find_compatible(node, "simple-bus", 0)) == 0) + goto errout; + +moveon: + if ((r = fdt_get_range(node, 0, &base, &size)) == 0) { + fdt_immr_pa = base; + fdt_immr_va = MV_BASE; + fdt_immr_size = size; + return (0); + } + +errout: + while (1); } static void diff --git a/sys/arm/mv/mvvar.h b/sys/arm/mv/mvvar.h index 733cde06667e..990eeb444345 100644 --- a/sys/arm/mv/mvvar.h +++ b/sys/arm/mv/mvvar.h @@ -80,6 +80,9 @@ extern const struct decode_win *xor_wins; extern int idma_wins_no; extern int xor_wins_no; +extern vm_paddr_t fdt_immr_pa; +extern vm_offset_t fdt_immr_va; + int soc_decode_win(void); void soc_id(uint32_t *dev, uint32_t *rev); void soc_dump_decode_win(void); diff --git a/sys/dev/fdt/fdt_common.c b/sys/dev/fdt/fdt_common.c index 40b1b3c5fc4f..53d47c26b53d 100644 --- a/sys/dev/fdt/fdt_common.c +++ b/sys/dev/fdt/fdt_common.c @@ -62,10 +62,6 @@ SYSCTL_NODE(_hw, OID_AUTO, fdt, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "Flattened Device Tree"); -vm_paddr_t fdt_immr_pa; -vm_offset_t fdt_immr_va; -vm_offset_t fdt_immr_size; - struct fdt_ic_list fdt_ic_list_head = SLIST_HEAD_INITIALIZER(fdt_ic_list_head); static int @@ -199,38 +195,6 @@ fdt_get_range(phandle_t node, int range_id, u_long *base, u_long *size) return (0); } -int -fdt_immr_addr(vm_offset_t immr_va) -{ - phandle_t node; - u_long base, size; - int r; - - /* - * Try to access the SOC node directly i.e. through /aliases/. - */ - if ((node = OF_finddevice("soc")) != -1) - if (ofw_bus_node_is_compatible(node, "simple-bus")) - goto moveon; - /* - * Find the node the long way. - */ - if ((node = OF_finddevice("/")) == -1) - return (ENXIO); - - if ((node = fdt_find_compatible(node, "simple-bus", 0)) == 0) - return (ENXIO); - -moveon: - if ((r = fdt_get_range(node, 0, &base, &size)) == 0) { - fdt_immr_pa = base; - fdt_immr_va = immr_va; - fdt_immr_size = size; - } - - return (r); -} - int fdt_is_compatible_strict(phandle_t node, const char *compatible) { diff --git a/sys/dev/fdt/fdt_common.h b/sys/dev/fdt/fdt_common.h index e49049051209..ece54290a6ad 100644 --- a/sys/dev/fdt/fdt_common.h +++ b/sys/dev/fdt/fdt_common.h @@ -66,10 +66,6 @@ struct fdt_ic { device_t dev; }; -extern vm_paddr_t fdt_immr_pa; -extern vm_offset_t fdt_immr_va; -extern vm_offset_t fdt_immr_size; - #if defined(FDT_DTB_STATIC) extern u_char fdt_static_dtb; #endif