From patchwork Mon Sep 7 14:23:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 515166 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 7B77614018C for ; Tue, 8 Sep 2015 00:41:43 +1000 (AEST) Received: from localhost ([::1]:56993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYxc5-0003YL-PY for incoming@patchwork.ozlabs.org; Mon, 07 Sep 2015 10:41:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45594) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYxLO-0003b3-UR for qemu-devel@nongnu.org; Mon, 07 Sep 2015 10:24:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZYxLK-0008Jv-EW for qemu-devel@nongnu.org; Mon, 07 Sep 2015 10:24:26 -0400 Received: from mail-wi0-f181.google.com ([209.85.212.181]:34077) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZYxLK-0008EB-9Z for qemu-devel@nongnu.org; Mon, 07 Sep 2015 10:24:22 -0400 Received: by wicfx3 with SMTP id fx3so90466771wic.1 for ; Mon, 07 Sep 2015 07:24:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gONp1If1upe1HhTRaDeWBaKlx2TzlrNLwyFZKwYKYmU=; b=PH/dJQByUTLorYh6j8vo5DxNbJybMABoEqu02G8nMnCrp3yF1W6+Aus1dEuNSc8c7T buzHDa6XEc7lDD4Dbi0BIAccPUQiLTMti4xhfbOgzxEedLyaAQU3kKo8ajVm6EqsH+uS Ad5D0+q7Vszz15Yuj9VJas6e/utn7Z3kobE4J+wYNy6upt2sxOV4T8Fp2DIMUSFHcX9D 8m58esvkDcBmCVQ7ryZbEZgtYUzY8GHqVAVBrzt/F3t8VnyIurlcxaCF/pLH8Sirpnn9 p0Gg11LbtGLenz4UsDKudbPzv1iCDIe+a0EC/0M455iKgpgOjAHP3wtlaTR45WymoKzH 7F1A== X-Gm-Message-State: ALoCoQkasIqd//n8KDS1Gisl8ASMfHoQKe9xDkBBHDChfNI/nwTfMu2ZlxM+4LYV5Sxw6Hi0/gTF X-Received: by 10.180.8.68 with SMTP id p4mr35834331wia.27.1441635839965; Mon, 07 Sep 2015 07:23:59 -0700 (PDT) Received: from mohikan.mushroom.smurfnet.nu (cpc4-cmbg17-2-0-cust71.5-4.cable.virginm.net. [86.14.224.72]) by smtp.gmail.com with ESMTPSA id lz10sm20311076wjb.48.2015.09.07.07.23.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Sep 2015 07:23:59 -0700 (PDT) From: Leif Lindholm To: qemu-devel@nongnu.org Date: Mon, 7 Sep 2015 15:23:46 +0100 Message-Id: <1441635826-4866-3-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1441635826-4866-1-git-send-email-leif.lindholm@linaro.org> References: <1441635826-4866-1-git-send-email-leif.lindholm@linaro.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.212.181 Cc: peter.maydell@linaro.org, drjones@redhat.com, shannon.zhao@linaro.org, al.stone@linaro.org Subject: [Qemu-devel] [PATCH 2/2] hw/arm/virt-acpi-build: Add DBG2 table X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add a DBG2 table, describing the pl011 UART. Signed-off-by: Leif Lindholm --- hw/arm/virt-acpi-build.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 9088248..6d53dbe 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -352,6 +352,38 @@ build_rsdp(GArray *rsdp_table, GArray *linker, unsigned rsdt) } static void +build_dbg2(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info) +{ + AcpiDebugPort2 *dbg2; + const MemMapEntry *uart_memmap = &guest_info->memmap[VIRT_UART]; + + dbg2 = acpi_data_push(table_data, sizeof(*dbg2)); + + dbg2->debug_devices_offset = 44; + dbg2->number_debug_devices = 1; + dbg2->debug_devices[0].revision = 0; + dbg2->debug_devices[0].length = 40; + dbg2->debug_devices[0].number_generic_address_registers = 1; + dbg2->debug_devices[0].namespace_string_length = 2; + dbg2->debug_devices[0].namespace_string_offset = 38; + dbg2->debug_devices[0].oem_data_length = 0; + dbg2->debug_devices[0].oem_data_offset = 0; + dbg2->debug_devices[0].port_type = 0x8000; /* Serial */ + dbg2->debug_devices[0].port_subtype = 0x3; /* ARM PL011 UART */ + dbg2->debug_devices[0].base_address_register_offset = 22; + + dbg2->debug_devices[0].base_address[0].space_id = AML_SYSTEM_MEMORY; + dbg2->debug_devices[0].base_address[0].bit_width = 8; + dbg2->debug_devices[0].base_address[0].bit_offset = 0; + dbg2->debug_devices[0].base_address[0].access_width = 1; + dbg2->debug_devices[0].base_address[0].address = cpu_to_le64(uart_memmap->base); + + strcpy((char *)dbg2->debug_devices[0].namespace_string, "."); + + build_header(linker, table_data, (void *)dbg2, "DBG2", sizeof(*dbg2), 0); +} + +static void build_spcr(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info) { AcpiSerialPortConsoleRedirection *spcr; @@ -577,7 +609,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 MCFG SPCR pointed to by RSDT */ + /* FADT MADT GTDT MCFG DBG2 SPCR pointed to by RSDT */ acpi_add_table(table_offsets, tables_blob); build_fadt(tables_blob, tables->linker, dsdt); @@ -591,6 +623,9 @@ void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables) build_mcfg(tables_blob, tables->linker, guest_info); acpi_add_table(table_offsets, tables_blob); + build_dbg2(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 */