| Message ID | 20230712163943.98994-7-sunilvl@ventanamicro.com |
|---|---|
| State | New |
| Headers | show |
| Series | RISC-V: ACPI: Enable AIA and update RHC | expand |
On 7/12/23 13:39, Sunil V L wrote: > Add IMSIC structure in MADT when IMSIC is configured. > > Signed-off-by: Sunil V L <sunilvl@ventanamicro.com> > --- Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com> > hw/riscv/virt-acpi-build.c | 34 ++++++++++++++++++++++++++++++++++ > 1 file changed, 34 insertions(+) > > diff --git a/hw/riscv/virt-acpi-build.c b/hw/riscv/virt-acpi-build.c > index 12b8ef0352..ebdc3bffea 100644 > --- a/hw/riscv/virt-acpi-build.c > +++ b/hw/riscv/virt-acpi-build.c > @@ -280,8 +280,20 @@ static void build_madt(GArray *table_data, > uint8_t guest_index_bits; > uint32_t imsic_size; > uint32_t local_cpu_id, socket_id; > + uint8_t hart_index_bits, group_index_bits, group_index_shift; > + uint16_t imsic_max_hart_per_socket = 0; > + uint8_t socket; > + > + for (socket = 0; socket < riscv_socket_count(ms); socket++) { > + if (imsic_max_hart_per_socket < s->soc[socket].num_harts) { > + imsic_max_hart_per_socket = s->soc[socket].num_harts; > + } > + } > > guest_index_bits = imsic_num_bits(s->aia_guests + 1); > + hart_index_bits = imsic_num_bits(imsic_max_hart_per_socket); > + group_index_bits = imsic_num_bits(riscv_socket_count(ms)); > + group_index_shift = IMSIC_MMIO_GROUP_MIN_SHIFT; > > AcpiTable table = { .sig = "APIC", .rev = 6, .oem_id = s->oem_id, > .oem_table_id = s->oem_table_id }; > @@ -306,6 +318,28 @@ static void build_madt(GArray *table_data, > s->aia_type, imsic_addr, imsic_size); > } > > + /* IMSIC */ > + if (s->aia_type == VIRT_AIA_TYPE_APLIC_IMSIC) { > + /* IMSIC */ > + build_append_int_noprefix(table_data, 0x19, 1); /* Type */ > + build_append_int_noprefix(table_data, 16, 1); /* Length */ > + build_append_int_noprefix(table_data, 1, 1); /* Version */ > + build_append_int_noprefix(table_data, 0, 1); /* Reserved */ > + build_append_int_noprefix(table_data, 0, 4); /* Flags */ > + /* Number of supervisor mode Interrupt Identities */ > + build_append_int_noprefix(table_data, VIRT_IRQCHIP_NUM_MSIS, 2); > + /* Number of guest mode Interrupt Identities */ > + build_append_int_noprefix(table_data, VIRT_IRQCHIP_NUM_MSIS, 2); > + /* Guest Index Bits */ > + build_append_int_noprefix(table_data, guest_index_bits, 1); > + /* Hart Index Bits */ > + build_append_int_noprefix(table_data, hart_index_bits, 1); > + /* Group Index Bits */ > + build_append_int_noprefix(table_data, group_index_bits, 1); > + /* Group Index Shift */ > + build_append_int_noprefix(table_data, group_index_shift, 1); > + } > + > acpi_table_end(linker, &table); > } >
diff --git a/hw/riscv/virt-acpi-build.c b/hw/riscv/virt-acpi-build.c index 12b8ef0352..ebdc3bffea 100644 --- a/hw/riscv/virt-acpi-build.c +++ b/hw/riscv/virt-acpi-build.c @@ -280,8 +280,20 @@ static void build_madt(GArray *table_data, uint8_t guest_index_bits; uint32_t imsic_size; uint32_t local_cpu_id, socket_id; + uint8_t hart_index_bits, group_index_bits, group_index_shift; + uint16_t imsic_max_hart_per_socket = 0; + uint8_t socket; + + for (socket = 0; socket < riscv_socket_count(ms); socket++) { + if (imsic_max_hart_per_socket < s->soc[socket].num_harts) { + imsic_max_hart_per_socket = s->soc[socket].num_harts; + } + } guest_index_bits = imsic_num_bits(s->aia_guests + 1); + hart_index_bits = imsic_num_bits(imsic_max_hart_per_socket); + group_index_bits = imsic_num_bits(riscv_socket_count(ms)); + group_index_shift = IMSIC_MMIO_GROUP_MIN_SHIFT; AcpiTable table = { .sig = "APIC", .rev = 6, .oem_id = s->oem_id, .oem_table_id = s->oem_table_id }; @@ -306,6 +318,28 @@ static void build_madt(GArray *table_data, s->aia_type, imsic_addr, imsic_size); } + /* IMSIC */ + if (s->aia_type == VIRT_AIA_TYPE_APLIC_IMSIC) { + /* IMSIC */ + build_append_int_noprefix(table_data, 0x19, 1); /* Type */ + build_append_int_noprefix(table_data, 16, 1); /* Length */ + build_append_int_noprefix(table_data, 1, 1); /* Version */ + build_append_int_noprefix(table_data, 0, 1); /* Reserved */ + build_append_int_noprefix(table_data, 0, 4); /* Flags */ + /* Number of supervisor mode Interrupt Identities */ + build_append_int_noprefix(table_data, VIRT_IRQCHIP_NUM_MSIS, 2); + /* Number of guest mode Interrupt Identities */ + build_append_int_noprefix(table_data, VIRT_IRQCHIP_NUM_MSIS, 2); + /* Guest Index Bits */ + build_append_int_noprefix(table_data, guest_index_bits, 1); + /* Hart Index Bits */ + build_append_int_noprefix(table_data, hart_index_bits, 1); + /* Group Index Bits */ + build_append_int_noprefix(table_data, group_index_bits, 1); + /* Group Index Shift */ + build_append_int_noprefix(table_data, group_index_shift, 1); + } + acpi_table_end(linker, &table); }
Add IMSIC structure in MADT when IMSIC is configured. Signed-off-by: Sunil V L <sunilvl@ventanamicro.com> --- hw/riscv/virt-acpi-build.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+)