From patchwork Wed Sep 7 18:59:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Ostrovsky X-Patchwork-Id: 9319823 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 F219760752 for ; Wed, 7 Sep 2016 19:08:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E947E293D4 for ; Wed, 7 Sep 2016 19:08:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DDEF029417; Wed, 7 Sep 2016 19:08:14 +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 19E4B293D4 for ; Wed, 7 Sep 2016 19:08:14 +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 1bhiA2-0004Cu-Nn; Wed, 07 Sep 2016 19:05:26 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bhiA1-0004Cc-Kn for xen-devel@lists.xen.org; Wed, 07 Sep 2016 19:05:25 +0000 Received: from [193.109.254.147] by server-2.bemta-6.messagelabs.com id 57/0E-13744-5F460D75; Wed, 07 Sep 2016 19:05:25 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrHLMWRWlGSWpSXmKPExsUyZ7p8oO6XlAv hBs8O8Fgs+biYxYHR4+ju30wBjFGsmXlJ+RUJrBn72l4zFuyyqbj96QZjA2OvaRcjF4eQQDuT xMZbCxghnK+MEncv32KCcDYwSvR9+8wK4fQwShx4O5Oli5GTg03ASOLs0emMILaIgLTEtc+Xw dqZBS4xSsy7eJwJJCEsYC8x/8dqsCIWAVWJF6/+sILYvALeErdn3QCLSwgoSEx5+J4ZxOYEim /8cpgdxBYS8JJ4/2QVM0SNsUTfrD6WCYx8CxgZVjFqFKcWlaUW6Roa6CUVZaZnlOQmZuYAeWZ 6uanFxYnpqTmJScV6yfm5mxiB4cIABDsY7y0LOMQoycGkJMq7jfVCuBBfUn5KZUZicUZ8UWlO avEhRhkODiUJ3s/JQDnBotT01Iq0zBxg4MKkJTh4lER4N4KkeYsLEnOLM9MhUqcYFaXEeZeBJ ARAEhmleXBtsGi5xCgrJczLCHSIEE9BalFuZgmq/CtGcQ5GJWHeHSBTeDLzSuCmvwJazAS0WO jUeZDFJYkIKakGxm2OV6bafvfpqaz5a8s8c8LhK/6fDv46ds3pn1LBCvOVnv1v7uyVzZybkjn 9009n+2zjt8/TlpTabFzidXGt8rnYGFXDXQHuW1w3v0g/lKC/mkf1c/o67/CF5g6yJ/lYS2b9 N0nqqmGN/sxQpbL/o2GZTK/bi+s10n9iS9fuiYswMX7ubTq5UomlOCPRUIu5qDgRAAsL+umRA gAA X-Env-Sender: boris.ostrovsky@oracle.com X-Msg-Ref: server-15.tower-27.messagelabs.com!1473275122!5217470!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 20000 invoked from network); 7 Sep 2016 19:05:23 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-15.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 7 Sep 2016 19:05:23 -0000 Received: from aserv0021.oracle.com (aserv0021.oracle.com [141.146.126.233]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u87J5DeR031855 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 7 Sep 2016 19:05:14 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0021.oracle.com (8.13.8/8.13.8) with ESMTP id u87J5DQV015077 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 7 Sep 2016 19:05:13 GMT Received: from abhmp0013.oracle.com (abhmp0013.oracle.com [141.146.116.19]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u87J5C8O002229; Wed, 7 Sep 2016 19:05:12 GMT Received: from ovs104.us.oracle.com (/10.149.76.204) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 07 Sep 2016 12:05:12 -0700 From: Boris Ostrovsky To: xen-devel@lists.xen.org Date: Wed, 7 Sep 2016 14:59:20 -0400 Message-Id: <1473274769-19129-11-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1473274769-19129-1-git-send-email-boris.ostrovsky@oracle.com> References: <1473274769-19129-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: aserv0021.oracle.com [141.146.126.233] 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 v3 10/19] acpi: Move ACPI code to tools/libacpi 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 Acked-by: Jan Beulich --- MAINTAINERS | 1 + tools/firmware/hvmloader/Makefile | 14 ++++++++------ tools/firmware/hvmloader/ovmf.c | 2 +- tools/firmware/rombios/32bit/Makefile | 2 +- tools/firmware/rombios/32bit/tcgbios/Makefile | 2 +- tools/{firmware/hvmloader/acpi => libacpi}/Makefile | 2 +- tools/{firmware/hvmloader/acpi => libacpi}/README | 0 tools/{firmware/hvmloader/acpi => libacpi}/acpi2_0.h | 0 tools/{firmware/hvmloader/acpi => libacpi}/build.c | 0 tools/{firmware/hvmloader/acpi => libacpi}/dsdt.asl | 0 tools/{firmware/hvmloader/acpi => libacpi}/libacpi.h | 0 tools/{firmware/hvmloader/acpi => libacpi}/mk_dsdt.c | 0 tools/{firmware/hvmloader/acpi => libacpi}/ssdt_pm.asl | 0 tools/{firmware/hvmloader/acpi => libacpi}/ssdt_s3.asl | 0 tools/{firmware/hvmloader/acpi => libacpi}/ssdt_s4.asl | 0 tools/{firmware/hvmloader/acpi => libacpi}/ssdt_tpm.asl | 0 tools/{firmware/hvmloader/acpi => libacpi}/static_tables.c | 0 17 files changed, 13 insertions(+), 10 deletions(-) rename tools/{firmware/hvmloader/acpi => libacpi}/Makefile (98%) rename tools/{firmware/hvmloader/acpi => libacpi}/README (100%) rename tools/{firmware/hvmloader/acpi => libacpi}/acpi2_0.h (100%) rename tools/{firmware/hvmloader/acpi => libacpi}/build.c (100%) rename tools/{firmware/hvmloader/acpi => libacpi}/dsdt.asl (100%) rename tools/{firmware/hvmloader/acpi => libacpi}/libacpi.h (100%) rename tools/{firmware/hvmloader/acpi => libacpi}/mk_dsdt.c (100%) rename tools/{firmware/hvmloader/acpi => libacpi}/ssdt_pm.asl (100%) rename tools/{firmware/hvmloader/acpi => libacpi}/ssdt_s3.asl (100%) rename tools/{firmware/hvmloader/acpi => libacpi}/ssdt_s4.asl (100%) rename tools/{firmware/hvmloader/acpi => libacpi}/ssdt_tpm.asl (100%) rename tools/{firmware/hvmloader/acpi => libacpi}/static_tables.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 97720a8..07545f3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -138,6 +138,7 @@ S: Supported F: xen/arch/x86/acpi/ F: xen/drivers/acpi/ F: xen/include/acpi/ +F: tools/libacpi/ AMD IOMMU M: Suravee Suthikulpanit diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index 77e95f1..9fa9bcc 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -20,9 +20,6 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/firmware/Rules.mk -export ACPI_BUILD_DIR=$(CURDIR) -SUBDIRS := acpi - # The HVM loader is started in 32-bit mode at the address below: LOADADDR = 0x100000 @@ -67,16 +64,20 @@ ROMS += $(ROMBIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM) $(ETHERBOOT_ROMS) endif .PHONY: all -all: subdirs-all +all: acpi subdirs-all $(MAKE) hvmloader +.PHONY: acpi +acpi: + $(MAKE) -C $(ACPI_PATH) ACPI_BUILD_DIR=$(CURDIR) + rombios.o: roms.inc smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(SMBIOS_REL_DATE)\"" -ACPI_PATH = acpi +ACPI_PATH = ../../libacpi ACPI_FILES = dsdt_anycpu.c dsdt_15cpu.c dsdt_anycpu_qemu_xen.c ACPI_OBJS = $(patsubst %.c,%.o,$(ACPI_FILES)) build.o static_tables.o -$(ACPI_OBJS): CFLAGS += -I. -DLIBACPI_STDUTILS=\"../util.h\" +$(ACPI_OBJS): CFLAGS += -I. -DLIBACPI_STDUTILS=\"$(CURDIR)/util.h\" CFLAGS += -I$(ACPI_PATH) vpath build.c $(ACPI_PATH) vpath static_tables.c $(ACPI_PATH) @@ -118,6 +119,7 @@ endif clean: subdirs-clean rm -f roms.inc roms.inc.new acpi.h rm -f hvmloader hvmloader.tmp *.o $(DEPS) + $(MAKE) -C $(ACPI_PATH) ACPI_BUILD_DIR=$(CURDIR) clean .PHONY: distclean distclean: clean diff --git a/tools/firmware/hvmloader/ovmf.c b/tools/firmware/hvmloader/ovmf.c index 0ac3416..4ff7f1d 100644 --- a/tools/firmware/hvmloader/ovmf.c +++ b/tools/firmware/hvmloader/ovmf.c @@ -23,7 +23,7 @@ #include "config.h" #include "smbios_types.h" -#include "acpi/libacpi.h" +#include "libacpi.h" #include "apic_regs.h" #include "../rombios/config.h" #include "util.h" diff --git a/tools/firmware/rombios/32bit/Makefile b/tools/firmware/rombios/32bit/Makefile index 71399d2..b0583c9 100644 --- a/tools/firmware/rombios/32bit/Makefile +++ b/tools/firmware/rombios/32bit/Makefile @@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/firmware/Rules.mk TARGET = 32bitbios_flat.h -CFLAGS += $(CFLAGS_xeninclude) -I.. -I../../hvmloader/acpi +CFLAGS += $(CFLAGS_xeninclude) -I.. -I../../../libacpi SUBDIRS = tcgbios diff --git a/tools/firmware/rombios/32bit/tcgbios/Makefile b/tools/firmware/rombios/32bit/tcgbios/Makefile index 6822027..f87d130 100644 --- a/tools/firmware/rombios/32bit/tcgbios/Makefile +++ b/tools/firmware/rombios/32bit/tcgbios/Makefile @@ -3,7 +3,7 @@ include $(XEN_ROOT)/tools/firmware/Rules.mk TARGET = tcgbiosext.o -CFLAGS += $(CFLAGS_xeninclude) -I.. -I../.. -I../../../hvmloader/acpi +CFLAGS += $(CFLAGS_xeninclude) -I.. -I../.. -I../../../../libacpi .PHONY: all all: $(TARGET) diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/libacpi/Makefile similarity index 98% rename from tools/firmware/hvmloader/acpi/Makefile rename to tools/libacpi/Makefile index f635f18..6325cd0 100644 --- a/tools/firmware/hvmloader/acpi/Makefile +++ b/tools/libacpi/Makefile @@ -12,7 +12,7 @@ # NU Lesser General Public License for more details. # -XEN_ROOT = $(CURDIR)/../../../.. +XEN_ROOT = $(CURDIR)/../../ include $(XEN_ROOT)/tools/firmware/Rules.mk MK_DSDT = $(ACPI_BUILD_DIR)/mk_dsdt diff --git a/tools/firmware/hvmloader/acpi/README b/tools/libacpi/README similarity index 100% rename from tools/firmware/hvmloader/acpi/README rename to tools/libacpi/README diff --git a/tools/firmware/hvmloader/acpi/acpi2_0.h b/tools/libacpi/acpi2_0.h similarity index 100% rename from tools/firmware/hvmloader/acpi/acpi2_0.h rename to tools/libacpi/acpi2_0.h diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/libacpi/build.c similarity index 100% rename from tools/firmware/hvmloader/acpi/build.c rename to tools/libacpi/build.c diff --git a/tools/firmware/hvmloader/acpi/dsdt.asl b/tools/libacpi/dsdt.asl similarity index 100% rename from tools/firmware/hvmloader/acpi/dsdt.asl rename to tools/libacpi/dsdt.asl diff --git a/tools/firmware/hvmloader/acpi/libacpi.h b/tools/libacpi/libacpi.h similarity index 100% rename from tools/firmware/hvmloader/acpi/libacpi.h rename to tools/libacpi/libacpi.h diff --git a/tools/firmware/hvmloader/acpi/mk_dsdt.c b/tools/libacpi/mk_dsdt.c similarity index 100% rename from tools/firmware/hvmloader/acpi/mk_dsdt.c rename to tools/libacpi/mk_dsdt.c diff --git a/tools/firmware/hvmloader/acpi/ssdt_pm.asl b/tools/libacpi/ssdt_pm.asl similarity index 100% rename from tools/firmware/hvmloader/acpi/ssdt_pm.asl rename to tools/libacpi/ssdt_pm.asl diff --git a/tools/firmware/hvmloader/acpi/ssdt_s3.asl b/tools/libacpi/ssdt_s3.asl similarity index 100% rename from tools/firmware/hvmloader/acpi/ssdt_s3.asl rename to tools/libacpi/ssdt_s3.asl diff --git a/tools/firmware/hvmloader/acpi/ssdt_s4.asl b/tools/libacpi/ssdt_s4.asl similarity index 100% rename from tools/firmware/hvmloader/acpi/ssdt_s4.asl rename to tools/libacpi/ssdt_s4.asl diff --git a/tools/firmware/hvmloader/acpi/ssdt_tpm.asl b/tools/libacpi/ssdt_tpm.asl similarity index 100% rename from tools/firmware/hvmloader/acpi/ssdt_tpm.asl rename to tools/libacpi/ssdt_tpm.asl diff --git a/tools/firmware/hvmloader/acpi/static_tables.c b/tools/libacpi/static_tables.c similarity index 100% rename from tools/firmware/hvmloader/acpi/static_tables.c rename to tools/libacpi/static_tables.c