xilinx: mbv: Prepare MBV for CI
Subsystems (2)
Michal Simek
maintainercover xilinx: mbv: Prepare MBV for CI
Hi,
this patch series is fixing issues reported by dt-schema and all 4 combinations are tested on Qemu to be able to wire them in CI. U-Boot hooks changes are sent here
https://lore.kernel.org/r/82725079ee90362468fe8096db24ef2959725af9.1753181505.git.michal.simek@amd.com
Thanks,
Michal
Michal Simek (4):
xilinx: mbv: Disable OF_HAS_PRIOR_STAGE
xilinx: mbv: Add missing mmu-type cpu property
xilinx: mbv: Fix dt properties in interrupt controller node
xilinx: mbv: Use separate DTB for binman nodes
arch/riscv/dts/Makefile | 1 + arch/riscv/dts/xilinx-binman.dts | 12 ++++++++++++ arch/riscv/dts/xilinx-mbv32.dts | 8 ++++---- arch/riscv/dts/xilinx-mbv64.dts | 8 ++++---- board/xilinx/mbv/Kconfig | 1 - configs/xilinx_mbv32_defconfig | 1 + configs/xilinx_mbv32_smode_defconfig | 1 + configs/xilinx_mbv64_defconfig | 1 + configs/xilinx_mbv64_smode_defconfig | 1 + 9 files changed, 25 insertions(+), 9 deletions(-) create mode 100644 arch/riscv/dts/xilinx-binman.dts
Signature · 4 lines
2.43.0 base-commit: 063b2e618afb05a32d66218f3631a5f23b30ea3e branch: debian-sent3
Michal Simek
maintainerPATCH 1/4 xilinx: mbv: Disable OF_HAS_PRIOR_STAGE
There is no reason to use OF_BOARD for MBV because reduced DT is used by SPL and full DT is passed via u-boot.img or u-boot.itb. There is no reason to pick up DTB from certain address.
---
board/xilinx/mbv/Kconfig | 1 - 1 file changed, 1 deletion(-)
board/xilinx/mbv/Kconfig +0 -1
@@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS imply SPL_RAM_DEVICE imply CMD_SBI imply CMD_PING - imply OF_HAS_PRIOR_STAGE source "board/xilinx/Kconfig"
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 2/4 xilinx: mbv: Add missing mmu-type cpu property
In reply to Michal SimekOpenSBI expects mmu-type to be present in DT that's why add it. Without it OpenSBI disable CPU node which ends up in not working boot.
---
arch/riscv/dts/xilinx-mbv32.dts | 3 ++- arch/riscv/dts/xilinx-mbv64.dts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
arch/riscv/dts/xilinx-mbv32.dts +2 -1
@@ -2,7 +2,7 @@ /* * dts file for AMD MicroBlaze V * - * (C) Copyright 2023, Advanced Micro Devices, Inc. + * (C) Copyright 2023 - 2025, Advanced Micro Devices, Inc. * * Michal Simek <[email protected]> */
@@ -26,6 +26,7 @@ device_type = "cpu"; reg = <0>; riscv,isa = "rv32imafdc"; + mmu-type = "riscv,sv39"; i-cache-size = <32768>; d-cache-size = <32768>; clock-frequency = <100000000>;
arch/riscv/dts/xilinx-mbv64.dts +2 -1
@@ -2,7 +2,7 @@ /* * dts file for AMD MicroBlaze V * - * (C) Copyright 2023 - 2024, Advanced Micro Devices, Inc. + * (C) Copyright 2023 - 2025, Advanced Micro Devices, Inc. * * Michal Simek <[email protected]> */
@@ -26,6 +26,7 @@ device_type = "cpu"; reg = <0>; riscv,isa = "rv64imafdc"; + mmu-type = "riscv,sv39"; i-cache-size = <32768>; d-cache-size = <32768>; clock-frequency = <100000000>;
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 3/4 xilinx: mbv: Fix dt properties in interrupt controller node
In reply to Michal SimekProperties didn't match dt binding that's why should be fixed.
---
Binding has been sent here:
https://lore.kernel.org/r/6ddaf6f1e3748cdeda2e2e32ee69343a06c60dcb.1753166980.git.michal.simek@amd.com
but it is used for more then 15 years unchanged.
--- arch/riscv/dts/xilinx-mbv32.dts | 3 ++- arch/riscv/dts/xilinx-mbv64.dts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
arch/riscv/dts/xilinx-mbv32.dts +2 -1
@@ -71,7 +71,8 @@ interrupt-controller; interrupt-parent = <&cpu0_intc>; #interrupt-cells = <2>; - kind-of-intr = <0>; + xlnx,num-intr-inputs = <2>; + xlnx,kind-of-intr = <0>; }; xlnx_timer0: timer@41c00000 {
arch/riscv/dts/xilinx-mbv64.dts +2 -1
@@ -71,7 +71,8 @@ interrupt-controller; interrupt-parent = <&cpu0_intc>; #interrupt-cells = <2>; - kind-of-intr = <0>; + xlnx,num-intr-inputs = <2>; + xlnx,kind-of-intr = <0>; }; xlnx_timer0: timer@41c00000 {
Signature · 1 line
2.43.0
Michal Simek
maintainerPATCH 4/4 xilinx: mbv: Use separate DTB for binman nodes
In reply to Michal SimekThe commit d92fdb60677b ("binman: Add option for pointing to separate description") added support for separating binman description to own file not the be the part of DT for OS.
The main reason is that binman is not passing dt schema validation that's why want to keep it separated.
---
arch/riscv/dts/Makefile | 1 + arch/riscv/dts/xilinx-binman.dts | 12 ++++++++++++ arch/riscv/dts/xilinx-mbv32.dts | 2 -- arch/riscv/dts/xilinx-mbv64.dts | 2 -- configs/xilinx_mbv32_defconfig | 1 + configs/xilinx_mbv32_smode_defconfig | 1 + configs/xilinx_mbv64_defconfig | 1 + configs/xilinx_mbv64_smode_defconfig | 1 + 8 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 arch/riscv/dts/xilinx-binman.dts
arch/riscv/dts/Makefile +1 -0
@@ -14,6 +14,7 @@ dtb-$(CONFIG_TARGET_SIPEED_MAIX) += k210-maix-bit.dtb dtb-$(CONFIG_TARGET_TH1520_LPI4A) += th1520-lichee-pi-4a.dtb dtb-$(CONFIG_TARGET_XILINX_MBV) += xilinx-mbv32.dtb dtb-$(CONFIG_TARGET_XILINX_MBV) += xilinx-mbv64.dtb +dtb-$(CONFIG_TARGET_XILINX_MBV) += xilinx-binman.dtb dtb-$(CONFIG_TARGET_ASPEED_AST2700_IBEX) += ast2700-ibex.dtb include $(srctree)/scripts/Makefile.dts
arch/riscv/dts/xilinx-binman.dts new file +12 -0
@@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * binman file for AMD MicroBlaze V + * + * (C) Copyright 2025, Advanced Micro Devices, Inc. + * + * Michal Simek <[email protected]> + */ + +/dts-v1/; + +#include "binman.dtsi"
arch/riscv/dts/xilinx-mbv32.dts +0 -2
@@ -9,8 +9,6 @@ /dts-v1/; -#include "binman.dtsi" - / { #address-cells = <1>; #size-cells = <1>;
arch/riscv/dts/xilinx-mbv64.dts +0 -2
@@ -9,8 +9,6 @@ /dts-v1/; -#include "binman.dtsi" - / { #address-cells = <2>; #size-cells = <2>;
configs/xilinx_mbv32_defconfig +1 -0
@@ -39,5 +39,6 @@ CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_XILINX_UARTLITE=y CONFIG_XILINX_TIMER=y # CONFIG_BINMAN_FDT is not set +CONFIG_BINMAN_DTB="./arch/riscv/dts/xilinx-binman.dtb" CONFIG_PANIC_HANG=y CONFIG_SPL_GZIP=y
configs/xilinx_mbv32_smode_defconfig +1 -0
@@ -43,5 +43,6 @@ CONFIG_XILINX_UARTLITE=y # CONFIG_RISCV_TIMER is not set CONFIG_XILINX_TIMER=y # CONFIG_BINMAN_FDT is not set +CONFIG_BINMAN_DTB="./arch/riscv/dts/xilinx-binman.dtb" CONFIG_PANIC_HANG=y CONFIG_SPL_GZIP=y
configs/xilinx_mbv64_defconfig +1 -0
@@ -40,5 +40,6 @@ CONFIG_DEBUG_UART_SKIP_INIT=y CONFIG_XILINX_UARTLITE=y CONFIG_XILINX_TIMER=y # CONFIG_BINMAN_FDT is not set +CONFIG_BINMAN_DTB="./arch/riscv/dts/xilinx-binman.dtb" CONFIG_PANIC_HANG=y CONFIG_SPL_GZIP=y
configs/xilinx_mbv64_smode_defconfig +1 -0
@@ -44,5 +44,6 @@ CONFIG_XILINX_UARTLITE=y # CONFIG_RISCV_TIMER is not set CONFIG_XILINX_TIMER=y # CONFIG_BINMAN_FDT is not set +CONFIG_BINMAN_DTB="./arch/riscv/dts/xilinx-binman.dtb" CONFIG_PANIC_HANG=y CONFIG_SPL_GZIP=y
Signature · 1 line
2.43.0
Michal Simek
AppliedQuoted 27 lines · Michal Simek
Hi,
this patch series is fixing issues reported by dt-schema and all 4 combinations are tested on Qemu to be able to wire them in CI. U-Boot hooks changes are sent here
https://lore.kernel.org/r/82725079ee90362468fe8096db24ef2959725af9.1753181505.git.michal.simek@amd.comThanks,
MichalMichal Simek (4):
xilinx: mbv: DisableOF_HAS_PRIOR_STAGE
xilinx: mbv: Add missing mmu-type cpu property
xilinx: mbv: Fix dt properties in interrupt controller node
xilinx: mbv: Use separate DTB for binman nodesarch/riscv/dts/Makefile | 1 + arch/riscv/dts/xilinx-binman.dts | 12 ++++++++++++ arch/riscv/dts/xilinx-mbv32.dts | 8 ++++---- arch/riscv/dts/xilinx-mbv64.dts | 8 ++++---- board/xilinx/mbv/Kconfig | 1 - configs/xilinx_mbv32_defconfig | 1 + configs/xilinx_mbv32_smode_defconfig | 1 + configs/xilinx_mbv64_defconfig | 1 + configs/xilinx_mbv64_smode_defconfig | 1 + 9 files changed, 25 insertions(+), 9 deletions(-)
Quoted 2 lines
create mode 100644
arch/riscv/dts/xilinx-binman.dts
Applied.
M
Signature · 6 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Xilinx Microblaze Maintainer of Linux kernel - Xilinx Zynq ARM and ZynqMP/Versal ARM64 SoCs U-Boot custodian - Xilinx Microblaze/Zynq/ZynqMP/Versal/Versal NET SoCs TF-A maintainer - Xilinx ZynqMP/Versal/Versal NET SoCs
Re: [PATCH 1/4] xilinx: mbv: Disable OF_HAS_PRIOR_STAGE
In reply to Michal SimekQuoted 9 lines · Michal Simek
There is no reason to use
OF_BOARDfor MBV because reduced DT is used by SPL and full DT is passed via u-boot.img or u-boot.itb. There is no reason to pick up DTB from certain address.Signed-off-by Michal Simek <[email protected]>---
board/xilinx/mbv/Kconfig | 1 - 1 file changed, 1 deletion(-)
Re: [PATCH 2/4] xilinx: mbv: Add missing mmu-type cpu property
In reply to Michal SimekQuoted 9 lines · Michal Simek
OpenSBI expects mmu-type to be present in DT that's why add it. Without it OpenSBI disable CPU node which ends up in not working boot.
Signed-off-by Michal Simek <[email protected]>---
arch/riscv/dts/xilinx-mbv32.dts | 3 ++- arch/riscv/dts/xilinx-mbv64.dts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
Re: [PATCH 3/4] xilinx: mbv: Fix dt properties in interrupt controller node
In reply to Michal SimekQuoted 5 lines · Michal Simek
Properties didn't match dt binding that's why should be fixed.
Signed-off-by Michal Simek <[email protected]>---
Quoted 7 lines
Binding has been sent here:
https://lore.kernel.org/r/6ddaf6f1e3748cdeda2e2e32ee69343a06c60dcb.1753166980.git.michal.simek@amd.com
but it is used for more then 15 years unchanged.--- arch/riscv/dts/xilinx-mbv32.dts | 3 ++- arch/riscv/dts/xilinx-mbv64.dts | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
Re: [PATCH 4/4] xilinx: mbv: Use separate DTB for binman nodes
In reply to Michal SimekQuoted 9 lines · Michal Simek
The commit
d92fdb60677b("binman: Add option for pointing to separate description") added support for separating binman description to own file not the be the part of DT for OS.
The main reason is that binman is not passing dt schema validation that's why want to keep it separated.Signed-off-by Michal Simek <[email protected]>---
Quoted 10 lines
arch/riscv/dts/Makefile | 1 + arch/riscv/dts/xilinx-binman.dts | 12 ++++++++++++ arch/riscv/dts/xilinx-mbv32.dts | 2 -- arch/riscv/dts/xilinx-mbv64.dts | 2 -- configs/xilinx_mbv32_defconfig | 1 + configs/xilinx_mbv32_smode_defconfig | 1 + configs/xilinx_mbv64_defconfig | 1 + configs/xilinx_mbv64_smode_defconfig | 1 + 8 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 arch/riscv/dts/xilinx-binman.dts