Re: [Qemu-devel] [PATCH v3 2/2] hw/arm/virt-acpi-build: Add SPCR table

[Michael S. Tsirkin]

On Wed, Jun 10, 2015 at 05:52:39AM -0400, Andrew Jones wrote:
> Signed-off-by: Andrew Jones <address@hidden>
> Tested-by: Shannon Zhao <address@hidden>

Acked-by: Michael S. Tsirkin <address@hidden>

> ---
>  hw/arm/virt-acpi-build.c | 43 ++++++++++++++++++++++++++++++++++++++++++-
>  1 file changed, 42 insertions(+), 1 deletion(-)
> 
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index a9373ccaca6cb..d5a8b9c0178ea 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -84,6 +84,12 @@ static void acpi_dsdt_add_uart(Aml *scope, const 
> MemMapEntry *uart_memmap,
>                 aml_interrupt(AML_CONSUMER, AML_LEVEL, AML_ACTIVE_HIGH,
>                               AML_EXCLUSIVE, uart_irq));
>      aml_append(dev, aml_name_decl("_CRS", crs));
> +
> +    /* The _ADR entry is used to link this device to the UART described
> +     * in the SPCR table, i.e. SPCR.base_address.address == _ADR.
> +     */
> +    aml_append(dev, aml_name_decl("_ADR", aml_int(uart_memmap->base)));
> +
>      aml_append(scope, dev);
>  }
>  
> @@ -334,6 +340,38 @@ build_rsdp(GArray *rsdp_table, GArray *linker, unsigned 
> rsdt)
>  }
>  
>  static void
> +build_spcr(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info)
> +{
> +    AcpiSerialPortConsoleRedirection *spcr;
> +    const MemMapEntry *uart_memmap = &guest_info->memmap[VIRT_UART];
> +    int irq = guest_info->irqmap[VIRT_UART] + ARM_SPI_BASE;
> +
> +    spcr = acpi_data_push(table_data, sizeof(*spcr));
> +
> +    spcr->interface_type = 0x3;    /* ARM PL011 UART */
> +
> +    spcr->base_address.space_id = AML_SYSTEM_MEMORY;
> +    spcr->base_address.bit_width = 8;
> +    spcr->base_address.bit_offset = 0;
> +    spcr->base_address.access_width = 1;
> +    spcr->base_address.address = cpu_to_le64(uart_memmap->base);
> +
> +    spcr->interrupt_types = (1 << 3); /* Bit[3] ARMH GIC interrupt */
> +    spcr->gsi = cpu_to_le32(irq);  /* Global System Interrupt */
> +
> +    spcr->baud = 3;                /* Baud Rate: 3 = 9600 */
> +    spcr->parity = 0;              /* No Parity */
> +    spcr->stopbits = 1;            /* 1 Stop bit */
> +    spcr->flowctrl = (1 << 1);     /* Bit[1] = RTS/CTS hardware flow control 
> */
> +    spcr->term_type = 0;           /* Terminal Type: 0 = VT100 */
> +
> +    spcr->pci_device_id = 0xffff;  /* PCI Device ID: not a PCI device */
> +    spcr->pci_vendor_id = 0xffff;  /* PCI Vendor ID: not a PCI device */
> +
> +    build_header(linker, table_data, (void *)spcr, "SPCR", sizeof(*spcr), 2);
> +}
> +
> +static void
>  build_mcfg(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info)
>  {
>      AcpiTableMcfg *mcfg;
> @@ -514,7 +552,7 @@ void virt_acpi_build(VirtGuestInfo *guest_info, 
> AcpiBuildTables *tables)
>      dsdt = tables_blob->len;
>      build_dsdt(tables_blob, tables->linker, guest_info);
>  
> -    /* FADT MADT GTDT pointed to by RSDT */
> +    /* FADT MADT GTDT SPCR pointed to by RSDT */
>      acpi_add_table(table_offsets, tables_blob);
>      build_fadt(tables_blob, tables->linker, dsdt);
>  
> @@ -527,6 +565,9 @@ void virt_acpi_build(VirtGuestInfo *guest_info, 
> AcpiBuildTables *tables)
>      acpi_add_table(table_offsets, tables_blob);
>      build_mcfg(tables_blob, tables->linker, guest_info);
>  
> +    acpi_add_table(table_offsets, tables_blob);
> +    build_spcr(tables_blob, tables->linker, guest_info);
> +
>      /* RSDT is pointed to by RSDP */
>      rsdt = tables_blob->len;
>      build_rsdt(tables_blob, tables->linker, table_offsets);
> -- 
> 1.8.3.1