Skip to content

Commit

Permalink
hw/riscv/virt-acpi-build.c: Generate SPCR table
Browse files Browse the repository at this point in the history
Generate Serial Port Console Redirection Table (SPCR) for RISC-V
virtual machine.

Signed-off-by: Sia Jee Heng <jeeheng.sia@starfivetech.com>
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Message-ID: <20240129021440.17640-3-jeeheng.sia@starfivetech.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
  • Loading branch information
Sia Jee Heng authored and alistair23 committed Mar 8, 2024
1 parent 7dd0b07 commit 3e6f1e6
Showing 1 changed file with 39 additions and 0 deletions.
39 changes: 39 additions & 0 deletions hw/riscv/virt-acpi-build.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,42 @@ acpi_dsdt_add_uart(Aml *scope, const MemMapEntry *uart_memmap,
aml_append(scope, dev);
}

/*
* Serial Port Console Redirection Table (SPCR)
* Rev: 1.07
*/

static void
spcr_setup(GArray *table_data, BIOSLinker *linker, RISCVVirtState *s)
{
AcpiSpcrData serial = {
.interface_type = 0, /* 16550 compatible */
.base_addr.id = AML_AS_SYSTEM_MEMORY,
.base_addr.width = 32,
.base_addr.offset = 0,
.base_addr.size = 1,
.base_addr.addr = s->memmap[VIRT_UART0].base,
.interrupt_type = (1 << 4),/* Bit[4] RISC-V PLIC/APLIC */
.pc_interrupt = 0,
.interrupt = UART0_IRQ,
.baud_rate = 7, /* 15200 */
.parity = 0,
.stop_bits = 1,
.flow_control = 0,
.terminal_type = 3, /* ANSI */
.language = 0, /* Language */
.pci_device_id = 0xffff, /* not a PCI device*/
.pci_vendor_id = 0xffff, /* not a PCI device*/
.pci_bus = 0,
.pci_device = 0,
.pci_function = 0,
.pci_flags = 0,
.pci_segment = 0,
};

build_spcr(table_data, linker, &serial, 2, s->oem_id, s->oem_table_id);
}

/* RHCT Node[N] starts at offset 56 */
#define RHCT_NODE_ARRAY_OFFSET 56

Expand Down Expand Up @@ -555,6 +591,9 @@ static void virt_acpi_build(RISCVVirtState *s, AcpiBuildTables *tables)
acpi_add_table(table_offsets, tables_blob);
build_rhct(tables_blob, tables->linker, s);

acpi_add_table(table_offsets, tables_blob);
spcr_setup(tables_blob, tables->linker, s);

acpi_add_table(table_offsets, tables_blob);
{
AcpiMcfgInfo mcfg = {
Expand Down

0 comments on commit 3e6f1e6

Please sign in to comment.