From: Rouven Czerwinski <r.czerwinski@xxxxxxxxxxxxxx>
We already map memory regions outside the memory banks with eXecute
Never to avoid speculative execution, but fail to do so currently for
firmware running from within a memory bank, but at a higher privilege
level.
In preparation for changing that, mark memory used by such elevated
firmware by a newly introduced OF_RESERVE_ENTRY_FLAG_RUNTIME_FW flag.
This introduces no functional change, but suitable future action could
be mapping eXecute Never or not mapping at all.
Signed-off-by: Rouven Czerwinski <r.czerwinski@xxxxxxxxxxxxxx>
Signed-off-by: Ahmad Fatoum <a.fatoum@xxxxxxxxxxxxxx>
---
Compared with Rouven's v2, rename FLAG_XN to FLASG_RUNTIME_FW and
apply it where applicable. Also change runtime_fw (previously xn)
member to be a bitfield to get an error should number of reserved
regions be changed inadequately in future.
---
arch/arm/cpu/sm.c | 3 ++-
arch/arm/cpu/start.c | 3 ++-
arch/arm/mach-layerscape/ppa.c | 2 +-
common/bootm.c | 3 ++-
drivers/of/fdt.c | 6 +++++-
drivers/video/fb.c | 3 ++-
drivers/video/simplefb-fixup.c | 2 +-
fs/pstore/ram.c | 3 ++-
include/of.h | 6 +++++-
9 files changed, 22 insertions(+), 9 deletions(-)
diff --git a/arch/arm/cpu/sm.c b/arch/arm/cpu/sm.c
index f5a1edbd4fe9..a404f843ecb2 100644
--- a/arch/arm/cpu/sm.c
+++ b/arch/arm/cpu/sm.c
@@ -203,7 +203,8 @@ static int of_secure_monitor_fixup(struct device_node *root, void *unused)
res_start = (unsigned long)_stext;
res_end = (unsigned long)__bss_stop;
- of_add_reserve_entry(res_start, res_end);
+ /* MMU is already set up by now, so this only affects kernel DT */
+ of_add_reserve_entry(res_start, res_end, OF_RESERVE_ENTRY_FLAG_RUNTIME_FW);
pr_debug("Reserved memory range from 0x%08lx to 0x%08lx\n", res_start, res_end);
diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
index c61db668658b..9935bc8d53e3 100644
--- a/arch/arm/cpu/start.c
+++ b/arch/arm/cpu/start.c
@@ -227,7 +227,8 @@ __noreturn __no_sanitize_address void barebox_non_pbl_start(unsigned long membas
mem_malloc_init((void *)malloc_start, (void *)malloc_end - 1);
if (IS_ENABLED(CONFIG_BOOTM_OPTEE))
- of_add_reserve_entry(endmem - OPTEE_SIZE, endmem - 1);
+ of_add_reserve_entry(endmem - OPTEE_SIZE, endmem - 1,
+ OF_RESERVE_ENTRY_FLAG_RUNTIME_FW);
pr_debug("starting barebox...\n");
diff --git a/arch/arm/mach-layerscape/ppa.c b/arch/arm/mach-layerscape/ppa.c
index d962fba75105..a862ece69c6d 100644
--- a/arch/arm/mach-layerscape/ppa.c
+++ b/arch/arm/mach-layerscape/ppa.c
@@ -130,7 +130,7 @@ int ls1046a_ppa_init(resource_size_t ppa_start, resource_size_t ppa_size)
if (ret)
return ret;
- of_add_reserve_entry(ppa_start, ppa_end);
+ of_add_reserve_entry(ppa_start, ppa_end, OF_RESERVE_ENTRY_FLAG_RUNTIME_FW);
return 0;
}
diff --git a/common/bootm.c b/common/bootm.c
index 3c80e8bf949b..463fd3721c81 100644
--- a/common/bootm.c
+++ b/common/bootm.c
@@ -411,7 +411,8 @@ void *bootm_get_devicetree(struct image_data *data)
if (data->initrd_res) {
of_add_initrd(data->of_root_node, data->initrd_res->start,
data->initrd_res->end);
- of_add_reserve_entry(data->initrd_res->start, data->initrd_res->end);
+ of_add_reserve_entry(data->initrd_res->start,
+ data->initrd_res->end, 0);
}
oftree = of_get_fixed_tree(data->of_root_node);
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 5ccbd1bb69f8..4a4eeba24bc3 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -536,7 +536,8 @@ out_free:
static struct of_reserve_map of_reserve_map;
-int of_add_reserve_entry(resource_size_t start, resource_size_t end)
+int of_add_reserve_entry(resource_size_t start, resource_size_t end,
+ int flags)
{
int e = of_reserve_map.num_entries;
@@ -547,6 +548,9 @@ int of_add_reserve_entry(resource_size_t start, resource_size_t end)
of_reserve_map.end[e] = end;
of_reserve_map.num_entries++;
+ if (flags & OF_RESERVE_ENTRY_FLAG_RUNTIME_FW)
+ of_reserve_map.runtime_fw |= BIT(e);
+
return 0;
}
diff --git a/drivers/video/fb.c b/drivers/video/fb.c
index 1c93dafbc989..e0a73dd415a4 100644
--- a/drivers/video/fb.c
+++ b/drivers/video/fb.c
@@ -203,7 +203,8 @@ static int fb_of_reserve_fixup(struct device_node *root, void *context)
return 0;
of_add_reserve_entry((unsigned long)info->screen_base,
- (unsigned long)info->screen_base + info->screen_size);
+ (unsigned long)info->screen_base + info->screen_size,
+ 0);
return 0;
}
diff --git a/drivers/video/simplefb-fixup.c b/drivers/video/simplefb-fixup.c
index a2c59de364a5..af7554d10ffd 100644
--- a/drivers/video/simplefb-fixup.c
+++ b/drivers/video/simplefb-fixup.c
@@ -131,7 +131,7 @@ static int simplefb_create_node(struct device_node *root,
return ret;
of_add_reserve_entry((u32)fbi->screen_base,
- (u32)fbi->screen_base + fbi->screen_size);
+ (u32)fbi->screen_base + fbi->screen_size, 0);
return of_property_write_string(node, "status", "okay");
}
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c
index 0d8bb8f418f4..d0ebc7a37901 100644
--- a/fs/pstore/ram.c
+++ b/fs/pstore/ram.c
@@ -639,7 +639,8 @@ static int ramoops_probe(struct device_d *dev)
ramoops_ecc);
globalvar_add_simple("linux.bootargs.ramoops", kernelargs);
} else {
- of_add_reserve_entry(cxt->phys_addr, cxt->phys_addr + mem_size);
+ of_add_reserve_entry(cxt->phys_addr, cxt->phys_addr + mem_size,
+ 0);
of_register_fixup(ramoops_of_fixup, pdata);
}
diff --git a/include/of.h b/include/of.h
index 46b96277d581..0d125d8256d6 100644
--- a/include/of.h
+++ b/include/of.h
@@ -55,9 +55,13 @@ struct of_reserve_map {
uint64_t start[OF_MAX_RESERVE_MAP];
uint64_t end[OF_MAX_RESERVE_MAP];
int num_entries;
+ u16 runtime_fw : OF_MAX_RESERVE_MAP;
};
-int of_add_reserve_entry(resource_size_t start, resource_size_t end);
+#define OF_RESERVE_ENTRY_FLAG_RUNTIME_FW BIT(0)
+
+int of_add_reserve_entry(resource_size_t start, resource_size_t end,
+ int flags);
struct of_reserve_map *of_get_reserve_map(void);
void of_clean_reserve_map(void);
void fdt_add_reserve_map(void *fdt);
--
2.30.2
_______________________________________________
barebox mailing list
barebox@xxxxxxxxxxxxxxxxxxx
http://lists.infradead.org/mailman/listinfo/barebox
