xilinx: zynqmp: Load pmufw configuration before checking access

Before this patch you could see in the log:
U-Boot SPL 2022.10-rc5 (Sep 29 2022 - 15:29:27 +0200)
PMUFW:	v1.1
Loading new PMUFW cfg obj (32 bytes)
PMUFW:  No permission to change config object
Loading new PMUFW cfg obj (2032 bytes)

where it is visible that permission is check before sending PMUFW
configuration (big size).

When this patch is applied it is visible that order is correct.
U-Boot SPL 2022.10-rc5 (Sep 29 2022 - 15:47:08 +0200)
Loading new PMUFW cfg obj (2032 bytes)
PMUFW:	v1.1
Loading new PMUFW cfg obj (32 bytes)

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

diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c
index 8188e76dd84462402d74a4b02225907f70f3184e..5fe0873fe22103418ff944862dfb0f9d8e653280 100644 (file)
--- a/board/xilinx/zynqmp/zynqmp.c
+++ b/board/xilinx/zynqmp/zynqmp.c
@@ -145,6 +145,14 @@ int board_init(void)
        char name[SOC_MAX_STR_SIZE];
        int ret;
 #endif
+
+#if defined(CONFIG_SPL_BUILD)
+       /* Check *at build time* if the filename is an non-empty string */
+       if (sizeof(CONFIG_ZYNQMP_SPL_PM_CFG_OBJ_FILE) > 1)
+               zynqmp_pmufw_load_config_object(zynqmp_pm_cfg_obj,
+                                               zynqmp_pm_cfg_obj_size);
+#endif
+
 #if defined(CONFIG_ZYNQMP_FIRMWARE)
        struct udevice *dev;
 
@@ -154,10 +162,6 @@ int board_init(void)
 #endif
 
 #if defined(CONFIG_SPL_BUILD)
-       /* Check *at build time* if the filename is an non-empty string */
-       if (sizeof(CONFIG_ZYNQMP_SPL_PM_CFG_OBJ_FILE) > 1)
-               zynqmp_pmufw_load_config_object(zynqmp_pm_cfg_obj,
-                                               zynqmp_pm_cfg_obj_size);
        printf("Silicon version:\t%d\n", zynqmp_get_silicon_version());
 
        /* the CSU disables the JTAG interface when secure boot is enabled */