From: Michal Simek <michal.simek@xilinx.com>
Date: Tue, 27 Jul 2021 14:17:31 +0000 (+0200)
Subject: xilinx: zynqmp: use zynqmp_mmio_read() in multi_boot()
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=3d238435b216976d8a7dacd2cfddf3ba4c0d2f74;p=u-boot.git

xilinx: zynqmp: use zynqmp_mmio_read() in multi_boot()

When U-Boot runs in EL2 there is no access to csu_base registers that's why
this has to be done via firmware interface to find out multi boot register
value. Till now this function is called only from SPL in EL3.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index eb67116d5b..1b0356c84c 100644
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -346,9 +346,12 @@ int board_early_init_f(void)
 
 static int multi_boot(void)
 {
-	u32 multiboot;
+	u32 multiboot = 0;
+	int ret;
 
-	multiboot = readl(&csu_base->multi_boot);
+	ret = zynqmp_mmio_read((ulong)&csu_base->multi_boot, &multiboot);
+	if (ret)
+		return -EINVAL;
 
 	return multiboot;
 }