From: Boris Ostrovsky <boris.ostrovsky@oracle.com>
To: xen-devel@lists.xen.org
Cc: Keir Fraser <keir@xen.org>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Ian Jackson <ian.jackson@eu.citrix.com>,
Jan Beulich <jbeulich@suse.com>, Wei Liu <wei.liu2@citrix.com>,
Boris Ostrovsky <boris.ostrovsky@oracle.com>,
roger.pau@citrix.com
Subject: [PATCH RFC 12/20] acpi/hvmloader: Link ACPI object files directly
Date: Tue, 5 Apr 2016 21:25:41 -0400 [thread overview]
Message-ID: <1459905949-10358-13-git-send-email-boris.ostrovsky@oracle.com> (raw)
In-Reply-To: <1459905949-10358-1-git-send-email-boris.ostrovsky@oracle.com>
ACPI sources will be available to various component which will build
them according to their own rules. ACPI directory will only build
sources.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---
tools/firmware/hvmloader/Makefile | 17 ++++++++++++++---
tools/firmware/hvmloader/acpi/Makefile | 9 ++-------
tools/firmware/hvmloader/hvmloader.c | 2 +-
tools/firmware/hvmloader/ovmf.c | 2 +-
tools/firmware/hvmloader/rombios.c | 2 +-
tools/firmware/hvmloader/seabios.c | 2 +-
tools/firmware/hvmloader/util.c | 2 +-
tools/firmware/rombios/32bit/Makefile | 2 +-
tools/firmware/rombios/32bit/tcgbios/Makefile | 2 +-
tools/firmware/rombios/32bit/util.h | 2 +-
10 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index f2f4791..ef66019 100644
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -20,8 +20,6 @@
XEN_ROOT = $(CURDIR)/../../..
include $(XEN_ROOT)/tools/firmware/Rules.mk
-SUBDIRS := acpi
-
# The HVM loader is started in 32-bit mode at the address below:
LOADADDR = 0x100000
@@ -33,10 +31,18 @@ CFLAGS += $(CFLAGS_xeninclude)
# We mustn't use tools-only public interfaces.
CFLAGS += -D__XEN_INTERFACE_VERSION__=__XEN_LATEST_INTERFACE_VERSION__
+# ACPI table builder
+ACPI_PATH = $(XEN_ROOT)/tools/firmware/hvmloader/acpi
+vpath %.c $(ACPI_PATH)
+ACPI_FILES = dsdt_anycpu.c dsdt_15cpu.c static_tables.c dsdt_anycpu_qemu_xen.c build.c
+ACPI_SRC = $(patsubst %.c,$(ACPI_PATH)/%.c,$(ACPI_FILES))
+CFLAGS += -I$(ACPI_PATH)
+
OBJS = hvmloader.o mp_tables.o util.o smbios.o
OBJS += smp.o cacheattr.o xenbus.o vnuma.o
OBJS += e820.o pci.o pir.o ctype.o
OBJS += hvm_param.o
+OBJS += $(patsubst %.c,%.o,$(ACPI_FILES))
ifeq ($(debug),y)
OBJS += tests.o
endif
@@ -95,7 +101,11 @@ all: subdirs-all
ovmf.o rombios.o seabios.o hvmloader.o: roms.inc
smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(SMBIOS_REL_DATE)\""
-hvmloader: $(OBJS) acpi/acpi.a
+.NOTPARALLEL: $(ACPI_SRC)
+$(ACPI_SRC):
+ $(MAKE) -C $(ACPI_PATH)
+
+hvmloader: $(OBJS)
$(LD) $(LDFLAGS_DIRECT) -N -Ttext $(LOADADDR) -o hvmloader.tmp $^
$(OBJCOPY) hvmloader.tmp hvmloader
rm -f hvmloader.tmp
@@ -143,6 +153,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) clean
.PHONY: distclean
distclean: clean
diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/firmware/hvmloader/acpi/Makefile
index d3e882a..4d84e4c 100644
--- a/tools/firmware/hvmloader/acpi/Makefile
+++ b/tools/firmware/hvmloader/acpi/Makefile
@@ -23,7 +23,7 @@ OBJS = $(patsubst %.c,%.o,$(C_SRC))
CFLAGS += $(CFLAGS_xeninclude)
vpath iasl $(PATH)
-all: acpi.a
+all: $(C_SRC) ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h
ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h: %.h: %.asl iasl
iasl -vs -p $* -tc $<
@@ -56,13 +56,8 @@ iasl:
@echo
@exit 1
-build.o: ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h
-
-acpi.a: $(OBJS)
- $(AR) rc $@ $(OBJS)
-
clean:
- rm -rf *.a *.o $(IASL_VER) $(IASL_VER).tar.gz $(DEPS)
+ rm -rf *.o $(IASL_VER) $(IASL_VER).tar.gz $(DEPS)
rm -rf ssdt_*.h dsdt*.c *~ *.aml *.hex mk_dsdt dsdt_*.asl
distclean: clean
diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c
index 716d03c..c8311a1 100644
--- a/tools/firmware/hvmloader/hvmloader.c
+++ b/tools/firmware/hvmloader/hvmloader.c
@@ -24,7 +24,7 @@
#include "config.h"
#include "pci_regs.h"
#include "apic_regs.h"
-#include "acpi/acpi2_0.h"
+#include "acpi2_0.h"
#include "vnuma.h"
#include <xen/version.h>
#include <xen/hvm/params.h>
diff --git a/tools/firmware/hvmloader/ovmf.c b/tools/firmware/hvmloader/ovmf.c
index 74fec56..e7c48a5 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/acpi2_0.h"
+#include "acpi2_0.h"
#include "apic_regs.h"
#include "../rombios/config.h"
#include "util.h"
diff --git a/tools/firmware/hvmloader/rombios.c b/tools/firmware/hvmloader/rombios.c
index 1f8fc2d..863c1a7 100644
--- a/tools/firmware/hvmloader/rombios.c
+++ b/tools/firmware/hvmloader/rombios.c
@@ -24,7 +24,7 @@
#include "../rombios/config.h"
#include "smbios_types.h"
-#include "acpi/acpi2_0.h"
+#include "acpi2_0.h"
#include "pci_regs.h"
#include "util.h"
#include "hypercall.h"
diff --git a/tools/firmware/hvmloader/seabios.c b/tools/firmware/hvmloader/seabios.c
index 9f66a79..5184275 100644
--- a/tools/firmware/hvmloader/seabios.c
+++ b/tools/firmware/hvmloader/seabios.c
@@ -25,7 +25,7 @@
#include "util.h"
#include "smbios_types.h"
-#include "acpi/acpi2_0.h"
+#include "acpi2_0.h"
#define ROM_INCLUDE_SEABIOS
#include "roms.inc"
diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c
index d099adb..a21d3cb 100644
--- a/tools/firmware/hvmloader/util.c
+++ b/tools/firmware/hvmloader/util.c
@@ -22,7 +22,7 @@
#include "hypercall.h"
#include "ctype.h"
#include "vnuma.h"
-#include "acpi/acpi2_0.h"
+#include "acpi2_0.h"
#include <stdint.h>
#include <xen/xen.h>
#include <xen/memory.h>
diff --git a/tools/firmware/rombios/32bit/Makefile b/tools/firmware/rombios/32bit/Makefile
index 396906c..9b523bd 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..
+CFLAGS += $(CFLAGS_xeninclude) -I.. -I$(XEN_ROOT)/tools/firmware/hvmloader/acpi/
SUBDIRS = tcgbios
diff --git a/tools/firmware/rombios/32bit/tcgbios/Makefile b/tools/firmware/rombios/32bit/tcgbios/Makefile
index f6f2649..6555028 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../..
+CFLAGS += $(CFLAGS_xeninclude) -I.. -I../.. -I$(XEN_ROOT)/tools/firmware/hvmloader/acpi/
.PHONY: all
all: $(TARGET)
diff --git a/tools/firmware/rombios/32bit/util.h b/tools/firmware/rombios/32bit/util.h
index e245be6..8f8ab35 100644
--- a/tools/firmware/rombios/32bit/util.h
+++ b/tools/firmware/rombios/32bit/util.h
@@ -1,7 +1,7 @@
#ifndef UTIL_H
#define UTIL_H
-#include "../hvmloader/acpi/acpi2_0.h"
+#include "acpi2_0.h"
void outb(uint16_t addr, uint8_t val);
void outw(uint16_t addr, uint16_t val);
--
2.4.3
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-04-06 1:25 UTC|newest]
Thread overview: 91+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-06 1:25 [PATCH RFC 00/20] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
2016-04-06 1:25 ` [PATCH RFC 01/20] hvmloader: Provide hvmloader_acpi_build_tables() Boris Ostrovsky
2016-06-02 12:42 ` Jan Beulich
2016-06-02 16:39 ` Boris Ostrovsky
2016-04-06 1:25 ` [PATCH RFC 02/20] acpi/hvmloader: Move acpi_info initialization out of ACPI code Boris Ostrovsky
2016-06-02 12:54 ` Jan Beulich
2016-06-02 16:54 ` Boris Ostrovsky
2016-06-03 12:13 ` Jan Beulich
2016-06-03 14:42 ` Boris Ostrovsky
2016-06-03 14:55 ` Jan Beulich
2016-06-03 15:29 ` Boris Ostrovsky
2016-04-06 1:25 ` [PATCH RFC 03/20] acpi/hvmloader: Initialize vm_gid data outside " Boris Ostrovsky
2016-06-02 13:03 ` Jan Beulich
2016-06-02 17:01 ` Boris Ostrovsky
2016-04-06 1:25 ` [PATCH RFC 04/20] acpi/hvmloader: Decide which SSDTs to build in hvmloader Boris Ostrovsky
2016-06-02 13:07 ` Jan Beulich
2016-04-06 1:25 ` [PATCH RFC 05/20] acpi/hvmloader: Move passthrough initialization from ACPI code Boris Ostrovsky
2016-06-02 13:52 ` Jan Beulich
2016-04-06 1:25 ` [PATCH RFC 06/20] acpi/hvmloader: Collect processor and NUMA info in hvmloader Boris Ostrovsky
2016-06-02 14:05 ` Jan Beulich
2016-06-02 17:18 ` Boris Ostrovsky
2016-06-03 12:16 ` Jan Beulich
2016-06-03 14:49 ` Boris Ostrovsky
2016-04-06 1:25 ` [PATCH RFC 07/20] acpi/hvmloader: Set TIS header address " Boris Ostrovsky
2016-06-02 14:09 ` Jan Beulich
2016-04-06 1:25 ` [PATCH RFC 08/20] acpi/hvmloader: Make providing IOAPIC in MADT optional Boris Ostrovsky
2016-04-06 1:25 ` [PATCH RFC 09/20] acpi/hvmloader: Build WAET optionally Boris Ostrovsky
2016-06-02 14:32 ` Jan Beulich
2016-04-06 1:25 ` [PATCH RFC 10/20] acpi/hvmloader: Provide address of acpi_info as an argument to ACPI code Boris Ostrovsky
2016-06-03 16:03 ` Jan Beulich
2016-04-06 1:25 ` [PATCH RFC 11/20] acpi/hvmloader: Translate all addresses when assigning addresses in ACPI tables Boris Ostrovsky
2016-06-06 10:48 ` Jan Beulich
2016-04-06 1:25 ` Boris Ostrovsky [this message]
2016-06-06 11:04 ` [PATCH RFC 12/20] acpi/hvmloader: Link ACPI object files directly Jan Beulich
2016-06-06 14:20 ` Boris Ostrovsky
2016-06-06 14:29 ` Jan Beulich
2016-06-06 14:49 ` Boris Ostrovsky
2016-06-06 14:57 ` Jan Beulich
2016-06-06 15:31 ` Andrew Cooper
2016-06-06 15:41 ` Jan Beulich
2016-04-06 1:25 ` [PATCH RFC 13/20] acpi/hvmloader: Add stdio.h, string.h and x86.h Boris Ostrovsky
2016-06-06 11:31 ` Jan Beulich
2016-06-06 15:08 ` Boris Ostrovsky
2016-06-06 15:22 ` Jan Beulich
2016-04-06 1:25 ` [PATCH RFC 14/20] acpi/hvmloader: Replace mem_alloc() and virt_to_phys() with memory ops Boris Ostrovsky
2016-06-06 12:58 ` Jan Beulich
2016-06-06 15:46 ` Boris Ostrovsky
2016-04-06 1:25 ` [PATCH RFC 15/20] acpi: Move ACPI code to xen/common/libacpi Boris Ostrovsky
2016-06-06 13:05 ` Jan Beulich
2016-06-06 16:09 ` Boris Ostrovsky
2016-06-07 6:20 ` Jan Beulich
2016-06-07 12:24 ` Roger Pau Monné
2016-06-07 14:32 ` Boris Ostrovsky
2016-04-06 1:25 ` [PATCH RFC 16/20] x86/vlapic: Don't try to accept 8259 interrupt if !has_vpic() Boris Ostrovsky
2016-06-03 16:14 ` Jan Beulich
2016-06-03 17:50 ` Boris Ostrovsky
2016-04-06 1:25 ` [PATCH RFC 17/20] x86: Allow LAPIC-only emulation_flags for HVM guests Boris Ostrovsky
2016-06-03 16:18 ` Jan Beulich
2016-04-06 1:25 ` [PATCH RFC 18/20] libxc/acpi: Build ACPI tables for HVMlite guests Boris Ostrovsky
2016-06-02 16:26 ` Roger Pau Monné
2016-06-06 12:03 ` Wei Liu
2016-06-06 15:15 ` Boris Ostrovsky
2016-06-16 8:54 ` Wei Liu
2016-06-16 13:07 ` Boris Ostrovsky
2016-06-06 13:29 ` Jan Beulich
2016-06-06 16:59 ` Boris Ostrovsky
2016-06-07 6:17 ` Jan Beulich
2016-06-07 13:59 ` Boris Ostrovsky
2016-06-07 14:10 ` Jan Beulich
2016-06-07 14:47 ` Boris Ostrovsky
2016-06-07 15:00 ` Jan Beulich
2016-04-06 1:25 ` [PATCH RFC 19/20] acpi: Set HW_REDUCED_ACPI in FADT if IOAPIC is not supported Boris Ostrovsky
2016-06-06 13:38 ` Jan Beulich
2016-06-06 17:31 ` Boris Ostrovsky
2016-06-07 6:06 ` Jan Beulich
2016-06-07 14:02 ` Boris Ostrovsky
2016-06-07 14:12 ` Jan Beulich
2016-06-07 15:17 ` Boris Ostrovsky
2016-06-07 15:41 ` Jan Beulich
2016-06-08 22:04 ` Boris Ostrovsky
2016-06-09 8:13 ` Roger Pau Monné
2016-06-09 8:41 ` Jan Beulich
2016-06-09 14:09 ` Boris Ostrovsky
2016-04-06 1:25 ` [PATCH RFC 20/20] acpi: Make ACPI builder available to hypervisor code Boris Ostrovsky
2016-06-06 13:48 ` Jan Beulich
2016-05-09 20:10 ` [PATCH RFC 00/20] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
2016-05-10 7:25 ` Jan Beulich
2016-06-02 12:40 ` Jan Beulich
2016-06-02 16:37 ` Boris Ostrovsky
2016-06-03 7:18 ` Roger Pau Monné
2016-06-03 10:08 ` Jan Beulich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459905949-10358-13-git-send-email-boris.ostrovsky@oracle.com \
--to=boris.ostrovsky@oracle.com \
--cc=andrew.cooper3@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=jbeulich@suse.com \
--cc=keir@xen.org \
--cc=roger.pau@citrix.com \
--cc=stefano.stabellini@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).