[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[RFC PATCH 22/22] hw/arm/virt: Add some memory for Realm Management Moni
From: |
Richard Henderson |
Subject: |
[RFC PATCH 22/22] hw/arm/virt: Add some memory for Realm Management Monitor |
Date: |
Mon, 23 Jan 2023 14:00:27 -1000 |
This is arbitrary, but used by the Huawei TF-A test code.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
include/hw/arm/virt.h | 2 ++
hw/arm/virt.c | 43 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 45 insertions(+)
diff --git a/include/hw/arm/virt.h b/include/hw/arm/virt.h
index c7dd59d7f1..bb7ac19358 100644
--- a/include/hw/arm/virt.h
+++ b/include/hw/arm/virt.h
@@ -86,6 +86,7 @@ enum {
VIRT_ACPI_GED,
VIRT_NVDIMM_ACPI,
VIRT_PVTIME,
+ VIRT_RMM_MEM,
VIRT_LOWMEMMAP_LAST,
};
@@ -154,6 +155,7 @@ struct VirtMachineState {
bool virt;
bool ras;
bool mte;
+ bool rmm;
bool dtb_randomness;
OnOffAuto acpi;
VirtGICType gic_version;
diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index ea2413a0ba..5f1fddd210 100644
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -158,6 +158,7 @@ static const MemMapEntry base_memmap[] = {
/* ...repeating for a total of NUM_VIRTIO_TRANSPORTS, each of that size */
[VIRT_PLATFORM_BUS] = { 0x0c000000, 0x02000000 },
[VIRT_SECURE_MEM] = { 0x0e000000, 0x01000000 },
+ [VIRT_RMM_MEM] = { 0x0f000000, 0x00100000 },
[VIRT_PCIE_MMIO] = { 0x10000000, 0x2eff0000 },
[VIRT_PCIE_PIO] = { 0x3eff0000, 0x00010000 },
[VIRT_PCIE_ECAM] = { 0x3f000000, 0x01000000 },
@@ -1601,6 +1602,25 @@ static void create_secure_ram(VirtMachineState *vms,
g_free(nodename);
}
+static void create_rmm_ram(VirtMachineState *vms,
+ MemoryRegion *sysmem,
+ MemoryRegion *tag_sysmem)
+{
+ MemoryRegion *rmm_ram = g_new(MemoryRegion, 1);
+ hwaddr base = vms->memmap[VIRT_RMM_MEM].base;
+ hwaddr size = vms->memmap[VIRT_RMM_MEM].size;
+
+ memory_region_init_ram(rmm_ram, NULL, "virt.rmm-ram", size,
+ &error_fatal);
+ memory_region_add_subregion(sysmem, base, rmm_ram);
+
+ /* do not fill in fdt to hide rmm from normal world guest */
+
+ if (tag_sysmem) {
+ create_tag_ram(tag_sysmem, base, size, "mach-virt.rmm-tag");
+ }
+}
+
static void *machvirt_dtb(const struct arm_boot_info *binfo, int *fdt_size)
{
const VirtMachineState *board = container_of(binfo, VirtMachineState,
@@ -2273,6 +2293,10 @@ static void machvirt_init(MachineState *machine)
machine->ram_size, "mach-virt.tag");
}
+ if (vms->rmm) {
+ create_rmm_ram(vms, sysmem, tag_sysmem);
+ }
+
vms->highmem_ecam &= (!firmware_loaded || aarch64);
create_rtc(vms);
@@ -2552,6 +2576,20 @@ static void virt_set_mte(Object *obj, bool value, Error
**errp)
vms->mte = value;
}
+static bool virt_get_rmm(Object *obj, Error **errp)
+{
+ VirtMachineState *vms = VIRT_MACHINE(obj);
+
+ return vms->rmm;
+}
+
+static void virt_set_rmm(Object *obj, bool value, Error **errp)
+{
+ VirtMachineState *vms = VIRT_MACHINE(obj);
+
+ vms->rmm = value;
+}
+
static char *virt_get_gic_version(Object *obj, Error **errp)
{
VirtMachineState *vms = VIRT_MACHINE(obj);
@@ -3101,6 +3139,11 @@ static void virt_machine_class_init(ObjectClass *oc,
void *data)
"guest CPU which implements the ARM "
"Memory Tagging Extension");
+ object_class_property_add_bool(oc, "rmm", virt_get_rmm, virt_set_rmm);
+ object_class_property_set_description(oc, "rmm",
+ "Set on/off to enable/disable ram "
+ "for the Realm Management Monitor");
+
object_class_property_add_bool(oc, "its", virt_get_its,
virt_set_its);
object_class_property_set_description(oc, "its",
--
2.34.1
- [PATCH 11/22] target/arm: Pipe ARMSecuritySpace through ptw.c, (continued)
- [PATCH 11/22] target/arm: Pipe ARMSecuritySpace through ptw.c, Richard Henderson, 2023/01/23
- [PATCH 12/22] target/arm: NSTable is RES0 for the RME EL3 regime, Richard Henderson, 2023/01/23
- [PATCH 13/22] target/arm: Handle Block and Page bits for security space, Richard Henderson, 2023/01/23
- [PATCH 14/22] target/arm: Handle no-execute for Realm and Root regimes, Richard Henderson, 2023/01/23
- [PATCH 15/22] target/arm: Use get_phys_addr_with_struct in S1_ptw_translate, Richard Henderson, 2023/01/23
- [PATCH 16/22] target/arm: Move s1_is_El0 into S1Translate, Richard Henderson, 2023/01/23
- [PATCH 17/22] target/arm: Use get_phys_addr_with_struct for stage2, Richard Henderson, 2023/01/23
- [PATCH 18/22] target/arm: Add GPC syndrome, Richard Henderson, 2023/01/23
- [PATCH 20/22] target/arm: Implement the granule protection check, Richard Henderson, 2023/01/23
- [PATCH 19/22] target/arm: Implement GPC exceptions, Richard Henderson, 2023/01/23
- [RFC PATCH 22/22] hw/arm/virt: Add some memory for Realm Management Monitor,
Richard Henderson <=
- [PATCH 21/22] target/arm: Enable RME for -cpu max, Richard Henderson, 2023/01/23