configs/tools: Introduce device and interrupt number limit

VT-d interrupt remapping but also (one day) AMD IOMMUs require us to
dimension related tables during setup. Introduce two parameters to the
config file, one set an upper limit of interrupts (all types) that the
system may have to control (for all cells) and another one for devices
in the system. The former will be used for VT-d, the latter should once
be helpful for AMD support, thus it can remain unset in Intel configs.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>

diff --git a/hypervisor/include/jailhouse/cell-config.h b/hypervisor/include/jailhouse/cell-config.h
index 2c6c68577c5f52419181b2ac358fef27b21bd7f9..6648b1750c947a753316e5a6a4ed4760ded9ca3e 100644 (file)
--- a/hypervisor/include/jailhouse/cell-config.h
+++ b/hypervisor/include/jailhouse/cell-config.h
@@ -92,6 +92,8 @@ struct jailhouse_system {
                        __u64 dmar_unit_base[JAILHOUSE_MAX_DMAR_UNITS];
                } x86;
        } platform_info;
+       __u32 device_limit;
+       __u32 interrupt_limit;
        struct jailhouse_cell_desc root_cell;
 } __attribute__((packed));
 

diff --git a/tools/root-cell-config.c.tmpl b/tools/root-cell-config.c.tmpl
index fe85a5109162f3189c063dced99a20ed08f9e7cf..8e7f3a13f920ee876070ce65a53d3b57a54133f7 100644 (file)
--- a/tools/root-cell-config.c.tmpl
+++ b/tools/root-cell-config.c.tmpl
@@ -44,6 +44,8 @@ struct {
                        },
                        % endif
                },
+               .device_limit = 128,
+               .interrupt_limit = 256,
                .root_cell = {
                        .name = "RootCell",
                        .cpu_set_size = sizeof(config.cpus),