[kvm-unit-tests PATCH 22/33] arm: gic-v3-its: Use shared pages wherever needed

Suzuki K Poulose
2024-04-12T10:38:48Z

GICv3-ITS is emulated by the host and thus we should allocate shared pages for
access by the host. Make sure the allocations are shared.

Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
---
lib/arm/gic-v3.c | 6 ++++--
lib/arm64/gic-v3-its.c | 6 +++---
2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/arm/gic-v3.c b/lib/arm/gic-v3.c
index 2f7870ab..813cd5a6 100644
--- a/lib/arm/gic-v3.c
+++ b/lib/arm/gic-v3.c
@@ -171,7 +171,9 @@ void gicv3_lpi_alloc_tables(void)
u64 prop_val;
int cpu;

- gicv3_data.lpi_prop = alloc_pages(order);
+ assert(gicv3_redist_base());
+
+ gicv3_data.lpi_prop = alloc_pages_shared(order);

/* ID bits = 13, ie. up to 14b LPI INTID */
prop_val = (u64)(virt_to_phys(gicv3_data.lpi_prop)) | 13;
@@ -186,7 +188,7 @@ void gicv3_lpi_alloc_tables(void)

writeq(prop_val, ptr + GICR_PROPBASER);

- gicv3_data.lpi_pend[cpu] = alloc_pages(order);
+ gicv3_data.lpi_pend[cpu] = alloc_pages_shared(order);
pend_val = (u64)(virt_to_phys(gicv3_data.lpi_pend[cpu]));
writeq(pend_val, ptr + GICR_PENDBASER);
}
diff --git a/lib/arm64/gic-v3-its.c b/lib/arm64/gic-v3-its.c
index 2c69cfda..07dbeb81 100644
--- a/lib/arm64/gic-v3-its.c
+++ b/lib/arm64/gic-v3-its.c
@@ -54,7 +54,7 @@ static void its_baser_alloc_table(struct its_baser *baser, size_t size)
void *reg_addr = gicv3_its_base() + GITS_BASER + baser->index * 8;
u64 val = readq(reg_addr);

- baser->table_addr = alloc_pages(order);
+ baser->table_addr = alloc_pages_shared(order);

val |= virt_to_phys(baser->table_addr) | GITS_BASER_VALID;

@@ -70,7 +70,7 @@ static void its_cmd_queue_init(void)
unsigned long order = get_order(SZ_64K >> PAGE_SHIFT);
u64 cbaser;

- its_data.cmd_base = alloc_pages(order);
+ its_data.cmd_base = alloc_pages_shared(order);

cbaser = virt_to_phys(its_data.cmd_base) | (SZ_64K / SZ_4K - 1) | GITS_CBASER_VALID;

@@ -123,7 +123,7 @@ struct its_device *its_create_device(u32 device_id, int nr_ites)
new->nr_ites = nr_ites;

n = (its_data.typer.ite_size * nr_ites) >> PAGE_SHIFT;
- new->itt = alloc_pages(get_order(n));
+ new->itt = alloc_pages_shared(get_order(n));

its_data.nr_devices++;
return new;