From patchwork Tue Dec 20 19:05:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 9482077 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 D0FC2606DB for ; Tue, 20 Dec 2016 19:07:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B49D7204BF for ; Tue, 20 Dec 2016 19:07:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A4532280FC; Tue, 20 Dec 2016 19:07:37 +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 99F86280D0 for ; Tue, 20 Dec 2016 19:07:36 +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 1cJPj6-0005p8-HB; Tue, 20 Dec 2016 19:05:28 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cJPj4-0005p1-RB for xen-devel@lists.xen.org; Tue, 20 Dec 2016 19:05:26 +0000 Received: from [85.158.143.35] by server-9.bemta-6.messagelabs.com id 31/C7-27165-6F089585; Tue, 20 Dec 2016 19:05:26 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRWlGSWpSXmKPExsXSO6nOVfdrQ2S EwYzzOhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8aGRVwFHfwVjZOOsDcwTufpYuTiEBLoYJJ4 uKCNCcL5xigx5+VuVghnI6PEzu4PzBDOBEaJd2sfM3YxcnKwCRhJnD06HcwWETCU2HfuAxuIz SxQLdE54xGQzcEhLOAucau5DCTMIqAq0XpoHlg5r4CnxNnja5lAbAkBOYmb5zqZIWxjib5ZfS wTGHkWMDKsYtQoTi0qSy3SNbTQSyrKTM8oyU3MzNE1NDDTy00tLk5MT81JTCrWS87P3cQI9Dw DEOxgvLkx4BCjJAeTkiivTX1khBBfUn5KZUZicUZ8UWlOavEhRhkODiUJ3miQnGBRanpqRVpm DjAEYdISHDxKIrz+IGne4oLE3OLMdIjUKUZFKXHeEpCEAEgiozQPrg0W9pcYZaWEeRmBDhHiK Ugtys0sQZV/xSjOwagkDLGdJzOvBG76K6DFTECLF3aHgywuSURISTUwsn+JLo/q7dbi3XJJS2 T9i6a4fM0X045cuhbdnxJoHv1Yf22X/8TH54tsGfZbTU30+V23pcmTWWLmuQ2/T8UJLcxN7Ol Y991ozYx/AVmCyzpYNm1ddYGvalfmrU/XAxvltHit3SXXaptL/Fzz/rysnPuNSU7hfJes7ggw Z6S3Fsn7q7tw579WYinOSDTUYi4qTgQAS8QZ53YCAAA= X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1482260724!44761019!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 5266 invoked from network); 20 Dec 2016 19:05:25 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-16.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 20 Dec 2016 19:05:25 -0000 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uBKJ5HSs021601 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 20 Dec 2016 19:05:18 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0021.oracle.com (8.13.8/8.14.4) with ESMTP id uBKJ5HUo022125 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 20 Dec 2016 19:05:17 GMT Received: from abhmp0010.oracle.com (abhmp0010.oracle.com [141.146.116.16]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id uBKJ5F7b028776; Tue, 20 Dec 2016 19:05:16 GMT Received: from ostr-laptop.us.oracle.com (/10.152.23.90) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 20 Dec 2016 11:05:15 -0800 From: Boris Ostrovsky To: xen-devel@lists.xen.org, julien.grall@arm.com Date: Tue, 20 Dec 2016 14:05:23 -0500 Message-Id: <1482260723-6193-1-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 2.7.4 X-Source-IP: aserv0021.oracle.com [141.146.126.233] Cc: wei.liu2@citrix.com, Boris Ostrovsky , ian.jackson@eu.citrix.com, jbeulich@suse.com Subject: [Xen-devel] [PATCH v2] libacpi: Don't build x86-only AML for ARM64 mk_dsdt 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 Commit d6ac8e22c7c5 ("acpi/x86: define ACPI IO registers for PVH guests") broke ARM64 build of mk_dsdt.c due to introduction of XEN_ACPI_CPU_MAP[_LEN] macros that are needed only for x86 guests. We could fix the build by dealing specifically with those macros but since post-MADT code is not executed on ARM64 anyway we can compile it for x86 only. Signed-off-by: Boris Ostrovsky --- v2: #ifdef for pci_hotplug_notify() and decision_tree() that are used by x86-only code. tools/libacpi/mk_dsdt.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/libacpi/mk_dsdt.c b/tools/libacpi/mk_dsdt.c index 9421f3f..7bb5aa0 100644 --- a/tools/libacpi/mk_dsdt.c +++ b/tools/libacpi/mk_dsdt.c @@ -78,6 +78,7 @@ static void pop_block(void) printf("}\n"); } +#ifdef CONFIG_X86 static void pci_hotplug_notify(unsigned int slt) { stmt("Notify", "\\_SB.PCI0.S%02X, EVT", slt); @@ -99,6 +100,7 @@ static void decision_tree( decision_tree(s, (s+e)/2, var, leaf); pop_block(); } +#endif static struct option options[] = { { "maxcpu", 1, 0, 'c' }, @@ -109,10 +111,10 @@ static struct option options[] = { int main(int argc, char **argv) { - unsigned int slot, dev, intx, link, cpu, max_cpus; + unsigned int cpu, max_cpus; dm_version dm_version = QEMU_XEN_TRADITIONAL; - #if defined(CONFIG_X86) + unsigned int slot, dev, intx, link; max_cpus = HVM_MAX_VCPUS; #elif defined(CONFIG_ARM_64) max_cpus = GUEST_MAX_VCPUS; @@ -242,7 +244,7 @@ int main(int argc, char **argv) pop_block(); /**** DSDT DefinitionBlock end ****/ return 0; -#endif +#else /* Operation Region 'PRST': bitmask of online CPUs. */ stmt("OperationRegion", "PRST, SystemIO, %#x, %d", @@ -524,6 +526,7 @@ int main(int argc, char **argv) /**** DSDT DefinitionBlock end ****/ return 0; +#endif } /*