From patchwork Fri Dec 8 15:02:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 121177 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp767165qgn; Fri, 8 Dec 2017 07:04:31 -0800 (PST) X-Google-Smtp-Source: AGs4zMaokcaZqWFhojGY65KtoCFyoXsSjWGYJaJkCYh9ICyMeMKeRsQ4kwwQdxOXSR0XZWAVAxI6 X-Received: by 10.129.160.200 with SMTP id x191mr20374801ywg.365.1512745471376; Fri, 08 Dec 2017 07:04:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512745471; cv=none; d=google.com; s=arc-20160816; b=ji4Ono6TUS8e6FKu9Liab/qI1Pm6p4HjFRqKoceQiR/DAaDNpS1O9dKx+IBb3qbQai xtcO+rns5JZUeH0NBsQK/fQf8uQobkK9OcWpD+G1BB+SoAevaPhCHJ5FSCUeQBt71XHI BBGAAkrgKEncMNNOu+ZYpJnDM2PkNq/MJwiLArBnJGz4I/w12E/akoFAm25pZMmMIrIt tAPkDNcsBAHeop2jvs/zMVQEc6fhCnzxq6sXbLrtJwsLA20H8jfdZXtje7tQMObFBV5D xXn0QYjlrtsTHAY9Uj8PuyAL8sMjialX0F9mB2vUdpUIQIfkjeeyVX2T0+9uHqD2Gu+k aikw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=6VAeUTzDZQehRD+xqkw8Xtl+DXvyTFxn0tpvyZdzXTg=; b=i2eST9/4CWtvdSuB0eS25rJgMMG72ioHkyj3WUpYpu2i/vpNZdGNGwZVyYCEKf+tQC 5gLTk7Vgm0DqCIO5/kc+bswZgj/1RuXhDFiV8UxNsJ2leWH+Rt6YdDv6JVXVBdrmE9lK q6L4H9O7UGT1OgJAuqT2ij1Fm7OAkvOZ2IqDngPo+/ZIzfUUesoqnysdglrAaMEhbZOn d1FfYOLA+ST+TlXvSKrYsJKRJHAhZbhLOaP8gxM3nXIfBv1A8aD/Z4u2cyJIssMKegtm gs31uyWYRJOShYP6j0DJO64tgO0VaBSOu3llkKbXAYFu+XM+hE6c1HVNEmFlY+7zRqIY DH9A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id g203si1709044ywe.421.2017.12.08.07.04.31 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 08 Dec 2017 07:04:31 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:37643 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNKCU-0001MG-Ve for patch@linaro.org; Fri, 08 Dec 2017 10:04:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52007) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eNKAP-0000fr-1S for qemu-devel@nongnu.org; Fri, 08 Dec 2017 10:02:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eNKAO-0007Ns-9S for qemu-devel@nongnu.org; Fri, 08 Dec 2017 10:02:21 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:38946) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eNKAH-0007Jn-GE; Fri, 08 Dec 2017 10:02:13 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1eNKAF-0000uJ-HF; Fri, 08 Dec 2017 15:02:11 +0000 From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Date: Fri, 8 Dec 2017 15:02:08 +0000 Message-Id: <1512745328-5109-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1512745328-5109-1-git-send-email-peter.maydell@linaro.org> References: <1512745328-5109-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PATCH 3/3] hw/arm/virt-acpi-build: Add second UART to ACPI tables X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Jason A . Donenfeld" , Shannon Zhao Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Add the second UART to the ACPI tables. Signed-off-by: Peter Maydell Reviewed-by: Shannon Zhao --- Pure guesswork, as I don't have a UEFI setup to hand and am not familiar with ACPI table formats either... --- hw/arm/virt-acpi-build.c | 5 +++++ 1 file changed, 5 insertions(+) -- 2.7.4 diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 3d78ff6..a38287b 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -689,6 +689,7 @@ static void build_fadt(GArray *table_data, BIOSLinker *linker, static void build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) { + VirtMachineClass *vmc = VIRT_MACHINE_GET_CLASS(vms); Aml *scope, *dsdt; const MemMapEntry *memmap = vms->memmap; const int *irqmap = vms->irqmap; @@ -706,6 +707,10 @@ build_dsdt(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms) acpi_dsdt_add_cpus(scope, vms->smp_cpus); acpi_dsdt_add_uart(scope, &memmap[VIRT_UART], (irqmap[VIRT_UART] + ARM_SPI_BASE)); + if (!vmc->no_second_uart) { + acpi_dsdt_add_uart(scope, &memmap[VIRT_UART_2], + (irqmap[VIRT_UART_2] + ARM_SPI_BASE)); + } acpi_dsdt_add_flash(scope, &memmap[VIRT_FLASH]); acpi_dsdt_add_fw_cfg(scope, &memmap[VIRT_FW_CFG]); acpi_dsdt_add_virtio(scope, &memmap[VIRT_MMIO],