From patchwork Thu Sep 22 19:13:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 9346749 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3AB4F607D0 for ; Thu, 22 Sep 2016 19:21:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 239342AC90 for ; Thu, 22 Sep 2016 19:21:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 17EE02ACA8; Thu, 22 Sep 2016 19:21:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1274A2AC90 for ; Thu, 22 Sep 2016 19:21:50 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bn9Wj-0001Au-Iq; Thu, 22 Sep 2016 19:19:21 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bn9Wh-0001AF-Lr for xen-devel@lists.xen.org; Thu, 22 Sep 2016 19:19:19 +0000 Received: from [85.158.139.211] by server-14.bemta-5.messagelabs.com id 49/AF-11508-6BE24E75; Thu, 22 Sep 2016 19:19:18 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDLMWRWlGSWpSXmKPExsUyZ7p8oO42vSf hBotfMFos+biYxYHR4+ju30wBjFGsmXlJ+RUJrBnbju1kLvjEX/Hi4wOWBsaFvF2MXBxCAhOZ JB71d7FDOL8ZJc7tnc8G4WxklJi/7B+Qwwnk9DBKNDyIBrHZBIwkzh6dzghiiwhIS1z7fBnMZ hZ4wiix80Y6iC0sYC/x/chDJhCbRUBV4vP2xywgNq+Ap0Tb/8tgMyUEFCSmPHzPDGJzCnhJnO qaA7XLU+L9qnVQNYYSnzcuZZ7AyLeAkWEVo0ZxalFZapGukYVeUlFmekZJbmJmjq6hgalebmp xcWJ6ak5iUrFecn7uJkZgqNQzMDDuYOxb5XeIUZKDSUmU9732k3AhvqT8lMqMxOKM+KLSnNTi Q4wyHBxKErzrdIFygkWp6akVaZk5wKCFSUtw8CiJ8LaDpHmLCxJzizPTIVKnGBWlxHkngCQEQ BIZpXlwbbBIucQoKyXMy8jAwCDEU5BalJtZgir/ilGcg1FJmLcLZApPZl4J3PRXQIuZgBZv+f kAZHFJIkJKqoGx7eIjk0saxrPnvp5z6derrRESlon6nQlnCovNN+pO2pOw41rJ1N/3P+3sP9W 7lFGgOehsly/DhuK7D0orHswMvSfe1vlp11dDA6Hmw09d7niarpC+/6T7XWGr5gUX3qdCGvmq qXvuvjdetX9Zf9tGxtnnvr3cJjuFTbhty4eVFmkZyqtjYg9cUmIpzkg01GIuKk4EAPlHe3mPA gAA X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-10.tower-206.messagelabs.com!1474571956!43825274!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAyODgzMzk=\n X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 60714 invoked from network); 22 Sep 2016 19:19:17 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-10.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 22 Sep 2016 19:19:17 -0000 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u8MJJ7v4005458 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Sep 2016 19:19:07 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0022.oracle.com (8.14.4/8.13.8) with ESMTP id u8MJJ7ib032489 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 22 Sep 2016 19:19:07 GMT Received: from abhmp0007.oracle.com (abhmp0007.oracle.com [141.146.116.13]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id u8MJJ67l000763; Thu, 22 Sep 2016 19:19:06 GMT Received: from ovs104.us.oracle.com (/10.149.76.204) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 22 Sep 2016 12:19:06 -0700 From: Boris Ostrovsky To: xen-devel@lists.xen.org Date: Thu, 22 Sep 2016 15:13:33 -0400 Message-Id: <1474571626-6694-9-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1474571626-6694-1-git-send-email-boris.ostrovsky@oracle.com> References: <1474571626-6694-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: userv0022.oracle.com [156.151.31.74] Cc: wei.liu2@citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, julien.grall@arm.com, jbeulich@suse.com, zhaoshenglong@huawei.com, Boris Ostrovsky , roger.pau@citrix.com Subject: [Xen-devel] [PATCH v5 08/21] acpi/hvmloader: Build WAET optionally X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Boris Ostrovsky Reviewed-by: Jan Beulich --- tools/firmware/hvmloader/acpi/build.c | 10 +++++++--- tools/firmware/hvmloader/acpi/libacpi.h | 1 + tools/firmware/hvmloader/util.c | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c index dc489bb..537933b 100644 --- a/tools/firmware/hvmloader/acpi/build.c +++ b/tools/firmware/hvmloader/acpi/build.c @@ -360,9 +360,13 @@ static int construct_secondary_tables(unsigned long *table_ptrs, } /* WAET. */ - waet = construct_waet(); - if (!waet) return -1; - table_ptrs[nr_tables++] = (unsigned long)waet; + if ( config->table_flags & ACPI_HAS_WAET ) + { + waet = construct_waet(); + if ( !waet ) + return -1; + table_ptrs[nr_tables++] = (unsigned long)waet; + } if ( config->table_flags & ACPI_HAS_SSDT_PM ) { diff --git a/tools/firmware/hvmloader/acpi/libacpi.h b/tools/firmware/hvmloader/acpi/libacpi.h index b8f28a3..b411a6e 100644 --- a/tools/firmware/hvmloader/acpi/libacpi.h +++ b/tools/firmware/hvmloader/acpi/libacpi.h @@ -29,6 +29,7 @@ #define ACPI_HAS_SSDT_S4 (1<<6) #define ACPI_HAS_TCPA (1<<7) #define ACPI_HAS_IOAPIC (1<<8) +#define ACPI_HAS_WAET (1<<9) struct xen_vmemrange; struct acpi_numa { diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index aa5fc20..b345576 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -919,7 +919,7 @@ void hvmloader_acpi_build_tables(struct acpi_config *config, if ( !strncmp(xenstore_read("platform/acpi_s4", "1"), "1", 1) ) config->table_flags |= ACPI_HAS_SSDT_S4; - config->table_flags |= (ACPI_HAS_TCPA | ACPI_HAS_IOAPIC); + config->table_flags |= (ACPI_HAS_TCPA | ACPI_HAS_IOAPIC | ACPI_HAS_WAET); config->tis_hdr = (uint16_t *)ACPI_TIS_HDR_ADDRESS;