lib: sbi: Remove domains_root_regions() platform callback

We now have sbi_domain_root_add_memregion() which allows platform
support to add root domain regions at boot-time so let's remove
the domains_root_regions() platform callback which was added
for this purpose.

Signed-off-by: Anup Patel <anup.patel@wdc.com>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Xiang W <wxjstz@126.com>

diff --git a/include/sbi/sbi_platform.h b/include/sbi/sbi_platform.h
index 837a75d..6736169 100644 (file)
--- a/include/sbi/sbi_platform.h
+++ b/include/sbi/sbi_platform.h
@@ -92,8 +92,6 @@ struct sbi_platform_operations {
         */
        int (*misa_get_xlen)(void);
 
-       /** Get platform specific root domain memory regions */
-       struct sbi_domain_memregion *(*domains_root_regions)(void);
        /** Initialize (or populate) domains for the platform */
        int (*domains_init)(void);
 
@@ -485,22 +483,6 @@ static inline int sbi_platform_misa_xlen(const struct sbi_platform *plat)
 }
 
 /**
- * Get platform specific root domain memory regions
- *
- * @param plat pointer to struct sbi_platform
- *
- * @return an array of memory regions terminated by a region with order zero
- * or NULL for no memory regions
- */
-static inline struct sbi_domain_memregion *
-sbi_platform_domains_root_regions(const struct sbi_platform *plat)
-{
-       if (plat && sbi_platform_ops(plat)->domains_root_regions)
-               return sbi_platform_ops(plat)->domains_root_regions();
-       return NULL;
-}
-
-/**
  * Initialize (or populate) domains for the platform
  *
  * @param plat pointer to struct sbi_platform

diff --git a/lib/sbi/sbi_domain.c b/lib/sbi/sbi_domain.c
index 1b2e6e3..84f30b9 100644 (file)
--- a/lib/sbi/sbi_domain.c
+++ b/lib/sbi/sbi_domain.c
@@ -593,7 +593,6 @@ int sbi_domain_finalize(struct sbi_scratch *scratch, u32 cold_hartid)
 int sbi_domain_init(struct sbi_scratch *scratch, u32 cold_hartid)
 {
        u32 i;
-       struct sbi_domain_memregion *memregs;
        const struct sbi_platform *plat = sbi_platform_ptr(scratch);
 
        /* Root domain firmware memory region */
@@ -611,11 +610,6 @@ int sbi_domain_init(struct sbi_scratch *scratch, u32 cold_hartid)
        /* Root domain memory region end */
        root_memregs[root_memregs_count].order = 0;
 
-       /* Use platform specific root memory regions when available */
-       memregs = sbi_platform_domains_root_regions(plat);
-       if (memregs)
-               root.regions = memregs;
-
        /* Root domain boot HART id is same as coldboot HART id */
        root.boot_hartid = cold_hartid;