From: Jan Kiszka <jan.kis...@siemens.com>
Allows bare-metal inmates to find the base SPI number of its virtual PCI
host controller.
Increment the ABI revision to conclude this change as well as the
previously generalized vpci_irq_base field.
Signed-off-by: Jan Kiszka <jan.kis...@siemens.com>
---
hypervisor/arch/arm-common/control.c | 1 +
include/arch/arm-common/asm/jailhouse_hypercall.h | 3 ++-
include/jailhouse/hypercall.h | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/hypervisor/arch/arm-common/control.c
b/hypervisor/arch/arm-common/control.c
index 106ffad4..10885f9d 100644
--- a/hypervisor/arch/arm-common/control.c
+++ b/hypervisor/arch/arm-common/control.c
@@ -168,6 +168,7 @@ void arch_cell_reset(struct cell *cell)
comm_region->gicd_base = system_config->platform_info.arm.gicd_base;
comm_region->gicc_base = system_config->platform_info.arm.gicc_base;
comm_region->gicr_base = system_config->platform_info.arm.gicr_base;
+ comm_region->vpci_irq_base = cell->config->vpci_irq_base;
/*
* All CPUs but the first are initially suspended. The first CPU
diff --git a/include/arch/arm-common/asm/jailhouse_hypercall.h
b/include/arch/arm-common/asm/jailhouse_hypercall.h
index a4fb1360..83cec97b 100644
--- a/include/arch/arm-common/asm/jailhouse_hypercall.h
+++ b/include/arch/arm-common/asm/jailhouse_hypercall.h
@@ -40,4 +40,5 @@
__u8 gic_version; \
__u64 gicd_base; \
__u64 gicc_base; \
- __u64 gicr_base;
+ __u64 gicr_base; \
+ __u32 vpci_irq_base;
diff --git a/include/jailhouse/hypercall.h b/include/jailhouse/hypercall.h
index 4fae9481..20eea801 100644
--- a/include/jailhouse/hypercall.h
+++ b/include/jailhouse/hypercall.h
@@ -102,7 +102,7 @@
#define JAILHOUSE_COMM_HAS_DBG_PUTC_ACTIVE(flags) \
!!((flags) & JAILHOUSE_COMM_FLAG_DBG_PUTC_ACTIVE)
-#define COMM_REGION_ABI_REVISION 1
+#define COMM_REGION_ABI_REVISION 2
#define COMM_REGION_MAGIC "JHCOMM"
#define COMM_REGION_GENERIC_HEADER \
--
2.16.4
--
You received this message because you are subscribed to the Google Groups
"Jailhouse" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to jailhouse-dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/jailhouse-dev/8607243c30ace3c194d56ae9b3f0273cced0bf1b.1578320435.git.jan.kiszka%40siemens.com.
