From patchwork Thu Aug 4 21:06:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 9264323 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 CCD636089F for ; Thu, 4 Aug 2016 21:15:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BC62328210 for ; Thu, 4 Aug 2016 21:15:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B0C6B28407; Thu, 4 Aug 2016 21:15:54 +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 51E1528405 for ; Thu, 4 Aug 2016 21:15:54 +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 1bVPxI-00019z-IE; Thu, 04 Aug 2016 21:13:28 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bVPxH-00019J-6O for xen-devel@lists.xen.org; Thu, 04 Aug 2016 21:13:27 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 9B/2F-12460-6FFA3A75; Thu, 04 Aug 2016 21:13:26 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrHLMWRWlGSWpSXmKPExsUyZ7p8oO6X9Yv DDdbvNrNY8nExiwOjx9Hdv5kCGKNYM/OS8isSWDPWnN3FXrBbomJzcytTA+M9kS5GLg4hgXYm iftH/jBBOJ8ZJWbveMgO4WxglPjS9Z0VwulhlOhc28zcxcjJwSZgJHH26HRGEFtEQFri2ufLj CBFzAK3GCW2/74DViQs4CXx6n0bC4jNIqAqMbn1NVicFyje3A9RIyGgIDHl4Xswm1PAW+LW51 VgthBQzcSW6ewQNcYS7W8vsk1g5FvAyLCKUaM4tagstUjXyEwvqSgzPaMkNzEzR9fQwFQvN7W 4ODE9NScxqVgvOT93EyMwXOoZGBh3MN6e7HeIUZKDSUmU91X14nAhvqT8lMqMxOKM+KLSnNTi Q4wyHBxKErzL1gHlBItS01Mr0jJzgIELk5bg4FES4dUFSfMWFyTmFmemQ6ROMSpKifNeBUkIg CQySvPg2mDRcolRVkqYl5GBgUGIpyC1KDezBFX+FaM4B6OSMG82MPaEeDLzSuCmvwJazAS0+I TBApDFJYkIKakGRh/2RpEjukd+Hj/OyTHzxdsASQutkE+Pr5vI6tk8lhbbxvPVqpv9zGWBH5w TVGvW3bgiIO0rt/S/VqIZT8azxdXqez/6ByW/nBcUISSz81A469XoJcYf2EzyHZo7Dkz/9Nx0 0sfSSWs2ZkrIyeeH72KrMtY0a3+/f6LZ1MNBs+JS1Q4fPixjoMRSnJFoqMVcVJwIAIEvGHiRA gAA X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1470345203!51368027!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.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 13372 invoked from network); 4 Aug 2016 21:13:24 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-5.tower-206.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 4 Aug 2016 21:13:24 -0000 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u74LD9WI001751 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 4 Aug 2016 21:13:10 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by aserv0022.oracle.com (8.13.8/8.13.8) with ESMTP id u74LD9Km007320 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 4 Aug 2016 21:13:09 GMT Received: from abhmp0015.oracle.com (abhmp0015.oracle.com [141.146.116.21]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u74LD3D3014468; Thu, 4 Aug 2016 21:13:08 GMT Received: from ovs104.us.oracle.com (/10.149.76.204) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 04 Aug 2016 14:13:03 -0700 From: Boris Ostrovsky To: xen-devel@lists.xen.org Date: Thu, 4 Aug 2016 17:06:29 -0400 Message-Id: <1470344811-14225-2-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1470344811-14225-1-git-send-email-boris.ostrovsky@oracle.com> References: <1470344811-14225-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: aserv0022.oracle.com [141.146.126.234] 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@oracle.com, roger.pau@citrix.com Subject: [Xen-devel] [PATCH v2 01/23] hvmloader: Provide hvmloader_acpi_build_tables() 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 In preparation for moving out ACPI builder make all BIOSes call hvmloader_acpi_build_tables() instead of calling ACPI code directly. No functional changes. Signed-off-by: Boris Ostrovsky Acked-by: Jan Beulich --- tools/firmware/hvmloader/ovmf.c | 2 +- tools/firmware/hvmloader/rombios.c | 2 +- tools/firmware/hvmloader/seabios.c | 2 +- tools/firmware/hvmloader/util.c | 7 +++++++ tools/firmware/hvmloader/util.h | 4 ++++ 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/tools/firmware/hvmloader/ovmf.c b/tools/firmware/hvmloader/ovmf.c index 59d0e45..1c8a71b 100644 --- a/tools/firmware/hvmloader/ovmf.c +++ b/tools/firmware/hvmloader/ovmf.c @@ -127,7 +127,7 @@ static void ovmf_acpi_build_tables(void) .dsdt_15cpu_len = 0 }; - acpi_build_tables(&config, ACPI_PHYSICAL_ADDRESS); + hvmloader_acpi_build_tables(&config, ACPI_PHYSICAL_ADDRESS); } static void ovmf_create_smbios_tables(void) diff --git a/tools/firmware/hvmloader/rombios.c b/tools/firmware/hvmloader/rombios.c index 2ded844..38a86ff 100644 --- a/tools/firmware/hvmloader/rombios.c +++ b/tools/firmware/hvmloader/rombios.c @@ -181,7 +181,7 @@ static void rombios_acpi_build_tables(void) .dsdt_15cpu_len = dsdt_15cpu_len, }; - acpi_build_tables(&config, ACPI_PHYSICAL_ADDRESS); + hvmloader_acpi_build_tables(&config, ACPI_PHYSICAL_ADDRESS); } static void rombios_create_mp_tables(void) diff --git a/tools/firmware/hvmloader/seabios.c b/tools/firmware/hvmloader/seabios.c index c5d2b34..3d046fd 100644 --- a/tools/firmware/hvmloader/seabios.c +++ b/tools/firmware/hvmloader/seabios.c @@ -97,7 +97,7 @@ static void seabios_acpi_build_tables(void) .dsdt_15cpu_len = 0, }; - acpi_build_tables(&config, rsdp); + hvmloader_acpi_build_tables(&config, rsdp); add_table(rsdp); } diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c index 9382709..9af29b1 100644 --- a/tools/firmware/hvmloader/util.c +++ b/tools/firmware/hvmloader/util.c @@ -21,6 +21,7 @@ #include "config.h" #include "hypercall.h" #include "ctype.h" +#include "acpi/acpi2_0.h" #include #include #include @@ -856,6 +857,12 @@ int hpet_exists(unsigned long hpet_base) return ((hpet_id >> 16) == 0x8086); } +void hvmloader_acpi_build_tables(struct acpi_config *config, + unsigned int physical) +{ + acpi_build_tables(config, physical); +} + /* * Local variables: * mode: C diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h index 9808016..0fb266e 100644 --- a/tools/firmware/hvmloader/util.h +++ b/tools/firmware/hvmloader/util.h @@ -276,6 +276,10 @@ extern struct e820map memory_map; bool check_overlap(uint64_t start, uint64_t size, uint64_t reserved_start, uint64_t reserved_size); +struct acpi_config; +void hvmloader_acpi_build_tables(struct acpi_config *config, + unsigned int physical); + #endif /* __HVMLOADER_UTIL_H__ */ /*