fix(mem): change pp reserve function naming to root

Signed-off-by: Daniel Oliveira <[email protected]>

Author: danielRep

src/core/mem.c

@@ -194,16 +194,16 @@ static bool root_pool_set_up_bitmap(struct page_pool* root_pool)
     return mem_reserve_ppool_ppages(root_pool, &bitmap_pp);
 }
 
-static bool pp_reserve_hyp_image_load(struct page_pool* pool)
+static bool pp_root_reserve_hyp_image_load(struct page_pool* root_pool)
 {
     size_t image_load_size = (size_t)(&_image_load_end - &_image_start);
 
     struct ppages images_load_ppages = mem_ppages_get(img_addr, NUM_PAGES(image_load_size));
 
-    return mem_reserve_ppool_ppages(pool, &images_load_ppages);
+    return mem_reserve_ppool_ppages(root_pool, &images_load_ppages);
 }
 
-static bool pp_reserve_hyp_image_noload(struct page_pool* pool)
+static bool pp_root_reserve_hyp_image_noload(struct page_pool* root_pool)
 {
     size_t image_load_size = (size_t)(&_image_load_end - &_image_start);
     size_t image_noload_size = (size_t)(&_image_end - &_image_load_end);
@@ -213,10 +213,10 @@ static bool pp_reserve_hyp_image_noload(struct page_pool* pool)
     struct ppages images_noload_ppages =
         mem_ppages_get(image_noload_addr, NUM_PAGES(image_noload_size));
 
-    return mem_reserve_ppool_ppages(pool, &images_noload_ppages);
+    return mem_reserve_ppool_ppages(root_pool, &images_noload_ppages);
 }
 
-static bool pp_reserve_cpus(struct page_pool* pool)
+static bool pp_root_reserve_cpus(struct page_pool* root_pool)
 {
     size_t cpu_size = platform.cpu_num * mem_cpu_boot_alloc_size();
     paddr_t cpu_base_addr;
@@ -235,30 +235,30 @@ static bool pp_reserve_cpus(struct page_pool* pool)
 
     struct ppages cpu_ppages = mem_ppages_get(cpu_base_addr, NUM_PAGES(cpu_size));
 
-    return mem_reserve_ppool_ppages(pool, &cpu_ppages);
+    return mem_reserve_ppool_ppages(root_pool, &cpu_ppages);
 }
 
-static bool pp_reserve_hyp_data(struct page_pool* pool)
+static bool pp_root_reserve_hyp_data(struct page_pool* root_pool)
 {
     size_t data_size = (size_t)(&_image_end - &_data_vma_start);
     paddr_t data_base_addr = (paddr_t)&_data_vma_start;
 
     struct ppages data_ppages = mem_ppages_get(data_base_addr, NUM_PAGES(data_size));
 
-    return mem_reserve_ppool_ppages(pool, &data_ppages);
+    return mem_reserve_ppool_ppages(root_pool, &data_ppages);
 }
 
 static bool pp_root_reserve_hyp_mem(struct page_pool* root_pool)
 {
     if (DEFINED(MEM_NON_UNIFIED)) {
-        bool hyp_data_mem = pp_reserve_hyp_data(root_pool);
-        bool cpus_mem = pp_reserve_cpus(root_pool);
+        bool hyp_data_mem = pp_root_reserve_hyp_data(root_pool);
+        bool cpus_mem = pp_root_reserve_cpus(root_pool);
         return hyp_data_mem && cpus_mem;
 
     } else {
-        bool hyp_image_load_mem = pp_reserve_hyp_image_load(root_pool);
-        bool hyp_image_noload_mem = pp_reserve_hyp_image_noload(root_pool);
-        bool cpus_mem = pp_reserve_cpus(root_pool);
+        bool hyp_image_load_mem = pp_root_reserve_hyp_image_load(root_pool);
+        bool hyp_image_noload_mem = pp_root_reserve_hyp_image_noload(root_pool);
+        bool cpus_mem = pp_root_reserve_cpus(root_pool);
         return hyp_image_load_mem && hyp_image_noload_mem && cpus_mem;
     }
 }
@@ -344,7 +344,7 @@ static bool mem_reserve_physical_memory(struct page_pool* pool)
     }
 
     if (DEFINED(MEM_NON_UNIFIED)) {
-        if (!pp_reserve_hyp_image_load(pool)) {
+        if (!pp_root_reserve_hyp_image_load(pool)) {
             return false;
         }
     }