lib: utils: Add M-mode {R/W} flags to the MMIO regions

Add the M-mode readable/writable flags to mmio regions
of various drivers.

Signed-off-by: Himanshu Chauhan <hchauhan@ventanamicro.com>
Reviewed-by: Anup Patel <anup@brainfault.org>
Tested-by: Anup Patel <anup@brainfault.org>

diff --git a/lib/utils/ipi/aclint_mswi.c b/lib/utils/ipi/aclint_mswi.c
index 832e223f08d5c4572926aa760302481485e9de43..6b004cb9efb953e89d231620897ea7fbba9fa78b 100644 (file)
--- a/lib/utils/ipi/aclint_mswi.c
+++ b/lib/utils/ipi/aclint_mswi.c
@@ -88,7 +88,10 @@ int aclint_mswi_cold_init(struct aclint_mswi_data *mswi)
                region_size = ((mswi->size - pos) < ACLINT_MSWI_ALIGN) ?
                              (mswi->size - pos) : ACLINT_MSWI_ALIGN;
                sbi_domain_memregion_init(mswi->addr + pos, region_size,
-                                         SBI_DOMAIN_MEMREGION_MMIO, &reg);
+                                         (SBI_DOMAIN_MEMREGION_MMIO |
+                                          SBI_DOMAIN_MEMREGION_M_READABLE |
+                                          SBI_DOMAIN_MEMREGION_M_WRITABLE),
+                                         &reg);
                rc = sbi_domain_root_add_memregion(&reg);
                if (rc)
                        return rc;

diff --git a/lib/utils/irqchip/aplic.c b/lib/utils/irqchip/aplic.c
index 0a8469b618b3e6cb84a08713eab8e9b96d798ece..d7fd99280442db16eaadd5731550cdfe53f9e38c 100644 (file)
--- a/lib/utils/irqchip/aplic.c
+++ b/lib/utils/irqchip/aplic.c
@@ -269,7 +269,10 @@ int aplic_cold_irqchip_init(struct aplic_data *aplic)
            (last_deleg_irq == aplic->num_source) &&
            (first_deleg_irq == 1))) {
                sbi_domain_memregion_init(aplic->addr, aplic->size,
-                                         SBI_DOMAIN_MEMREGION_MMIO, &reg);
+                                         (SBI_DOMAIN_MEMREGION_MMIO |
+                                          SBI_DOMAIN_MEMREGION_M_READABLE |
+                                          SBI_DOMAIN_MEMREGION_M_WRITABLE),
+                                         &reg);
                rc = sbi_domain_root_add_memregion(&reg);
                if (rc)
                        return rc;

diff --git a/lib/utils/irqchip/imsic.c b/lib/utils/irqchip/imsic.c
index 98f2cb63eebe1c6022c9c64b1a8b7d99a25a4c45..11667cd90dfc42711d49a0456045b99331818fe7 100644 (file)
--- a/lib/utils/irqchip/imsic.c
+++ b/lib/utils/irqchip/imsic.c
@@ -313,7 +313,10 @@ int imsic_cold_irqchip_init(struct imsic_data *imsic)
        for (i = 0; i < IMSIC_MAX_REGS && imsic->regs[i].size; i++) {
                sbi_domain_memregion_init(imsic->regs[i].addr,
                                          imsic->regs[i].size,
-                                         SBI_DOMAIN_MEMREGION_MMIO, &reg);
+                                         (SBI_DOMAIN_MEMREGION_MMIO |
+                                          SBI_DOMAIN_MEMREGION_M_READABLE |
+                                          SBI_DOMAIN_MEMREGION_M_WRITABLE),
+                                         &reg);
                rc = sbi_domain_root_add_memregion(&reg);
                if (rc)
                        return rc;

diff --git a/lib/utils/timer/aclint_mtimer.c b/lib/utils/timer/aclint_mtimer.c
index 1846a9a7cc98ee5b8013cbb8949cc136ccfbd731..84ded4ed44e50396651b55680682b5558d9a6e7b 100644 (file)
--- a/lib/utils/timer/aclint_mtimer.c
+++ b/lib/utils/timer/aclint_mtimer.c
@@ -188,26 +188,34 @@ int aclint_mtimer_cold_init(struct aclint_mtimer_data *mt,
                rc = sbi_domain_root_add_memrange(mt->mtimecmp_addr,
                                        mt->mtime_size + mt->mtimecmp_size,
                                        MTIMER_REGION_ALIGN,
-                                       SBI_DOMAIN_MEMREGION_MMIO);
+                                       (SBI_DOMAIN_MEMREGION_MMIO |
+                                        SBI_DOMAIN_MEMREGION_M_READABLE |
+                                        SBI_DOMAIN_MEMREGION_M_WRITABLE));
                if (rc)
                        return rc;
        } else if (mt->mtimecmp_addr == (mt->mtime_addr + mt->mtime_size)) {
                rc = sbi_domain_root_add_memrange(mt->mtime_addr,
                                        mt->mtime_size + mt->mtimecmp_size,
                                        MTIMER_REGION_ALIGN,
-                                       SBI_DOMAIN_MEMREGION_MMIO);
+                                       (SBI_DOMAIN_MEMREGION_MMIO |
+                                        SBI_DOMAIN_MEMREGION_M_READABLE |
+                                        SBI_DOMAIN_MEMREGION_M_WRITABLE));
                if (rc)
                        return rc;
        } else {
                rc = sbi_domain_root_add_memrange(mt->mtime_addr,
                                                mt->mtime_size, MTIMER_REGION_ALIGN,
-                                               SBI_DOMAIN_MEMREGION_MMIO);
+                                               (SBI_DOMAIN_MEMREGION_MMIO |
+                                                SBI_DOMAIN_MEMREGION_M_READABLE |
+                                                SBI_DOMAIN_MEMREGION_M_WRITABLE));
                if (rc)
                        return rc;
 
                rc = sbi_domain_root_add_memrange(mt->mtimecmp_addr,
                                                mt->mtimecmp_size, MTIMER_REGION_ALIGN,
-                                               SBI_DOMAIN_MEMREGION_MMIO);
+                                               (SBI_DOMAIN_MEMREGION_MMIO |
+                                                SBI_DOMAIN_MEMREGION_M_READABLE |
+                                                SBI_DOMAIN_MEMREGION_M_WRITABLE));
                if (rc)
                        return rc;
        }