arm64: versal: RO multi_boot register in non JTAG bootmode

The main reason for this change is that upstream QEMU has no multiboot
register implemented that's why access to it fails which ends up in CI
failure for our target.
That's why in JTAG bootmode returns 0 which is correct behaviour because
multiboot register is not used in this mode and value should be ignored and
as a side effect it is also fixing CI/Qemu issue.

Also move versal_get_bootmode() to avoid function declaration.

Signed-off-by: Michal Simek <michal.simek@amd.com>
Link: https://lore.kernel.org/r/484b9cafc45e72308a1a29a3ab772020f96784cc.1736155238.git.michal.simek@amd.com

diff --git a/board/xilinx/versal/board.c b/board/xilinx/versal/board.c
index d05220f96ffd186926dfac4a85891a40f7ebe575..cff810e02ad84fe4496082958e005e23408e4fb0 100644 (file)
--- a/board/xilinx/versal/board.c
+++ b/board/xilinx/versal/board.c
@@ -36,8 +36,29 @@ static xilinx_desc versalpl = {
 };
 #endif
 
+static u8 versal_get_bootmode(void)
+{
+       u8 bootmode;
+       u32 reg = 0;
+
+       reg = readl(&crp_base->boot_mode_usr);
+
+       if (reg >> BOOT_MODE_ALT_SHIFT)
+               reg >>= BOOT_MODE_ALT_SHIFT;
+
+       bootmode = reg & BOOT_MODES_MASK;
+
+       return bootmode;
+}
+
 static u32 versal_multi_boot(void)
 {
+       u8 bootmode = versal_get_bootmode();
+
+       /* Mostly workaround for QEMU CI pipeline */
+       if (bootmode == JTAG_MODE)
+               return 0;
+
        return readl(0xF1110004);
 }
 
@@ -120,21 +141,6 @@ unsigned long do_go_exec(ulong (*entry)(int, char * const []), int argc,
        return ret;
 }
 
-static u8 versal_get_bootmode(void)
-{
-       u8 bootmode;
-       u32 reg = 0;
-
-       reg = readl(&crp_base->boot_mode_usr);
-
-       if (reg >> BOOT_MODE_ALT_SHIFT)
-               reg >>= BOOT_MODE_ALT_SHIFT;
-
-       bootmode = reg & BOOT_MODES_MASK;
-
-       return bootmode;
-}
-
 static int boot_targets_setup(void)
 {
        u8 bootmode;