From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51093) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2ify-0000DG-C5 for qemu-devel@nongnu.org; Wed, 10 Jun 2015 12:16:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z2ift-0006sY-Lw for qemu-devel@nongnu.org; Wed, 10 Jun 2015 12:16:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46651) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z2ift-0006sU-EL for qemu-devel@nongnu.org; Wed, 10 Jun 2015 12:16:21 -0400 Date: Wed, 10 Jun 2015 18:16:18 +0200 From: "Michael S. Tsirkin" Message-ID: <20150610181604-mutt-send-email-mst@redhat.com> References: <1433929959-29530-1-git-send-email-drjones@redhat.com> <1433929959-29530-3-git-send-email-drjones@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1433929959-29530-3-git-send-email-drjones@redhat.com> Subject: Re: [Qemu-devel] [PATCH v3 2/2] hw/arm/virt-acpi-build: Add SPCR table List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Andrew Jones Cc: peter.maydell@linaro.org, imammedo@redhat.com, qemu-devel@nongnu.org, shannon.zhao@linaro.org On Wed, Jun 10, 2015 at 05:52:39AM -0400, Andrew Jones wrote: > Signed-off-by: Andrew Jones > Tested-by: Shannon Zhao Acked-by: Michael S. Tsirkin > --- > 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