[PATCH v3 2/2] firmware: zynqmp: Move permission to change config object message

[Stefan Herbrechtsmeier]

From: Stefan Herbrechtsmeier <stefan.herbrechtsme...@weidmueller.com>

Move the permission to change a config object message from
zynqmp_pmufw_load_config_object function to zynqmp_pmufw_node function
to simplify the code and check the permission only if required.

Signed-off-by: Stefan Herbrechtsmeier <stefan.herbrechtsme...@weidmueller.com>

---

Changes in v4:
- Reword
- Move the check back to zynqmp_pmufw_node because the check need to be
  run after the config object load.
- Return error in zynqmp_pmufw_config_close and zynqmp_pmufw_node

Changes in v3:
- Added

 drivers/firmware/firmware-zynqmp.c | 36 ++++++++++++++----------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/drivers/firmware/firmware-zynqmp.c 
b/drivers/firmware/firmware-zynqmp.c
index 2b1ad5d2c3..6dc745bd14 100644
--- a/drivers/firmware/firmware-zynqmp.c
+++ b/drivers/firmware/firmware-zynqmp.c
@@ -63,29 +63,32 @@ static unsigned int xpm_configobject_close[] = {
 
 int zynqmp_pmufw_config_close(void)
 {
-       zynqmp_pmufw_load_config_object(xpm_configobject_close,
-                                       sizeof(xpm_configobject_close));
-       return 0;
+       return zynqmp_pmufw_load_config_object(xpm_configobject_close,
+                                              sizeof(xpm_configobject_close));
 }
 
 int zynqmp_pmufw_node(u32 id)
 {
-       static bool skip_config;
-       int ret;
+       static bool checked;
+       static bool skip;
 
-       if (skip_config)
-               return 0;
+       if (!checked) {
+               checked = true;
 
-       /* Record power domain id */
-       xpm_configobject[NODE_ID_LOCATION] = id;
+               if (zynqmp_pmufw_node(NODE_OCM_BANK_0) == -EACCES) {
+                       printf("PMUFW:  No permission to change config 
object\n");
+                       skip = true;
+               }
+       }
 
-       ret = zynqmp_pmufw_load_config_object(xpm_configobject,
-                                             sizeof(xpm_configobject));
+       if (skip)
+               return -EACCES;
 
-       if (ret == -EACCES && id == NODE_OCM_BANK_0)
-               skip_config = true;
+       /* Record power domain id */
+       xpm_configobject[NODE_ID_LOCATION] = id;
 
-       return 0;
+       return zynqmp_pmufw_load_config_object(xpm_configobject,
+                                              sizeof(xpm_configobject));
 }
 
 static int do_pm_probe(void)
@@ -250,8 +253,6 @@ int zynqmp_pmufw_load_config_object(const void *cfg_obj, 
size_t size)
        err = xilinx_pm_request(PM_SET_CONFIGURATION, (u32)(u64)cfg_obj, 0, 0,
                                0, ret_payload);
        if (err == XST_PM_NO_ACCESS) {
-               if (((u32 *)cfg_obj)[NODE_ID_LOCATION] == NODE_OCM_BANK_0)
-                       printf("PMUFW:  No permission to change config 
object\n");
                return -EACCES;
        }
 
@@ -295,9 +296,6 @@ static int zynqmp_power_probe(struct udevice *dev)
               ret >> ZYNQMP_PM_VERSION_MAJOR_SHIFT,
               ret & ZYNQMP_PM_VERSION_MINOR_MASK);
 
-       if (IS_ENABLED(CONFIG_ARCH_ZYNQMP))
-               zynqmp_pmufw_node(NODE_OCM_BANK_0);
-
        return 0;
 };
 
-- 
2.30.2