]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
firmware: zynqmp: Change panic logic in zynqmp_pmufw_load_config_object()
authorMichal Simek <michal.simek@xilinx.com>
Mon, 27 Apr 2020 09:51:40 +0000 (11:51 +0200)
committerMichal Simek <michal.simek@xilinx.com>
Wed, 24 Jun 2020 11:07:57 +0000 (13:07 +0200)
There is no need to panic all the time when pmufw config object loading
failed. The patch improves function logic to report permission deny case
and also panic only for SPL case.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net>
drivers/firmware/firmware-zynqmp.c

index 2bdf7771f642fdabd2adb20ef39d471f6f1d8356..66edc1693016794642a2ca04414ac5a1d71df66d 100644 (file)
@@ -18,6 +18,8 @@
 
 #define PMUFW_PAYLOAD_ARG_CNT  8
 
+#define XST_PM_NO_ACCESS       2002L
+
 struct zynqmp_power {
        struct mbox_chan tx_chan;
        struct mbox_chan rx_chan;
@@ -99,16 +101,25 @@ void zynqmp_pmufw_load_config_object(const void *cfg_obj, size_t size)
                PM_SET_CONFIGURATION,
                (u32)((u64)cfg_obj)
        };
-       u32 response;
+       u32 response = 0;
        int err;
 
        printf("Loading new PMUFW cfg obj (%ld bytes)\n", size);
 
        err = send_req(request, ARRAY_SIZE(request), &response, 1);
+       if (err == XST_PM_NO_ACCESS) {
+               printf("PMUFW no permission to change config object\n");
+               return;
+       }
+
        if (err)
-               panic("Cannot load PMUFW configuration object (%d)\n", err);
-       if (response != 0)
-               panic("PMUFW returned 0x%08x status!\n", response);
+               printf("Cannot load PMUFW configuration object (%d)\n", err);
+
+       if (response)
+               printf("PMUFW returned 0x%08x status!\n", response);
+
+       if ((err || response) && IS_ENABLED(CONFIG_SPL_BUILD))
+               panic("PMUFW config object loading failed in EL3\n");
 }
 
 static int zynqmp_power_probe(struct udevice *dev)