feat(fconf): rename 'ns-load-address' to 'secondary-load-address'

The 'ns-load-address' property has been renamed to 'secondary-load-
address' in order to make it more generic. It can be used to copy
the configuration to any location, be it root, secure, or non-secure.

Change-Id: I122508e155ccd99082296be3f6b8db2f908be221
Signed-off-by: Manish V Badarkhe <Manish.Badarkhe@arm.com>

diff --git a/docs/components/fconf/fconf_properties.rst b/docs/components/fconf/fconf_properties.rst
index 20cc75892a4c869ce98a7fe40d7715350572492e..3479576c97eaaf79eb6e695e1bc03225db0f49b0 100644 (file)
--- a/docs/components/fconf/fconf_properties.rst
+++ b/docs/components/fconf/fconf_properties.rst
@@ -20,7 +20,9 @@ contains, and must be formed with the following fields:
 
 - load-address [mandatory]
     - value type: <u64>
-    - Physical loading base address of the configuration.
+    - Physical loading base address of the configuration. 
+      If secondary-load-address is also provided (see below), then this is the
+      primary load address.
 
 - max-size [mandatory]
     - value type: <u32>
@@ -30,10 +32,11 @@ contains, and must be formed with the following fields:
     - value type: <u32>
     - Image ID of the configuration.
 
-- ns-load-address [optional]
+- secondary-load-address [optional]
     - value type: <u64>
-    - Physical loading base address of the configuration in the non-secure
-      memory.
-      Only needed by those configuration files which require being loaded
-      in secure memory (at load-address) as well as in non-secure memory
-      e.g. HW_CONFIG
+    - A platform uses this physical address to copy the configuration to
+      another location during the boot-flow.
+
+--------------
+
+*Copyright (c) 2023, Arm Limited and Contributors. All rights reserved.*

diff --git a/include/lib/fconf/fconf_dyn_cfg_getter.h b/include/lib/fconf/fconf_dyn_cfg_getter.h
index 43f298eb946a386de51b0c1d09af6c4f5a425fbc..35546734d54034913c9a0fddd22574c829bc683f 100644 (file)
--- a/include/lib/fconf/fconf_dyn_cfg_getter.h
+++ b/include/lib/fconf/fconf_dyn_cfg_getter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2023, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -19,12 +19,11 @@ struct dyn_cfg_dtb_info_t {
        uint32_t config_max_size;
        unsigned int config_id;
        /*
-        * Load address in non-secure memory. Only needed by those
-        * configuration files which require being loaded in secure
-        * memory (at config_addr) as well as in non-secure memory
+        * A platform uses this address to copy the configuration
+        * to another location during the boot-flow.
         * - e.g. HW_CONFIG
         */
-       uintptr_t ns_config_addr;
+       uintptr_t secondary_config_addr;
 };
 
 unsigned int dyn_cfg_dtb_info_get_index(unsigned int config_id);
@@ -32,7 +31,7 @@ struct dyn_cfg_dtb_info_t *dyn_cfg_dtb_info_getter(unsigned int config_id);
 int fconf_populate_dtb_registry(uintptr_t config);
 
 /* Set config information in global DTB array */
-void set_config_info(uintptr_t config_addr, uintptr_t ns_config_addr,
+void set_config_info(uintptr_t config_addr, uintptr_t secondary_config_addr,
                     uint32_t config_max_size,
                     unsigned int config_id);
 

diff --git a/lib/fconf/fconf_dyn_cfg_getter.c b/lib/fconf/fconf_dyn_cfg_getter.c
index 351772e111cd310dc1ae017842d3b31c21f3a4db..13081b06c0f0f2b544fea4cd9f19ae4b0d9d2ecd 100644 (file)
--- a/lib/fconf/fconf_dyn_cfg_getter.c
+++ b/lib/fconf/fconf_dyn_cfg_getter.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019-2022, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2023, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  */
@@ -31,7 +31,7 @@ static OBJECT_POOL_ARRAY(dtb_info_pool, dtb_infos);
  * This function is used to alloc memory for config information from
  * global pool and set the configuration information.
  */
-void set_config_info(uintptr_t config_addr, uintptr_t ns_config_addr,
+void set_config_info(uintptr_t config_addr, uintptr_t secondary_config_addr,
                     uint32_t config_max_size,
                     unsigned int config_id)
 {
@@ -39,7 +39,7 @@ void set_config_info(uintptr_t config_addr, uintptr_t ns_config_addr,
 
        dtb_info = pool_alloc(&dtb_info_pool);
        dtb_info->config_addr = config_addr;
-       dtb_info->ns_config_addr = ns_config_addr;
+       dtb_info->secondary_config_addr = secondary_config_addr;
        dtb_info->config_max_size = config_max_size;
        dtb_info->config_id = config_id;
 }
@@ -106,7 +106,7 @@ int fconf_populate_dtb_registry(uintptr_t config)
        fdt_for_each_subnode(child, dtb, node) {
                uint32_t config_max_size, config_id;
                uintptr_t config_addr;
-               uintptr_t ns_config_addr = ~0UL;
+               uintptr_t secondary_config_addr = ~0UL;
                uint64_t val64;
 
                /* Read configuration dtb information */
@@ -134,14 +134,16 @@ int fconf_populate_dtb_registry(uintptr_t config)
                VERBOSE("\tmax-size = 0x%x\n", config_max_size);
                VERBOSE("\tconfig-id = %u\n", config_id);
 
-               rc = fdt_read_uint64(dtb, child, "ns-load-address", &val64);
+               rc = fdt_read_uint64(dtb, child, "secondary-load-address",
+                                    &val64);
                if (rc == 0) {
-                       ns_config_addr = (uintptr_t)val64;
-                       VERBOSE("\tns-load-address = %lx\n", ns_config_addr);
+                       secondary_config_addr = (uintptr_t)val64;
+                       VERBOSE("\tsecondary-load-address = %lx\n",
+                               secondary_config_addr);
                }
 
-               set_config_info(config_addr, ns_config_addr, config_max_size,
-                               config_id);
+               set_config_info(config_addr, secondary_config_addr,
+                               config_max_size, config_id);
        }
 
        if ((child < 0) && (child != -FDT_ERR_NOTFOUND)) {