* [PATCH v5 01/21] acpi: Makefile should better tolerate interrupts
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-23 8:33 ` Jan Beulich
2016-09-22 19:13 ` [PATCH v5 02/21] acpi: Extract acpi info description into a separate ASL file Boris Ostrovsky
` (19 subsequent siblings)
20 siblings, 1 reply; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
Intermediate stages of building a target should be made with
temporary files that are copied to final target in the end.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---
Changes in v5:
* Now is first patch in the series
* Renamed TMP_SUFFIX to "tmp" (from "tmp__")
tools/firmware/hvmloader/acpi/Makefile | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/firmware/hvmloader/acpi/Makefile
index d3e882a..45de14a 100644
--- a/tools/firmware/hvmloader/acpi/Makefile
+++ b/tools/firmware/hvmloader/acpi/Makefile
@@ -22,6 +22,9 @@ OBJS = $(patsubst %.c,%.o,$(C_SRC))
CFLAGS += $(CFLAGS_xeninclude)
+# Suffix for temporary files.
+TMP_SUFFIX = tmp
+
vpath iasl $(PATH)
all: acpi.a
@@ -34,18 +37,21 @@ mk_dsdt: mk_dsdt.c
$(HOSTCC) $(HOSTCFLAGS) $(CFLAGS_xeninclude) -o $@ mk_dsdt.c
dsdt_anycpu_qemu_xen.asl: dsdt.asl mk_dsdt
- awk 'NR > 1 {print s} {s=$$0}' $< > $@
- ./mk_dsdt --debug=$(debug) --dm-version qemu-xen >> $@
+ awk 'NR > 1 {print s} {s=$$0}' $< > $@.$(TMP_SUFFIX)
+ ./mk_dsdt --debug=$(debug) --dm-version qemu-xen >> $@.$(TMP_SUFFIX)
+ mv -f $@.$(TMP_SUFFIX) $@
# NB. awk invocation is a portable alternative to 'head -n -1'
dsdt_%cpu.asl: dsdt.asl mk_dsdt
- awk 'NR > 1 {print s} {s=$$0}' $< > $@
- ./mk_dsdt --debug=$(debug) --maxcpu $* >> $@
+ awk 'NR > 1 {print s} {s=$$0}' $< > $@.$(TMP_SUFFIX)
+ ./mk_dsdt --debug=$(debug) --maxcpu $* >> $@.$(TMP_SUFFIX)
+ mv -f $@.$(TMP_SUFFIX) $@
$(filter dsdt_%.c,$(C_SRC)): %.c: iasl %.asl
iasl -vs -p $* -tc $*.asl
- sed -e 's/AmlCode/$*/g' $*.hex >$@
- echo "int $*_len=sizeof($*);" >>$@
+ sed -e 's/AmlCode/$*/g' $*.hex >$@.$(TMP_SUFFIX)
+ echo "int $*_len=sizeof($*);" >>$@.$(TMP_SUFFIX)
+ mv -f $@.$(TMP_SUFFIX) $@
rm -f $*.aml $*.hex
iasl:
@@ -63,7 +69,7 @@ acpi.a: $(OBJS)
clean:
rm -rf *.a *.o $(IASL_VER) $(IASL_VER).tar.gz $(DEPS)
- rm -rf ssdt_*.h dsdt*.c *~ *.aml *.hex mk_dsdt dsdt_*.asl
+ rm -rf ssdt_*.h dsdt*.c *~ *.aml *.hex mk_dsdt dsdt_*.asl *.$(TMP_SUFFIX)
distclean: clean
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* Re: [PATCH v5 01/21] acpi: Makefile should better tolerate interrupts
2016-09-22 19:13 ` [PATCH v5 01/21] acpi: Makefile should better tolerate interrupts Boris Ostrovsky
@ 2016-09-23 8:33 ` Jan Beulich
2016-09-23 11:39 ` Ian Jackson
0 siblings, 1 reply; 38+ messages in thread
From: Jan Beulich @ 2016-09-23 8:33 UTC (permalink / raw)
To: ian.jackson, Boris Ostrovsky
Cc: wei.liu2, andrew.cooper3, xen-devel, julien.grall, zhaoshenglong,
roger.pau
>>> On 22.09.16 at 21:13, <boris.ostrovsky@oracle.com> wrote:
> Intermediate stages of building a target should be made with
> temporary files that are copied to final target in the end.
>
> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> ---
> Changes in v5:
> * Now is first patch in the series
> * Renamed TMP_SUFFIX to "tmp" (from "tmp__")
I'm not really opposed to using the variable, but I think Ian didn't like
it, and I think things might read easier a little easier without. The
patch can have my ack either way, but I'd like to have Ian's opinion
before putting it in.
Jan
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v5 01/21] acpi: Makefile should better tolerate interrupts
2016-09-23 8:33 ` Jan Beulich
@ 2016-09-23 11:39 ` Ian Jackson
0 siblings, 0 replies; 38+ messages in thread
From: Ian Jackson @ 2016-09-23 11:39 UTC (permalink / raw)
To: Jan Beulich
Cc: wei.liu2, andrew.cooper3, xen-devel, julien.grall, zhaoshenglong,
Boris Ostrovsky, roger.pau
Jan Beulich writes ("Re: [PATCH v5 01/21] acpi: Makefile should better tolerate interrupts"):
> On 22.09.16 at 21:13, <boris.ostrovsky@oracle.com> wrote:
> > Intermediate stages of building a target should be made with
> > temporary files that are copied to final target in the end.
> >
> > Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> > ---
> > Changes in v5:
> > * Now is first patch in the series
> > * Renamed TMP_SUFFIX to "tmp" (from "tmp__")
>
> I'm not really opposed to using the variable, but I think Ian didn't like
> it, and I think things might read easier a little easier without. The
> patch can have my ack either way, but I'd like to have Ian's opinion
> before putting it in.
I think this is a bikeshed issue. My question was not intended to
block the patch. As far as my opinion is relevant, it can go in
regardless.
Thanks,
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v5 02/21] acpi: Extract acpi info description into a separate ASL file
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 01/21] acpi: Makefile should better tolerate interrupts Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-23 8:34 ` Jan Beulich
2016-09-22 19:13 ` [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries Boris Ostrovsky
` (18 subsequent siblings)
20 siblings, 1 reply; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
This code will be needed by PVH guests who don't want to use full DSDT.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---
.gitignore | 2 +-
tools/firmware/hvmloader/acpi/Makefile | 8 +++++---
tools/firmware/hvmloader/acpi/dsdt.asl | 19 -----------------
tools/firmware/hvmloader/acpi/dsdt_acpi_info.asl | 26 ++++++++++++++++++++++++
4 files changed, 32 insertions(+), 23 deletions(-)
create mode 100644 tools/firmware/hvmloader/acpi/dsdt_acpi_info.asl
diff --git a/.gitignore b/.gitignore
index cc64fc9..6dee857 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,7 +129,7 @@ tools/firmware/extboot/extboot.img
tools/firmware/extboot/signrom
tools/firmware/hvmloader/acpi/mk_dsdt
tools/firmware/hvmloader/acpi/dsdt*.c
-tools/firmware/hvmloader/acpi/dsdt_*.asl
+tools/firmware/hvmloader/acpi/dsdt_*cpu*.asl
tools/firmware/hvmloader/acpi/ssdt_*.h
tools/firmware/hvmloader/hvmloader
tools/firmware/hvmloader/roms.h
diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/firmware/hvmloader/acpi/Makefile
index 45de14a..f63e734 100644
--- a/tools/firmware/hvmloader/acpi/Makefile
+++ b/tools/firmware/hvmloader/acpi/Makefile
@@ -36,14 +36,16 @@ ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h: %.h: %.asl iasl
mk_dsdt: mk_dsdt.c
$(HOSTCC) $(HOSTCFLAGS) $(CFLAGS_xeninclude) -o $@ mk_dsdt.c
-dsdt_anycpu_qemu_xen.asl: dsdt.asl mk_dsdt
+dsdt_anycpu_qemu_xen.asl: dsdt.asl dsdt_acpi_info.asl mk_dsdt
awk 'NR > 1 {print s} {s=$$0}' $< > $@.$(TMP_SUFFIX)
+ cat dsdt_acpi_info.asl >> $@.$(TMP_SUFFIX)
./mk_dsdt --debug=$(debug) --dm-version qemu-xen >> $@.$(TMP_SUFFIX)
mv -f $@.$(TMP_SUFFIX) $@
# NB. awk invocation is a portable alternative to 'head -n -1'
-dsdt_%cpu.asl: dsdt.asl mk_dsdt
+dsdt_%cpu.asl: dsdt.asl dsdt_acpi_info.asl mk_dsdt
awk 'NR > 1 {print s} {s=$$0}' $< > $@.$(TMP_SUFFIX)
+ cat dsdt_acpi_info.asl >> $@.$(TMP_SUFFIX)
./mk_dsdt --debug=$(debug) --maxcpu $* >> $@.$(TMP_SUFFIX)
mv -f $@.$(TMP_SUFFIX) $@
@@ -69,7 +71,7 @@ acpi.a: $(OBJS)
clean:
rm -rf *.a *.o $(IASL_VER) $(IASL_VER).tar.gz $(DEPS)
- rm -rf ssdt_*.h dsdt*.c *~ *.aml *.hex mk_dsdt dsdt_*.asl *.$(TMP_SUFFIX)
+ rm -rf ssdt_*.h dsdt*.c *~ *.aml *.hex mk_dsdt dsdt_*cpu*.asl *.$(TMP_SUFFIX)
distclean: clean
diff --git a/tools/firmware/hvmloader/acpi/dsdt.asl b/tools/firmware/hvmloader/acpi/dsdt.asl
index bd65823..4f6db79 100644
--- a/tools/firmware/hvmloader/acpi/dsdt.asl
+++ b/tools/firmware/hvmloader/acpi/dsdt.asl
@@ -43,25 +43,6 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "Xen", "HVM", 0)
Scope (\_SB)
{
- /* ACPI_INFO_PHYSICAL_ADDRESS == 0xFC000000 */
- OperationRegion(BIOS, SystemMemory, 0xFC000000, 40)
- Field(BIOS, ByteAcc, NoLock, Preserve) {
- UAR1, 1,
- UAR2, 1,
- LTP1, 1,
- HPET, 1,
- Offset(2),
- NCPU, 16,
- PMIN, 32,
- PLEN, 32,
- MSUA, 32, /* MADT checksum address */
- MAPA, 32, /* MADT LAPIC0 address */
- VGIA, 32, /* VM generation id address */
- LMIN, 32,
- HMIN, 32,
- LLEN, 32,
- HLEN, 32
- }
/* Fix HCT test for 0x400 pci memory:
* - need to report low 640 MB mem as motherboard resource
diff --git a/tools/firmware/hvmloader/acpi/dsdt_acpi_info.asl b/tools/firmware/hvmloader/acpi/dsdt_acpi_info.asl
new file mode 100644
index 0000000..0136dce
--- /dev/null
+++ b/tools/firmware/hvmloader/acpi/dsdt_acpi_info.asl
@@ -0,0 +1,26 @@
+
+ Scope (\_SB)
+ {
+ /*
+ * BIOS region must match struct acpi_info in build.c and
+ * be located at ACPI_INFO_PHYSICAL_ADDRESS = 0xFC000000
+ */
+ OperationRegion(BIOS, SystemMemory, 0xFC000000, 40)
+ Field(BIOS, ByteAcc, NoLock, Preserve) {
+ UAR1, 1,
+ UAR2, 1,
+ LTP1, 1,
+ HPET, 1,
+ Offset(2),
+ NCPU, 16,
+ PMIN, 32,
+ PLEN, 32,
+ MSUA, 32, /* MADT checksum address */
+ MAPA, 32, /* MADT LAPIC0 address */
+ VGIA, 32, /* VM generation id address */
+ LMIN, 32,
+ HMIN, 32,
+ LLEN, 32,
+ HLEN, 32
+ }
+ }
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 01/21] acpi: Makefile should better tolerate interrupts Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 02/21] acpi: Extract acpi info description into a separate ASL file Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-23 9:18 ` Jan Beulich
2016-09-23 11:44 ` Ian Jackson
2016-09-22 19:13 ` [PATCH v5 04/21] acpi: Re-license ACPI builder files from GPLv2 to LGPLv2.1 Boris Ostrovsky
` (17 subsequent siblings)
20 siblings, 2 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
Some code (specifically, introduced by commit 801d469ad ("[HVM] ACPI
support patch 3 of 4: ACPI _PRT table.")) has only been licensed under
GPLv2. We want to prevent this code from showing up in non-GPL
binaries which might become possible after we make ACPI builder code
available to users other than hvmloader.
There are two pieces that we need to be careful about:
(1) A small chunk of code in dsdt.asl that implements _PIC method
(2) A chunk of ASL generator in mk_dsdt.c that describes with PCI
interrupt routing.
This code will now be generated by a GPL-only script which will be
invoked only when ACPI builder's Makefile is called with GPL variable
set.
We also strip license header from generated ASL files to prevent
inadverent use of those files with incorrect license.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---
Changes in v5:
* Generate GPL-only ASL with mk_dsdt_gpl.sh script
* Strip license header from generated DSDT ASL
tools/firmware/hvmloader/Makefile | 4 +
tools/firmware/hvmloader/acpi/Makefile | 14 ++-
tools/firmware/hvmloader/acpi/dsdt.asl | 14 ---
tools/firmware/hvmloader/acpi/gpl/mk_dsdt_gpl.sh | 110 +++++++++++++++++++++++
tools/firmware/hvmloader/acpi/mk_dsdt.c | 68 +-------------
5 files changed, 126 insertions(+), 84 deletions(-)
create mode 100755 tools/firmware/hvmloader/acpi/gpl/mk_dsdt_gpl.sh
diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index 9f7357f..23b0a58 100644
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -65,6 +65,10 @@ ROMBIOS_ROM := $(ROMBIOS_DIR)/BIOS-bochs-latest
ROMS += $(ROMBIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM) $(ETHERBOOT_ROMS)
endif
+# Certain parts of ACPI builder are GPL-only
+GPL = y
+export GPL
+
.PHONY: all
all: subdirs-all
$(MAKE) hvmloader
diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/firmware/hvmloader/acpi/Makefile
index f63e734..820b8a7 100644
--- a/tools/firmware/hvmloader/acpi/Makefile
+++ b/tools/firmware/hvmloader/acpi/Makefile
@@ -17,7 +17,8 @@
XEN_ROOT = $(CURDIR)/../../../..
include $(XEN_ROOT)/tools/firmware/Rules.mk
-C_SRC = build.c dsdt_anycpu.c dsdt_15cpu.c static_tables.c dsdt_anycpu_qemu_xen.c
+C_SRC-$(GPL) = build.c dsdt_anycpu.c dsdt_15cpu.c dsdt_anycpu_qemu_xen.c
+C_SRC = build.c static_tables.c $(C_SRC-y)
OBJS = $(patsubst %.c,%.o,$(C_SRC))
CFLAGS += $(CFLAGS_xeninclude)
@@ -36,18 +37,25 @@ ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h: %.h: %.asl iasl
mk_dsdt: mk_dsdt.c
$(HOSTCC) $(HOSTCFLAGS) $(CFLAGS_xeninclude) -o $@ mk_dsdt.c
-dsdt_anycpu_qemu_xen.asl: dsdt.asl dsdt_acpi_info.asl mk_dsdt
+ifeq ($(GPL),y)
+dsdt_anycpu_qemu_xen.asl: dsdt.asl dsdt_acpi_info.asl gpl/mk_dsdt_gpl.sh mk_dsdt
awk 'NR > 1 {print s} {s=$$0}' $< > $@.$(TMP_SUFFIX)
+ # Strip license comment
+ sed -i '1,/\*\//{/\/\*/,/\*\//d}' $@.$(TMP_SUFFIX)
+ ./gpl/mk_dsdt_gpl.sh >> $@.$(TMP_SUFFIX)
cat dsdt_acpi_info.asl >> $@.$(TMP_SUFFIX)
./mk_dsdt --debug=$(debug) --dm-version qemu-xen >> $@.$(TMP_SUFFIX)
mv -f $@.$(TMP_SUFFIX) $@
# NB. awk invocation is a portable alternative to 'head -n -1'
-dsdt_%cpu.asl: dsdt.asl dsdt_acpi_info.asl mk_dsdt
+dsdt_%cpu.asl: dsdt.asl dsdt_acpi_info.asl gpl/mk_dsdt_gpl.sh mk_dsdt
awk 'NR > 1 {print s} {s=$$0}' $< > $@.$(TMP_SUFFIX)
+ sed -i '1,/\*\//{/\/\*/,/\*\//d}' $@.$(TMP_SUFFIX)
+ ./gpl/mk_dsdt_gpl.sh >> $@.$(TMP_SUFFIX)
cat dsdt_acpi_info.asl >> $@.$(TMP_SUFFIX)
./mk_dsdt --debug=$(debug) --maxcpu $* >> $@.$(TMP_SUFFIX)
mv -f $@.$(TMP_SUFFIX) $@
+endif
$(filter dsdt_%.c,$(C_SRC)): %.c: iasl %.asl
iasl -vs -p $* -tc $*.asl
diff --git a/tools/firmware/hvmloader/acpi/dsdt.asl b/tools/firmware/hvmloader/acpi/dsdt.asl
index 4f6db79..13811cf 100644
--- a/tools/firmware/hvmloader/acpi/dsdt.asl
+++ b/tools/firmware/hvmloader/acpi/dsdt.asl
@@ -26,20 +26,6 @@ DefinitionBlock ("DSDT.aml", "DSDT", 2, "Xen", "HVM", 0)
Name (\APCL, 0x00010000)
Name (\PUID, 0x00)
- /* _S3 and _S4 are in separate SSDTs */
- Name (\_S5, Package (0x04)
- {
- 0x00, /* PM1a_CNT.SLP_TYP */
- 0x00, /* PM1b_CNT.SLP_TYP */
- 0x00, /* reserved */
- 0x00 /* reserved */
- })
-
- Name(PICD, 0)
- Method(_PIC, 1)
- {
- Store(Arg0, PICD)
- }
Scope (\_SB)
{
diff --git a/tools/firmware/hvmloader/acpi/gpl/mk_dsdt_gpl.sh b/tools/firmware/hvmloader/acpi/gpl/mk_dsdt_gpl.sh
new file mode 100755
index 0000000..4158b99
--- /dev/null
+++ b/tools/firmware/hvmloader/acpi/gpl/mk_dsdt_gpl.sh
@@ -0,0 +1,110 @@
+# This program is free software; you can redistribute it and/or modify it
+# under the terms and conditions of the GNU General Public License,
+# version 2, as published by the Free Software Foundation.
+#
+# This program is distributed in the hope it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+# more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; If not, see <http://www.gnu.org/licenses/>.
+#
+
+printf "\n /* Beginning of GPL-only code */\n\n"
+
+printf " /* _S3 and _S4 are in separate SSDTs */\n"
+printf " Name (\_S5, Package (0x04) {\n"
+printf " 0x00, /* PM1a_CNT.SLP_TYP */\n"
+printf " 0x00, /* PM1b_CNT.SLP_TYP */\n"
+printf " 0x00, /* reserved */\n"
+printf " 0x00 /* reserved */\n"
+printf " })\n"
+
+printf " Name(PICD, 0)\n"
+printf " Method(_PIC, 1) {\n"
+printf " Store(Arg0, PICD)\n"
+printf " }\n"
+
+
+# PCI-ISA link definitions
+
+# BUFA: List of ISA IRQs available for linking to PCI INTx.
+printf " Scope ( \_SB.PCI0 ) {\n"
+printf " Name ( BUFA, ResourceTemplate() { IRQ(Level, ActiveLow, Shared) { 5, 10, 11 } } )\n"
+# BUFB: IRQ descriptor for returning from link-device _CRS methods.
+printf " Name ( BUFB, Buffer() { 0x23, 0x00, 0x00, 0x18, 0x79, 0 } )\n"
+printf " CreateWordField ( BUFB, 0x01, IRQV )\n"
+
+links=(A B C D)
+
+for i in `seq 0 3`;
+do
+ link=${links[$i]}
+ printf " Device ( LNK$link ) {\n"
+ printf " Name ( _HID, EISAID(\"PNP0C0F\") )\n" #PCI interrupt link
+ printf " Name ( _UID, $((i+1)))\n"
+ printf " Method ( _STA, 0) {\n"
+ printf " If ( And(PIR$link, 0x80) ) {\n"
+ printf " Return ( 0x09 )\n"
+ printf " }\n"
+ printf " Else {\n"
+ printf " Return ( 0x0B )\n"
+ printf " }\n"
+ printf " }\n"
+ printf " Method ( _PRS ) {\n"
+ printf " Return ( BUFA )\n"
+ printf " }\n"
+ printf " Method ( _DIS ) {\n"
+ printf " Or ( PIR$link, 0x80, PIR$link )\n"
+ printf " }\n"
+ printf " Method ( _CRS ) {\n"
+ printf " And ( PIR$link, 0x0f, Local0 )\n"
+ printf " ShiftLeft ( 0x1, Local0, IRQV )\n"
+ printf " Return ( BUFB )\n"
+ printf " }\n"
+ printf " Method ( _SRS, 1 ) {\n"
+ printf " CreateWordField ( ARG0, 0x01, IRQ1 )\n"
+ printf " FindSetRightBit ( IRQ1, Local0 )\n"
+ printf " Decrement ( Local0 )\n"
+ printf " Store ( Local0, PIR$link )\n"
+ printf " }\n"
+ printf " }\n"
+done
+
+# PCI interrupt routing definitions
+# _PRT: Method to return routing table.
+printf " Method ( _PRT, 0 ) {\n"
+printf " If ( PICD ) {\n"
+printf " Return ( PRTA )\n"
+printf " }\n"
+printf " Return ( PRTP )\n"
+printf " }\n"
+
+# PRTP: PIC routing table (via ISA links).
+printf " Name(PRTP, Package() {\n"
+for dev in `seq 1 31`;
+do
+ for intx in `seq 0 3`; # INTA-D
+ do
+ link_idx=$(((dev+intx)&3))
+ printf " Package(){0x%04xffff, %u, \\_SB.PCI0.LNK%c, 0},\n" $dev $intx ${links[$link_idx]}
+ done
+done
+printf " })\n"
+
+# PRTA: APIC routing table (via non-legacy IOAPIC GSIs).
+printf " Name(PRTA, Package() {\n"
+for dev in `seq 1 31`;
+do
+ for intx in `seq 0 3`; # INTA-D
+ do
+ idx=$((((dev*4+dev/8+intx)&31)+16))
+ printf " Package(){0x%04xffff, %u, 0, %u},\n" $dev $intx $idx
+ done
+done
+printf " })\n"
+
+printf " }\n"
+
+printf "\n /* End of GPL-only code */\n\n"
diff --git a/tools/firmware/hvmloader/acpi/mk_dsdt.c b/tools/firmware/hvmloader/acpi/mk_dsdt.c
index b2ade89..7656b5d 100644
--- a/tools/firmware/hvmloader/acpi/mk_dsdt.c
+++ b/tools/firmware/hvmloader/acpi/mk_dsdt.c
@@ -91,7 +91,7 @@ static struct option options[] = {
int main(int argc, char **argv)
{
- unsigned int slot, dev, intx, link, cpu, max_cpus = HVM_MAX_VCPUS;
+ unsigned int slot, cpu, max_cpus = HVM_MAX_VCPUS;
dm_version dm_version = QEMU_XEN_TRADITIONAL;
for ( ; ; )
@@ -273,72 +273,6 @@ int main(int argc, char **argv)
}
} pop_block();
- /*** PCI-ISA link definitions ***/
- /* BUFA: List of ISA IRQs available for linking to PCI INTx. */
- stmt("Name", "BUFA, ResourceTemplate() { "
- "IRQ(Level, ActiveLow, Shared) { 5, 10, 11 } }");
- /* BUFB: IRQ descriptor for returning from link-device _CRS methods. */
- stmt("Name", "BUFB, Buffer() { "
- "0x23, 0x00, 0x00, 0x18, " /* IRQ descriptor */
- "0x79, 0 }"); /* End tag, null checksum */
- stmt("CreateWordField", "BUFB, 0x01, IRQV");
- /* Create four PCI-ISA link devices: LNKA, LNKB, LNKC, LNKD. */
- for ( link = 0; link < 4; link++ )
- {
- push_block("Device", "LNK%c", 'A'+link);
- stmt("Name", "_HID, EISAID(\"PNP0C0F\")"); /* PCI interrupt link */
- stmt("Name", "_UID, %u", link+1);
- push_block("Method", "_STA, 0");
- push_block("If", "And(PIR%c, 0x80)", 'A'+link);
- stmt("Return", "0x09");
- pop_block();
- push_block("Else", NULL);
- stmt("Return", "0x0B");
- pop_block();
- pop_block();
- push_block("Method", "_PRS");
- stmt("Return", "BUFA");
- pop_block();
- push_block("Method", "_DIS");
- stmt("Or", "PIR%c, 0x80, PIR%c", 'A'+link, 'A'+link);
- pop_block();
- push_block("Method", "_CRS");
- stmt("And", "PIR%c, 0x0f, Local0", 'A'+link);
- stmt("ShiftLeft", "0x1, Local0, IRQV");
- stmt("Return", "BUFB");
- pop_block();
- push_block("Method", "_SRS, 1");
- stmt("CreateWordField", "ARG0, 0x01, IRQ1");
- stmt("FindSetRightBit", "IRQ1, Local0");
- stmt("Decrement", "Local0");
- stmt("Store", "Local0, PIR%c", 'A'+link);
- pop_block();
- pop_block();
- }
-
- /*** PCI interrupt routing definitions***/
- /* _PRT: Method to return routing table. */
- push_block("Method", "_PRT, 0");
- push_block("If", "PICD");
- stmt("Return", "PRTA");
- pop_block();
- stmt("Return", "PRTP");
- pop_block();
- /* PRTP: PIC routing table (via ISA links). */
- printf("Name(PRTP, Package() {\n");
- for ( dev = 1; dev < 32; dev++ )
- for ( intx = 0; intx < 4; intx++ ) /* INTA-D */
- printf("Package(){0x%04xffff, %u, \\_SB.PCI0.LNK%c, 0},\n",
- dev, intx, 'A'+((dev+intx)&3));
- printf("})\n");
- /* PRTA: APIC routing table (via non-legacy IOAPIC GSIs). */
- printf("Name(PRTA, Package() {\n");
- for ( dev = 1; dev < 32; dev++ )
- for ( intx = 0; intx < 4; intx++ ) /* INTA-D */
- printf("Package(){0x%04xffff, %u, 0, %u},\n",
- dev, intx, ((dev*4+dev/8+intx)&31)+16);
- printf("})\n");
-
/*
* Each PCI hotplug slot needs at least two methods to handle
* the ACPI event:
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* Re: [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries
2016-09-22 19:13 ` [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries Boris Ostrovsky
@ 2016-09-23 9:18 ` Jan Beulich
2016-09-23 11:42 ` Ian Jackson
2016-09-23 14:23 ` Boris Ostrovsky
2016-09-23 11:44 ` Ian Jackson
1 sibling, 2 replies; 38+ messages in thread
From: Jan Beulich @ 2016-09-23 9:18 UTC (permalink / raw)
To: Boris Ostrovsky
Cc: wei.liu2, andrew.cooper3, ian.jackson, xen-devel, julien.grall,
zhaoshenglong, roger.pau
>>> On 22.09.16 at 21:13, <boris.ostrovsky@oracle.com> wrote:
> --- a/tools/firmware/hvmloader/Makefile
> +++ b/tools/firmware/hvmloader/Makefile
> @@ -65,6 +65,10 @@ ROMBIOS_ROM := $(ROMBIOS_DIR)/BIOS-bochs-latest
> ROMS += $(ROMBIOS_ROM) $(STDVGA_ROM) $(CIRRUSVGA_ROM) $(ETHERBOOT_ROMS)
> endif
>
> +# Certain parts of ACPI builder are GPL-only
> +GPL = y
> +export GPL
This could (and hence imo should) be a single line.
Also I think I did say so before - please use := for simple assignments
like this one.
> --- a/tools/firmware/hvmloader/acpi/Makefile
> +++ b/tools/firmware/hvmloader/acpi/Makefile
> @@ -17,7 +17,8 @@
> XEN_ROOT = $(CURDIR)/../../../..
> include $(XEN_ROOT)/tools/firmware/Rules.mk
>
> -C_SRC = build.c dsdt_anycpu.c dsdt_15cpu.c static_tables.c dsdt_anycpu_qemu_xen.c
> +C_SRC-$(GPL) = build.c dsdt_anycpu.c dsdt_15cpu.c dsdt_anycpu_qemu_xen.c
> +C_SRC = build.c static_tables.c $(C_SRC-y)
I don't think the use of tabs here is really helpful. In no case should
a blank be followed by a tab.
> @@ -36,18 +37,25 @@ ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h: %.h: %.asl iasl
> mk_dsdt: mk_dsdt.c
> $(HOSTCC) $(HOSTCFLAGS) $(CFLAGS_xeninclude) -o $@ mk_dsdt.c
>
> -dsdt_anycpu_qemu_xen.asl: dsdt.asl dsdt_acpi_info.asl mk_dsdt
> +ifeq ($(GPL),y)
> +dsdt_anycpu_qemu_xen.asl: dsdt.asl dsdt_acpi_info.asl gpl/mk_dsdt_gpl.sh mk_dsdt
> awk 'NR > 1 {print s} {s=$$0}' $< > $@.$(TMP_SUFFIX)
> + # Strip license comment
> + sed -i '1,/\*\//{/\/\*/,/\*\//d}' $@.$(TMP_SUFFIX)
> + ./gpl/mk_dsdt_gpl.sh >> $@.$(TMP_SUFFIX)
I don't think the leading ./ is necessary here, ...
> cat dsdt_acpi_info.asl >> $@.$(TMP_SUFFIX)
> ./mk_dsdt --debug=$(debug) --dm-version qemu-xen >> $@.$(TMP_SUFFIX)
... other than e.g. here.
Also I think shell scripts get better invoked via $(SHELL), to avoid
running into problems when on some file system they end up without
execute permission.
> --- /dev/null
> +++ b/tools/firmware/hvmloader/acpi/gpl/mk_dsdt_gpl.sh
> @@ -0,0 +1,110 @@
> +# This program is free software; you can redistribute it and/or modify it
> +# under the terms and conditions of the GNU General Public License,
> +# version 2, as published by the Free Software Foundation.
> +#
> +# This program is distributed in the hope it will be useful, but WITHOUT
> +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> +# more details.
> +#
> +# You should have received a copy of the GNU General Public License along with
> +# this program; If not, see <http://www.gnu.org/licenses/>.
> +#
> +
> +printf "\n /* Beginning of GPL-only code */\n\n"
> +
> +printf " /* _S3 and _S4 are in separate SSDTs */\n"
> +printf " Name (\_S5, Package (0x04) {\n"
> +printf " 0x00, /* PM1a_CNT.SLP_TYP */\n"
> +printf " 0x00, /* PM1b_CNT.SLP_TYP */\n"
> +printf " 0x00, /* reserved */\n"
> +printf " 0x00 /* reserved */\n"
> +printf " })\n"
> +
> +printf " Name(PICD, 0)\n"
> +printf " Method(_PIC, 1) {\n"
> +printf " Store(Arg0, PICD)\n"
> +printf " }\n"
Wouldn't this be better readable with "echo", avoiding all the \n
instances? Actually this seems to even apply to most if not
everything further down, as so far I didn't spot a case where
you actually pass anything other than just a format string.
> +# PCI-ISA link definitions
> +
> +# BUFA: List of ISA IRQs available for linking to PCI INTx.
> +printf " Scope ( \_SB.PCI0 ) {\n"
> +printf " Name ( BUFA, ResourceTemplate() { IRQ(Level, ActiveLow, Shared) { 5, 10, 11 } } )\n"
> +# BUFB: IRQ descriptor for returning from link-device _CRS methods.
> +printf " Name ( BUFB, Buffer() { 0x23, 0x00, 0x00, 0x18, 0x79, 0 } )\n"
> +printf " CreateWordField ( BUFB, 0x01, IRQV )\n"
> +
> +links=(A B C D)
Is this portable?
> +for i in `seq 0 3`;
> +do
I think you want to use only one of ; and newline as separator here.
And is there a reason to prefer backquotes over the imo better
legible $()?
> + link=${links[$i]}
> + printf " Device ( LNK$link ) {\n"
> + printf " Name ( _HID, EISAID(\"PNP0C0F\") )\n" #PCI interrupt link
> + printf " Name ( _UID, $((i+1)))\n"
> + printf " Method ( _STA, 0) {\n"
> + printf " If ( And(PIR$link, 0x80) ) {\n"
> + printf " Return ( 0x09 )\n"
> + printf " }\n"
> + printf " Else {\n"
Since you re-write all of this anyway, please put the Else-es on the
same lines as the closing braces.
> + printf " Return ( 0x0B )\n"
> + printf " }\n"
> + printf " }\n"
> + printf " Method ( _PRS ) {\n"
> + printf " Return ( BUFA )\n"
> + printf " }\n"
> + printf " Method ( _DIS ) {\n"
> + printf " Or ( PIR$link, 0x80, PIR$link )\n"
> + printf " }\n"
> + printf " Method ( _CRS ) {\n"
> + printf " And ( PIR$link, 0x0f, Local0 )\n"
> + printf " ShiftLeft ( 0x1, Local0, IRQV )\n"
> + printf " Return ( BUFB )\n"
> + printf " }\n"
> + printf " Method ( _SRS, 1 ) {\n"
> + printf " CreateWordField ( ARG0, 0x01, IRQ1 )\n"
> + printf " FindSetRightBit ( IRQ1, Local0 )\n"
> + printf " Decrement ( Local0 )\n"
> + printf " Store ( Local0, PIR$link )\n"
> + printf " }\n"
> + printf " }\n"
> +done
> +
> +# PCI interrupt routing definitions
> +# _PRT: Method to return routing table.
> +printf " Method ( _PRT, 0 ) {\n"
> +printf " If ( PICD ) {\n"
> +printf " Return ( PRTA )\n"
> +printf " }\n"
> +printf " Return ( PRTP )\n"
> +printf " }\n"
> +
> +# PRTP: PIC routing table (via ISA links).
> +printf " Name(PRTP, Package() {\n"
> +for dev in `seq 1 31`;
> +do
> + for intx in `seq 0 3`; # INTA-D
> + do
> + link_idx=$(((dev+intx)&3))
Just like in C, please have blanks around binary operators.
> + printf " Package(){0x%04xffff, %u, \\_SB.PCI0.LNK%c, 0},\n" $dev $intx ${links[$link_idx]}
I think you should really use \\\\ here, to avoid some shell having an
extension giving meaning to \_. And please split this long line.
Jan
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries
2016-09-23 9:18 ` Jan Beulich
@ 2016-09-23 11:42 ` Ian Jackson
2016-09-23 14:23 ` Boris Ostrovsky
1 sibling, 0 replies; 38+ messages in thread
From: Ian Jackson @ 2016-09-23 11:42 UTC (permalink / raw)
To: Jan Beulich
Cc: wei.liu2, andrew.cooper3, xen-devel, julien.grall, zhaoshenglong,
Boris Ostrovsky, roger.pau
Jan Beulich writes ("Re: [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries"):
> Also I think shell scripts get better invoked via $(SHELL), to avoid
> running into problems when on some file system they end up without
> execute permission.
My understanding is that the reason for this convention in our build
system is the concern that /bin/sh might be something horribly ancient
and buggy.
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries
2016-09-23 9:18 ` Jan Beulich
2016-09-23 11:42 ` Ian Jackson
@ 2016-09-23 14:23 ` Boris Ostrovsky
2016-09-23 14:24 ` Ian Jackson
2016-09-23 14:44 ` Jan Beulich
1 sibling, 2 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-23 14:23 UTC (permalink / raw)
To: Jan Beulich
Cc: wei.liu2, andrew.cooper3, ian.jackson, xen-devel, julien.grall,
zhaoshenglong, roger.pau
On 09/23/2016 05:18 AM, Jan Beulich wrote:
>
>> @@ -36,18 +37,25 @@ ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h: %.h: %.asl iasl
>> mk_dsdt: mk_dsdt.c
>> $(HOSTCC) $(HOSTCFLAGS) $(CFLAGS_xeninclude) -o $@ mk_dsdt.c
>>
>> -dsdt_anycpu_qemu_xen.asl: dsdt.asl dsdt_acpi_info.asl mk_dsdt
>> +ifeq ($(GPL),y)
>> +dsdt_anycpu_qemu_xen.asl: dsdt.asl dsdt_acpi_info.asl gpl/mk_dsdt_gpl.sh mk_dsdt
>> awk 'NR > 1 {print s} {s=$$0}' $< > $@.$(TMP_SUFFIX)
>> + # Strip license comment
>> + sed -i '1,/\*\//{/\/\*/,/\*\//d}' $@.$(TMP_SUFFIX)
>> + ./gpl/mk_dsdt_gpl.sh >> $@.$(TMP_SUFFIX)
> I don't think the leading ./ is necessary here, ...
>
>> cat dsdt_acpi_info.asl >> $@.$(TMP_SUFFIX)
>> ./mk_dsdt --debug=$(debug) --dm-version qemu-xen >> $@.$(TMP_SUFFIX)
> ... other than e.g. here.
What is the difference between the two?
>
> Also I think shell scripts get better invoked via $(SHELL), to avoid
> running into problems when on some file system they end up without
> execute permission.
>
>> --- /dev/null
>> +++ b/tools/firmware/hvmloader/acpi/gpl/mk_dsdt_gpl.sh
>> @@ -0,0 +1,110 @@
>> +# This program is free software; you can redistribute it and/or modify it
>> +# under the terms and conditions of the GNU General Public License,
>> +# version 2, as published by the Free Software Foundation.
>> +#
>> +# This program is distributed in the hope it will be useful, but WITHOUT
>> +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
>> +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
>> +# more details.
>> +#
>> +# You should have received a copy of the GNU General Public License along with
>> +# this program; If not, see <http://www.gnu.org/licenses/>.
>> +#
>> +
>> +printf "\n /* Beginning of GPL-only code */\n\n"
>> +
>> +printf " /* _S3 and _S4 are in separate SSDTs */\n"
>> +printf " Name (\_S5, Package (0x04) {\n"
>> +printf " 0x00, /* PM1a_CNT.SLP_TYP */\n"
>> +printf " 0x00, /* PM1b_CNT.SLP_TYP */\n"
>> +printf " 0x00, /* reserved */\n"
>> +printf " 0x00 /* reserved */\n"
>> +printf " })\n"
>> +
>> +printf " Name(PICD, 0)\n"
>> +printf " Method(_PIC, 1) {\n"
>> +printf " Store(Arg0, PICD)\n"
>> +printf " }\n"
> Wouldn't this be better readable with "echo", avoiding all the \n
> instances? Actually this seems to even apply to most if not
> everything further down, as so far I didn't spot a case where
> you actually pass anything other than just a format string.
Format string is the only reason. There are a couple of instances where
output is formatted and I felt that having both echo and printf would
feel inconsistent.
>
>> +# PCI-ISA link definitions
>> +
>> +# BUFA: List of ISA IRQs available for linking to PCI INTx.
>> +printf " Scope ( \_SB.PCI0 ) {\n"
>> +printf " Name ( BUFA, ResourceTemplate() { IRQ(Level, ActiveLow, Shared) { 5, 10, 11 } } )\n"
>> +# BUFB: IRQ descriptor for returning from link-device _CRS methods.
>> +printf " Name ( BUFB, Buffer() { 0x23, 0x00, 0x00, 0x18, 0x79, 0 } )\n"
>> +printf " CreateWordField ( BUFB, 0x01, IRQV )\n"
>> +
>> +links=(A B C D)
> Is this portable?
I heard that associative arrays sometimes have portability issues but
this is a regular one. FWIW this runs on a 2009 Fedora12.
Would 'declare -a links' help?
>
>> +for i in `seq 0 3`;
>> +do
> I think you want to use only one of ; and newline as separator here.
> And is there a reason to prefer backquotes over the imo better
> legible $()?
No reason, that's the style I usually use. I can change to $() if that's
the preferred one.
(I will resend this patch only to avoid spamming everyone with 20
already-acked patches)
-boris
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries
2016-09-23 14:23 ` Boris Ostrovsky
@ 2016-09-23 14:24 ` Ian Jackson
2016-09-23 14:35 ` Boris Ostrovsky
2016-09-23 14:44 ` Jan Beulich
1 sibling, 1 reply; 38+ messages in thread
From: Ian Jackson @ 2016-09-23 14:24 UTC (permalink / raw)
To: Boris Ostrovsky
Cc: wei.liu2, andrew.cooper3, xen-devel, julien.grall, Jan Beulich,
zhaoshenglong, roger.pau
Boris Ostrovsky writes ("Re: [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries"):
> >> +printf "\n /* Beginning of GPL-only code */\n\n"
> >> +
> >> +printf " /* _S3 and _S4 are in separate SSDTs */\n"
> >> +printf " Name (\_S5, Package (0x04) {\n"
> >> +printf " 0x00, /* PM1a_CNT.SLP_TYP */\n"
> >> +printf " 0x00, /* PM1b_CNT.SLP_TYP */\n"
> >> +printf " 0x00, /* reserved */\n"
> >> +printf " 0x00 /* reserved */\n"
> >> +printf " })\n"
> >> +
> >> +printf " Name(PICD, 0)\n"
> >> +printf " Method(_PIC, 1) {\n"
> >> +printf " Store(Arg0, PICD)\n"
> >> +printf " }\n"
> > Wouldn't this be better readable with "echo", avoiding all the \n
> > instances? Actually this seems to even apply to most if not
> > everything further down, as so far I didn't spot a case where
> > you actually pass anything other than just a format string.
>
> Format string is the only reason. There are a couple of instances where
> output is formatted and I felt that having both echo and printf would
> feel inconsistent.
I don't think there is anything wrong with inconsistency.
But really, why not make this (or most of it) a here document (ie with
<<) ? That would remove a lot of the quoting clutter (and would also
avoid any bugs where shell metacharacters or printf metacharacters are
unintentionally written unquoted).
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries
2016-09-23 14:24 ` Ian Jackson
@ 2016-09-23 14:35 ` Boris Ostrovsky
2016-09-23 14:38 ` Ian Jackson
0 siblings, 1 reply; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-23 14:35 UTC (permalink / raw)
To: Ian Jackson
Cc: wei.liu2, andrew.cooper3, xen-devel, julien.grall, Jan Beulich,
zhaoshenglong, roger.pau
On 09/23/2016 10:24 AM, Ian Jackson wrote:
> Boris Ostrovsky writes ("Re: [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries"):
>>>> +printf "\n /* Beginning of GPL-only code */\n\n"
>>>> +
>>>> +printf " /* _S3 and _S4 are in separate SSDTs */\n"
>>>> +printf " Name (\_S5, Package (0x04) {\n"
>>>> +printf " 0x00, /* PM1a_CNT.SLP_TYP */\n"
>>>> +printf " 0x00, /* PM1b_CNT.SLP_TYP */\n"
>>>> +printf " 0x00, /* reserved */\n"
>>>> +printf " 0x00 /* reserved */\n"
>>>> +printf " })\n"
>>>> +
>>>> +printf " Name(PICD, 0)\n"
>>>> +printf " Method(_PIC, 1) {\n"
>>>> +printf " Store(Arg0, PICD)\n"
>>>> +printf " }\n"
>>> Wouldn't this be better readable with "echo", avoiding all the \n
>>> instances? Actually this seems to even apply to most if not
>>> everything further down, as so far I didn't spot a case where
>>> you actually pass anything other than just a format string.
>> Format string is the only reason. There are a couple of instances where
>> output is formatted and I felt that having both echo and printf would
>> feel inconsistent.
> I don't think there is anything wrong with inconsistency.
>
> But really, why not make this (or most of it) a here document (ie with
> <<) ?
Sorry, I don't follow this. What is a "here document"?
-boris
> That would remove a lot of the quoting clutter (and would also
> avoid any bugs where shell metacharacters or printf metacharacters are
> unintentionally written unquoted).
>
> Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries
2016-09-23 14:35 ` Boris Ostrovsky
@ 2016-09-23 14:38 ` Ian Jackson
2016-09-23 14:48 ` Boris Ostrovsky
0 siblings, 1 reply; 38+ messages in thread
From: Ian Jackson @ 2016-09-23 14:38 UTC (permalink / raw)
To: Boris Ostrovsky
Cc: wei.liu2, andrew.cooper3, xen-devel, julien.grall, Jan Beulich,
zhaoshenglong, roger.pau
Boris Ostrovsky writes ("Re: [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries"):
> On 09/23/2016 10:24 AM, Ian Jackson wrote:
> > But really, why not make this (or most of it) a here document (ie with
> > <<) ?
>
> Sorry, I don't follow this. What is a "here document"?
It's a redirection from a literal, introduced with <<.
http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_07_04
You probably want the version that looks like this <<'END'
as it doesn't do interpolation on the literal text, rather than the
version without the single quotes (which _does_ do interpolation
of $ and `.)
Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries
2016-09-23 14:38 ` Ian Jackson
@ 2016-09-23 14:48 ` Boris Ostrovsky
0 siblings, 0 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-23 14:48 UTC (permalink / raw)
To: Ian Jackson
Cc: wei.liu2, andrew.cooper3, xen-devel, julien.grall, Jan Beulich,
zhaoshenglong, roger.pau
On 09/23/2016 10:38 AM, Ian Jackson wrote:
> Boris Ostrovsky writes ("Re: [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries"):
>> On 09/23/2016 10:24 AM, Ian Jackson wrote:
>>> But really, why not make this (or most of it) a here document (ie with
>>> <<) ?
>> Sorry, I don't follow this. What is a "here document"?
> It's a redirection from a literal, introduced with <<.
Ah. I've never heard "here document" term.
-boris
>
> http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html#tag_18_07_04
>
> You probably want the version that looks like this <<'END'
> as it doesn't do interpolation on the literal text, rather than the
> version without the single quotes (which _does_ do interpolation
> of $ and `.)
>
> Ian.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries
2016-09-23 14:23 ` Boris Ostrovsky
2016-09-23 14:24 ` Ian Jackson
@ 2016-09-23 14:44 ` Jan Beulich
1 sibling, 0 replies; 38+ messages in thread
From: Jan Beulich @ 2016-09-23 14:44 UTC (permalink / raw)
To: Boris Ostrovsky
Cc: wei.liu2, andrew.cooper3, ian.jackson, xen-devel, julien.grall,
zhaoshenglong, roger.pau
>>> On 23.09.16 at 16:23, <boris.ostrovsky@oracle.com> wrote:
> On 09/23/2016 05:18 AM, Jan Beulich wrote:
>>
>>> @@ -36,18 +37,25 @@ ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h: %.h: %.asl iasl
>>> mk_dsdt: mk_dsdt.c
>>> $(HOSTCC) $(HOSTCFLAGS) $(CFLAGS_xeninclude) -o $@ mk_dsdt.c
>>>
>>> -dsdt_anycpu_qemu_xen.asl: dsdt.asl dsdt_acpi_info.asl mk_dsdt
>>> +ifeq ($(GPL),y)
>>> +dsdt_anycpu_qemu_xen.asl: dsdt.asl dsdt_acpi_info.asl gpl/mk_dsdt_gpl.sh mk_dsdt
>>> awk 'NR > 1 {print s} {s=$$0}' $< > $@.$(TMP_SUFFIX)
>>> + # Strip license comment
>>> + sed -i '1,/\*\//{/\/\*/,/\*\//d}' $@.$(TMP_SUFFIX)
>>> + ./gpl/mk_dsdt_gpl.sh >> $@.$(TMP_SUFFIX)
>> I don't think the leading ./ is necessary here, ...
>>
>>> cat dsdt_acpi_info.asl >> $@.$(TMP_SUFFIX)
>>> ./mk_dsdt --debug=$(debug) --dm-version qemu-xen >> $@.$(TMP_SUFFIX)
>> ... other than e.g. here.
>
> What is the difference between the two?
The latter would then lack any directory components, and hence
would become subject to lookup through $PATH, which would fail
if . is not included in it (and which would possibly do the wrong
thing even if it was).
>>> --- /dev/null
>>> +++ b/tools/firmware/hvmloader/acpi/gpl/mk_dsdt_gpl.sh
>>> @@ -0,0 +1,110 @@
>>> +# This program is free software; you can redistribute it and/or modify it
>>> +# under the terms and conditions of the GNU General Public License,
>>> +# version 2, as published by the Free Software Foundation.
>>> +#
>>> +# This program is distributed in the hope it will be useful, but WITHOUT
>>> +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
>>> +# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
>>> +# more details.
>>> +#
>>> +# You should have received a copy of the GNU General Public License along with
>>> +# this program; If not, see <http://www.gnu.org/licenses/>.
>>> +#
>>> +
>>> +printf "\n /* Beginning of GPL-only code */\n\n"
>>> +
>>> +printf " /* _S3 and _S4 are in separate SSDTs */\n"
>>> +printf " Name (\_S5, Package (0x04) {\n"
>>> +printf " 0x00, /* PM1a_CNT.SLP_TYP */\n"
>>> +printf " 0x00, /* PM1b_CNT.SLP_TYP */\n"
>>> +printf " 0x00, /* reserved */\n"
>>> +printf " 0x00 /* reserved */\n"
>>> +printf " })\n"
>>> +
>>> +printf " Name(PICD, 0)\n"
>>> +printf " Method(_PIC, 1) {\n"
>>> +printf " Store(Arg0, PICD)\n"
>>> +printf " }\n"
>> Wouldn't this be better readable with "echo", avoiding all the \n
>> instances? Actually this seems to even apply to most if not
>> everything further down, as so far I didn't spot a case where
>> you actually pass anything other than just a format string.
>
> Format string is the only reason. There are a couple of instances where
> output is formatted and I felt that having both echo and printf would
> feel inconsistent.
Hmm, I think avoiding the many \n would warrant this slight
inconsistency.
>>> +# PCI-ISA link definitions
>>> +
>>> +# BUFA: List of ISA IRQs available for linking to PCI INTx.
>>> +printf " Scope ( \_SB.PCI0 ) {\n"
>>> +printf " Name ( BUFA, ResourceTemplate() { IRQ(Level, ActiveLow, Shared) { 5, 10, 11 } } )\n"
>>> +# BUFB: IRQ descriptor for returning from link-device _CRS methods.
>>> +printf " Name ( BUFB, Buffer() { 0x23, 0x00, 0x00, 0x18, 0x79, 0 } )\n"
>>> +printf " CreateWordField ( BUFB, 0x01, IRQV )\n"
>>> +
>>> +links=(A B C D)
>> Is this portable?
>
> I heard that associative arrays sometimes have portability issues but
> this is a regular one. FWIW this runs on a 2009 Fedora12.
>
> Would 'declare -a links' help?
I don't know - honestly I'm not a shell script expert. All I can say is
that I wasn't able to find the construct above e.g. in SUS v6.
Jan
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries
2016-09-22 19:13 ` [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries Boris Ostrovsky
2016-09-23 9:18 ` Jan Beulich
@ 2016-09-23 11:44 ` Ian Jackson
1 sibling, 0 replies; 38+ messages in thread
From: Ian Jackson @ 2016-09-23 11:44 UTC (permalink / raw)
To: Boris Ostrovsky
Cc: wei.liu2, andrew.cooper3, xen-devel, julien.grall, jbeulich,
zhaoshenglong, roger.pau
Boris Ostrovsky writes ("[PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries"):
> Some code (specifically, introduced by commit 801d469ad ("[HVM] ACPI
> support patch 3 of 4: ACPI _PRT table.")) has only been licensed under
> GPLv2. We want to prevent this code from showing up in non-GPL
> binaries which might become possible after we make ACPI builder code
> available to users other than hvmloader.
>
> There are two pieces that we need to be careful about:
> (1) A small chunk of code in dsdt.asl that implements _PIC method
> (2) A chunk of ASL generator in mk_dsdt.c that describes with PCI
> interrupt routing.
>
> This code will now be generated by a GPL-only script which will be
> invoked only when ACPI builder's Makefile is called with GPL variable
> set.
>
> We also strip license header from generated ASL files to prevent
> inadverent use of those files with incorrect license.
>
> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v5 04/21] acpi: Re-license ACPI builder files from GPLv2 to LGPLv2.1
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
` (2 preceding siblings ...)
2016-09-22 19:13 ` [PATCH v5 03/21] acpi: Prevent GPL-only code from seeping into non-GPL binaries Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-23 11:44 ` Ian Jackson
2016-11-14 20:05 ` Konrad Rzeszutek Wilk
2016-09-22 19:13 ` [PATCH v5 05/21] acpi/hvmloader: Collect processor and NUMA info in hvmloader Boris Ostrovsky
` (16 subsequent siblings)
20 siblings, 2 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: Lars Kurth, Kevin Tian, wei.liu2, Kouya Shimura, andrew.cooper3,
ian.jackson, julien.grall, Simon Horman, jbeulich, zhaoshenglong,
Stefan Berger, Boris Ostrovsky, Keir Fraser, Daniel Kiper,
roger.pau
ACPI builder is currently distributed under GPLv2 license.
We plan to make the builder available to components other than the
hvmloader (which is also GPLv2). Some of these components (such as
libxl) may be distributed under LGPL-2.1 so that they can be used by
non-GPLv2 callers. But this will not be possible if we incorporate
the ACPI builder in those other components.
To avoid this problem we are relicensing sources in ACPI bulder
directory to the Lesser GNU Public License (LGPL) version 2.1
gpl/mk_dsdt_asl.sh file will remain GPL-only pending permission to
relicense from Lenovo due to commit 801d469ad ("[HVM] ACPI support
patch 3 of 4: ACPI _PRT table."))
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Acked-by: Daniel Kiper <dkiper@net-space.pl>
Acked-by: Stefan Berger <stefanb@us.ibm.com>
Acked-by: Kouya Shimura <kouya@jp.fujitsu.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Kevin Tian <kevin.tian@intel.com>
Acked-by: Keir Fraser <keir@xen.org>
Acked-by: Simon Horman <horms@verge.net.au>
Acked-by: Lars Kurth <lars.kurth@citrix.com>
Acked-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> [for Oracle, VirtualIron and Sun contributions]
---
CC: Daniel Kiper <dkiper@net-space.pl>
CC: Stefan Berger <stefanb@us.ibm.com>
CC: Kouya Shimura <kouya@jp.fujitsu.com>
CC: Jan Beulich <jbeulich@suse.com>
CC: Kevin Tian <kevin.tian@intel.com>
CC: Keir Fraser <keir@xen.org>
CC: Simon Horman <horms@verge.net.au>
CC: Lars Kurth <lars.kurth@citrix.com>
CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
---
Changes in v5:
* dsdt.asl is also relicensed
tools/firmware/hvmloader/acpi/COPYING | 480 ++++++++++++++++++++++++++
tools/firmware/hvmloader/acpi/Makefile | 18 +-
tools/firmware/hvmloader/acpi/acpi2_0.h | 19 +-
tools/firmware/hvmloader/acpi/build.c | 18 +-
tools/firmware/hvmloader/acpi/dsdt.asl | 18 +-
tools/firmware/hvmloader/acpi/gpl/COPYING | 22 ++
tools/firmware/hvmloader/acpi/mk_dsdt.c | 12 +
tools/firmware/hvmloader/acpi/ssdt_pm.asl | 11 +-
tools/firmware/hvmloader/acpi/ssdt_s3.asl | 11 +-
tools/firmware/hvmloader/acpi/ssdt_s4.asl | 11 +-
tools/firmware/hvmloader/acpi/ssdt_tpm.asl | 18 +-
tools/firmware/hvmloader/acpi/static_tables.c | 18 +-
12 files changed, 574 insertions(+), 82 deletions(-)
create mode 100644 tools/firmware/hvmloader/acpi/COPYING
create mode 100644 tools/firmware/hvmloader/acpi/gpl/COPYING
diff --git a/tools/firmware/hvmloader/acpi/COPYING b/tools/firmware/hvmloader/acpi/COPYING
new file mode 100644
index 0000000..5f2f87e
--- /dev/null
+++ b/tools/firmware/hvmloader/acpi/COPYING
@@ -0,0 +1,480 @@
+This library is licensed under LGPL v2.1 to allow its usage in LGPL-2.1
+libraries such as libxl. Note that the only valid version of the LGPL as
+far as the files in this directory (and its subdirectories) are concerned
+is _this_ particular version of the license (i.e., *only* v2.1, not v2.2
+or v3.x, unless explicitly otherwise stated.
+
+Where clause 3 is invoked in order to relicense under the GPL then
+this shall be considered to be GPL v2 only for files which have
+specified LGPL v2.1 only.
+
+gpl sub-directory
+=================
+This directory contains a gpl sub-directory which contains code
+licensed under the GPL v2, because we have not yet been able to get
+the permission to relicense the relevant code to LGPL v2.1. See
+gpl/COPYING for more information.
+
+The makefile in this component allows to build a GPL and LGPL only
+variant of this library, the latter omits all GPL source code.
+
+
+
+ GNU LESSER GENERAL PUBLIC LICENSE
+ Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL. It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+ This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it. You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+ When we speak of free software, we are referring to freedom of use,
+not price. Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+ To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights. These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+ For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you. You must make sure that they, too, receive or can get the source
+code. If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it. And you must show them these terms so they know their rights.
+
+ We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+ To protect each distributor, we want to make it very clear that
+there is no warranty for the free library. Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+\f
+ Finally, software patents pose a constant threat to the existence of
+any free program. We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder. Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+ Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License. This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License. We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+ When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library. The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom. The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+ We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License. It also provides other free software developers Less
+of an advantage over competing non-free programs. These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries. However, the Lesser license provides advantages in certain
+special circumstances.
+
+ For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
+library does the same job as widely used non-free libraries. In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+ In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software. For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+ Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+ The precise terms and conditions for copying, distribution and
+modification follow. Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library". The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+\f
+ GNU LESSER GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+ A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+ The "Library", below, refers to any such software library or work
+which has been distributed under these terms. A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language. (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+ "Source code" for a work means the preferred form of the work for
+making modifications to it. For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+ Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it). Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+ 1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+ You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+\f
+ 2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) The modified work must itself be a software library.
+
+ b) You must cause the files modified to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ c) You must cause the whole of the work to be licensed at no
+ charge to all third parties under the terms of this License.
+
+ d) If a facility in the modified Library refers to a function or a
+ table of data to be supplied by an application program that uses
+ the facility, other than as an argument passed when the facility
+ is invoked, then you must make a good faith effort to ensure that,
+ in the event an application does not supply such function or
+ table, the facility still operates, and performs whatever part of
+ its purpose remains meaningful.
+
+ (For example, a function in a library to compute square roots has
+ a purpose that is entirely well-defined independent of the
+ application. Therefore, Subsection 2d requires that any
+ application-supplied function or table used by this function must
+ be optional: if the application does not supply it, the square
+ root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library. To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License. (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.) Do not make any other change in
+these notices.
+\f
+ Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+ This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+ 4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+ If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library". Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+ However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library". The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+ When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library. The
+threshold for this to be true is not precisely defined by law.
+
+ If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work. (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+ Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+\f
+ 6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+ You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License. You must supply a copy of this License. If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License. Also, you must do one
+of these things:
+
+ a) Accompany the work with the complete corresponding
+ machine-readable source code for the Library including whatever
+ changes were used in the work (which must be distributed under
+ Sections 1 and 2 above); and, if the work is an executable linked
+ with the Library, with the complete machine-readable "work that
+ uses the Library", as object code and/or source code, so that the
+ user can modify the Library and then relink to produce a modified
+ executable containing the modified Library. (It is understood
+ that the user who changes the contents of definitions files in the
+ Library will not necessarily be able to recompile the application
+ to use the modified definitions.)
+
+ b) Use a suitable shared library mechanism for linking with the
+ Library. A suitable mechanism is one that (1) uses at run time a
+ copy of the library already present on the user's computer system,
+ rather than copying library functions into the executable, and (2)
+ will operate properly with a modified version of the library, if
+ the user installs one, as long as the modified version is
+ interface-compatible with the version that the work was made with.
+
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
+
+ d) If distribution of the work is made by offering access to copy
+ from a designated place, offer equivalent access to copy the above
+ specified materials from the same place.
+
+ e) Verify that the user has already received a copy of these
+ materials or that you have already sent this user a copy.
+
+ For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it. However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+ It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system. Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+\f
+ 7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+ a) Accompany the combined library with a copy of the same work
+ based on the Library, uncombined with any other library
+ facilities. This must be distributed under the terms of the
+ Sections above.
+
+ b) Give prominent notice with the combined library of the fact
+ that part of it is a work based on the Library, and explaining
+ where to find the accompanying uncombined form of the same work.
+
+ 8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License. Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License. However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+ 9. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Library or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+ 10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+\f
+ 11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all. For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+ 13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation. If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+\f
+ 14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission. For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this. Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+ NO WARRANTY
+
+ 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+ 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+ END OF TERMS AND CONDITIONS
diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/firmware/hvmloader/acpi/Makefile
index 820b8a7..b14b3ea 100644
--- a/tools/firmware/hvmloader/acpi/Makefile
+++ b/tools/firmware/hvmloader/acpi/Makefile
@@ -1,17 +1,15 @@
#
# Copyright (c) 2004, Intel Corporation.
#
-# This program is free software; you can redistribute it and/or modify it
-# under the terms and conditions of the GNU General Public License,
-# version 2, as published by the Free Software Foundation.
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published
+# by the Free Software Foundation; version 2.1 only. with the special
+# exception on linking described in file LICENSE.
#
-# This program is distributed in the hope it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; If not, see <http://www.gnu.org/licenses/>.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# NU Lesser General Public License for more details.
#
XEN_ROOT = $(CURDIR)/../../../..
diff --git a/tools/firmware/hvmloader/acpi/acpi2_0.h b/tools/firmware/hvmloader/acpi/acpi2_0.h
index 87a558a..775eb7a 100644
--- a/tools/firmware/hvmloader/acpi/acpi2_0.h
+++ b/tools/firmware/hvmloader/acpi/acpi2_0.h
@@ -1,18 +1,15 @@
/*
* Copyright (c) 2004, Intel Corporation.
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; If not, see <http://www.gnu.org/licenses/>.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
*
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*/
#ifndef _ACPI_2_0_H_
#define _ACPI_2_0_H_
diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c
index dccddff..de56f1f 100644
--- a/tools/firmware/hvmloader/acpi/build.c
+++ b/tools/firmware/hvmloader/acpi/build.c
@@ -2,17 +2,15 @@
* Copyright (c) 2004, Intel Corporation.
* Copyright (c) 2006, Keir Fraser, XenSource Inc.
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License, version
- * 2, as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
*
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; If not, see <http://www.gnu.org/licenses/>.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*/
#include "acpi2_0.h"
diff --git a/tools/firmware/hvmloader/acpi/dsdt.asl b/tools/firmware/hvmloader/acpi/dsdt.asl
index 13811cf..2db40e4 100644
--- a/tools/firmware/hvmloader/acpi/dsdt.asl
+++ b/tools/firmware/hvmloader/acpi/dsdt.asl
@@ -3,17 +3,15 @@
*
* Copyright (c) 2004, Intel Corporation.
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
*
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; If not, see <http://www.gnu.org/licenses/>.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*/
DefinitionBlock ("DSDT.aml", "DSDT", 2, "Xen", "HVM", 0)
diff --git a/tools/firmware/hvmloader/acpi/gpl/COPYING b/tools/firmware/hvmloader/acpi/gpl/COPYING
new file mode 100644
index 0000000..f995ef6
--- /dev/null
+++ b/tools/firmware/hvmloader/acpi/gpl/COPYING
@@ -0,0 +1,22 @@
+Unlike files in the directory above that are licensed under GNU Lesser
+General Public License version 2.1, files here are licensed under GNU
+General Public License version 2.
+
+A copy of this license can be obtained at <http://www.gnu.org/licenses/>
+
+
+INBOUND LICENSE
+
+Contributions to this directory are made under the LGPLv2.1 *only* as
+described in the COPYING file of the parent directory. As LGPLv2.1 is
+compatible with the GPLv2, the resulting file is GPLv2 when seen as a
+whole.
+
+The intention of this inbound license, is to avoid having to ask
+subsequent contributors to this directory for permission to change the
+license from GPLv2 to LGPLv2.1, once we get permission from the
+remaining copyright holders of this directory to change the license to
+LGPLv2.1.
+
+Note: The only outstanding permission required to re-license this
+directory to LGPLv2.1 is from Lenovo.
diff --git a/tools/firmware/hvmloader/acpi/mk_dsdt.c b/tools/firmware/hvmloader/acpi/mk_dsdt.c
index 7656b5d..e750820 100644
--- a/tools/firmware/hvmloader/acpi/mk_dsdt.c
+++ b/tools/firmware/hvmloader/acpi/mk_dsdt.c
@@ -1,3 +1,15 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ */
+
#include <stdio.h>
#include <stdarg.h>
#include <stdint.h>
diff --git a/tools/firmware/hvmloader/acpi/ssdt_pm.asl b/tools/firmware/hvmloader/acpi/ssdt_pm.asl
index 1a7d752..d81b1f2 100644
--- a/tools/firmware/hvmloader/acpi/ssdt_pm.asl
+++ b/tools/firmware/hvmloader/acpi/ssdt_pm.asl
@@ -5,17 +5,14 @@
* Copyright (c) 2008 Citrix Systems, Inc.
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; If not, see <http://www.gnu.org/licenses/>.
+ * GNU Lesser General Public License for more details.
*/
/*
diff --git a/tools/firmware/hvmloader/acpi/ssdt_s3.asl b/tools/firmware/hvmloader/acpi/ssdt_s3.asl
index f89ac02..c83bbbf 100644
--- a/tools/firmware/hvmloader/acpi/ssdt_s3.asl
+++ b/tools/firmware/hvmloader/acpi/ssdt_s3.asl
@@ -4,17 +4,14 @@
* Copyright (c) 2011 Citrix Systems, Inc.
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; If not, see <http://www.gnu.org/licenses/>.
+ * GNU Lesser General Public License for more details.
*/
DefinitionBlock ("SSDT_S3.aml", "SSDT", 2, "Xen", "HVM", 0)
diff --git a/tools/firmware/hvmloader/acpi/ssdt_s4.asl b/tools/firmware/hvmloader/acpi/ssdt_s4.asl
index d589e4b..325ac11 100644
--- a/tools/firmware/hvmloader/acpi/ssdt_s4.asl
+++ b/tools/firmware/hvmloader/acpi/ssdt_s4.asl
@@ -4,17 +4,14 @@
* Copyright (c) 2011 Citrix Systems, Inc.
*
* This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; If not, see <http://www.gnu.org/licenses/>.
+ * GNU Lesser General Public License for more details.
*/
DefinitionBlock ("SSDT_S4.aml", "SSDT", 2, "Xen", "HVM", 0)
diff --git a/tools/firmware/hvmloader/acpi/ssdt_tpm.asl b/tools/firmware/hvmloader/acpi/ssdt_tpm.asl
index 2ae8ad4..a0fb1fd 100644
--- a/tools/firmware/hvmloader/acpi/ssdt_tpm.asl
+++ b/tools/firmware/hvmloader/acpi/ssdt_tpm.asl
@@ -3,17 +3,15 @@
*
* Copyright (c) 2006, IBM Corporation.
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
*
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; If not, see <http://www.gnu.org/licenses/>.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*/
/* SSDT for TPM TIS Interface for Xen with Qemu device model. */
diff --git a/tools/firmware/hvmloader/acpi/static_tables.c b/tools/firmware/hvmloader/acpi/static_tables.c
index f4d627b..617bf68 100644
--- a/tools/firmware/hvmloader/acpi/static_tables.c
+++ b/tools/firmware/hvmloader/acpi/static_tables.c
@@ -2,17 +2,15 @@
* Copyright (c) 2004, Intel Corporation.
* Copyright (c) 2006, Keir Fraser, XenSource Inc.
*
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
*
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; If not, see <http://www.gnu.org/licenses/>.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*/
#include "acpi2_0.h"
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* Re: [PATCH v5 04/21] acpi: Re-license ACPI builder files from GPLv2 to LGPLv2.1
2016-09-22 19:13 ` [PATCH v5 04/21] acpi: Re-license ACPI builder files from GPLv2 to LGPLv2.1 Boris Ostrovsky
@ 2016-09-23 11:44 ` Ian Jackson
2016-11-14 20:05 ` Konrad Rzeszutek Wilk
1 sibling, 0 replies; 38+ messages in thread
From: Ian Jackson @ 2016-09-23 11:44 UTC (permalink / raw)
To: Boris Ostrovsky
Cc: Lars Kurth, Kevin Tian, wei.liu2, Kouya Shimura, andrew.cooper3,
xen-devel, julien.grall, Simon Horman, jbeulich, zhaoshenglong,
Stefan Berger, Keir Fraser, Daniel Kiper, roger.pau
Boris Ostrovsky writes ("[PATCH v5 04/21] acpi: Re-license ACPI builder files from GPLv2 to LGPLv2.1"):
> ACPI builder is currently distributed under GPLv2 license.
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 38+ messages in thread* Re: [PATCH v5 04/21] acpi: Re-license ACPI builder files from GPLv2 to LGPLv2.1
2016-09-22 19:13 ` [PATCH v5 04/21] acpi: Re-license ACPI builder files from GPLv2 to LGPLv2.1 Boris Ostrovsky
2016-09-23 11:44 ` Ian Jackson
@ 2016-11-14 20:05 ` Konrad Rzeszutek Wilk
2016-11-14 20:13 ` Ken Lancaster
1 sibling, 1 reply; 38+ messages in thread
From: Konrad Rzeszutek Wilk @ 2016-11-14 20:05 UTC (permalink / raw)
To: xen-devel, boris.ostrovsky
Cc: andrew.cooper3, wei.liu2, klancaster, jbeulich, lars.kurth
On Sat, Nov 12, 2016 at 01:02:08PM +0000, Ken Lancaster wrote:
> My apologies for the delay, this is approved.
>
> We approve the action to re-license http://xenbits.xen.org/gitweb/?p=xen.git;a=commitdiff;h=801d469ad8b2b88f669326327df03d03200efbfb under LGPLv2.1 as requested.
>
> Best,
>
> Ken Lancaster
>
>
..snip..
Heya!
Sending this email to xen-devel mailing list.
Ken,
Thank you so much for helping out with this!
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 38+ messages in thread
* Re: [PATCH v5 04/21] acpi: Re-license ACPI builder files from GPLv2 to LGPLv2.1
2016-11-14 20:05 ` Konrad Rzeszutek Wilk
@ 2016-11-14 20:13 ` Ken Lancaster
0 siblings, 0 replies; 38+ messages in thread
From: Ken Lancaster @ 2016-11-14 20:13 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk, xen-devel@lists.xenproject.org,
boris.ostrovsky@oracle.com
Cc: andrew.cooper3@citrix.com, wei.liu2@citrix.com, jbeulich@suse.com,
lars.kurth@citrix.com
ACK
-----Original Message-----
From: Konrad Rzeszutek Wilk [mailto:konrad.wilk@oracle.com]
Sent: Monday, November 14, 2016 3:05 PM
To: xen-devel@lists.xenproject.org; boris.ostrovsky@oracle.com
Cc: jbeulich@suse.com; andrew.cooper3@citrix.com; wei.liu2@citrix.com; lars.kurth@citrix.com; Ken Lancaster
Subject: Re: [PATCH v5 04/21] acpi: Re-license ACPI builder files from GPLv2 to LGPLv2.1
On Sat, Nov 12, 2016 at 01:02:08PM +0000, Ken Lancaster wrote:
> My apologies for the delay, this is approved.
>
> We approve the action to re-license http://xenbits.xen.org/gitweb/?p=xen.git;a=commitdiff;h=801d469ad8b2b88f669326327df03d03200efbfb under LGPLv2.1 as requested.
>
> Best,
>
> Ken Lancaster
>
>
..snip..
Heya!
Sending this email to xen-devel mailing list.
Ken,
Thank you so much for helping out with this!
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v5 05/21] acpi/hvmloader: Collect processor and NUMA info in hvmloader
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
` (3 preceding siblings ...)
2016-09-22 19:13 ` [PATCH v5 04/21] acpi: Re-license ACPI builder files from GPLv2 to LGPLv2.1 Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 06/21] acpi/hvmloader: Set TIS header address " Boris Ostrovsky
` (15 subsequent siblings)
20 siblings, 0 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
No need for ACPI code to rely on hvm_info variable.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---
Changes in v5:
* Constified pointer in test_bit()
tools/firmware/hvmloader/acpi/build.c | 52 ++++++++++++++++++---------------
tools/firmware/hvmloader/acpi/libacpi.h | 11 +++++++
tools/firmware/hvmloader/util.c | 9 ++++++
tools/firmware/hvmloader/util.h | 4 +--
4 files changed, 50 insertions(+), 26 deletions(-)
diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c
index de56f1f..68eb7c4 100644
--- a/tools/firmware/hvmloader/acpi/build.c
+++ b/tools/firmware/hvmloader/acpi/build.c
@@ -24,6 +24,7 @@
#include "../vnuma.h"
#include <xen/hvm/hvm_xs_strings.h>
#include <xen/hvm/params.h>
+#include <xen/memory.h>
#define ACPI_MAX_SECONDARY_TABLES 16
@@ -70,18 +71,20 @@ static void set_checksum(
p[checksum_offset] = -sum;
}
-static struct acpi_20_madt *construct_madt(struct acpi_info *info)
+static struct acpi_20_madt *construct_madt(const struct acpi_config *config,
+ struct acpi_info *info)
{
struct acpi_20_madt *madt;
struct acpi_20_madt_intsrcovr *intsrcovr;
struct acpi_20_madt_ioapic *io_apic;
struct acpi_20_madt_lapic *lapic;
+ const struct hvm_info_table *hvminfo = config->hvminfo;
int i, sz;
sz = sizeof(struct acpi_20_madt);
sz += sizeof(struct acpi_20_madt_intsrcovr) * 16;
sz += sizeof(struct acpi_20_madt_ioapic);
- sz += sizeof(struct acpi_20_madt_lapic) * hvm_info->nr_vcpus;
+ sz += sizeof(struct acpi_20_madt_lapic) * hvminfo->nr_vcpus;
madt = mem_alloc(sz, 16);
if (!madt) return NULL;
@@ -134,9 +137,9 @@ static struct acpi_20_madt *construct_madt(struct acpi_info *info)
io_apic->ioapic_addr = ioapic_base_address;
lapic = (struct acpi_20_madt_lapic *)(io_apic + 1);
- info->nr_cpus = hvm_info->nr_vcpus;
+ info->nr_cpus = hvminfo->nr_vcpus;
info->madt_lapic0_addr = (uint32_t)lapic;
- for ( i = 0; i < hvm_info->nr_vcpus; i++ )
+ for ( i = 0; i < hvminfo->nr_vcpus; i++ )
{
memset(lapic, 0, sizeof(*lapic));
lapic->type = ACPI_PROCESSOR_LOCAL_APIC;
@@ -144,7 +147,7 @@ static struct acpi_20_madt *construct_madt(struct acpi_info *info)
/* Processor ID must match processor-object IDs in the DSDT. */
lapic->acpi_processor_id = i;
lapic->apic_id = LAPIC_ID(i);
- lapic->flags = (test_bit(i, hvm_info->vcpu_online)
+ lapic->flags = (test_bit(i, hvminfo->vcpu_online)
? ACPI_LOCAL_APIC_ENABLED : 0);
lapic++;
}
@@ -195,7 +198,7 @@ static struct acpi_20_waet *construct_waet(void)
return waet;
}
-static struct acpi_20_srat *construct_srat(void)
+static struct acpi_20_srat *construct_srat(const struct acpi_config *config)
{
struct acpi_20_srat *srat;
struct acpi_20_srat_processor *processor;
@@ -204,8 +207,8 @@ static struct acpi_20_srat *construct_srat(void)
void *p;
unsigned int i;
- size = sizeof(*srat) + sizeof(*processor) * hvm_info->nr_vcpus +
- sizeof(*memory) * nr_vmemranges;
+ size = sizeof(*srat) + sizeof(*processor) * config->hvminfo->nr_vcpus +
+ sizeof(*memory) * config->numa.nr_vmemranges;
p = mem_alloc(size, 16);
if ( !p )
@@ -222,25 +225,26 @@ static struct acpi_20_srat *construct_srat(void)
srat->table_revision = ACPI_SRAT_TABLE_REVISION;
processor = (struct acpi_20_srat_processor *)(srat + 1);
- for ( i = 0; i < hvm_info->nr_vcpus; i++ )
+ for ( i = 0; i < config->hvminfo->nr_vcpus; i++ )
{
processor->type = ACPI_PROCESSOR_AFFINITY;
processor->length = sizeof(*processor);
- processor->domain = vcpu_to_vnode[i];
+ processor->domain = config->numa.vcpu_to_vnode[i];
processor->apic_id = LAPIC_ID(i);
processor->flags = ACPI_LOCAL_APIC_AFFIN_ENABLED;
processor++;
}
memory = (struct acpi_20_srat_memory *)processor;
- for ( i = 0; i < nr_vmemranges; i++ )
+ for ( i = 0; i < config->numa.nr_vmemranges; i++ )
{
memory->type = ACPI_MEMORY_AFFINITY;
memory->length = sizeof(*memory);
- memory->domain = vmemrange[i].nid;
+ memory->domain = config->numa.vmemrange[i].nid;
memory->flags = ACPI_MEM_AFFIN_ENABLED;
- memory->base_address = vmemrange[i].start;
- memory->mem_length = vmemrange[i].end - vmemrange[i].start;
+ memory->base_address = config->numa.vmemrange[i].start;
+ memory->mem_length = config->numa.vmemrange[i].end -
+ config->numa.vmemrange[i].start;
memory++;
}
@@ -252,12 +256,12 @@ static struct acpi_20_srat *construct_srat(void)
return srat;
}
-static struct acpi_20_slit *construct_slit(void)
+static struct acpi_20_slit *construct_slit(const struct acpi_config *config)
{
struct acpi_20_slit *slit;
unsigned int i, num, size;
- num = nr_vnodes * nr_vnodes;
+ num = config->numa.nr_vnodes * config->numa.nr_vnodes;
size = sizeof(*slit) + num * sizeof(uint8_t);
slit = mem_alloc(size, 16);
@@ -274,9 +278,9 @@ static struct acpi_20_slit *construct_slit(void)
slit->header.creator_revision = ACPI_CREATOR_REVISION;
for ( i = 0; i < num; i++ )
- slit->entry[i] = vdistance[i];
+ slit->entry[i] = config->numa.vdistance[i];
- slit->localities = nr_vnodes;
+ slit->localities = config->numa.nr_vnodes;
slit->header.length = size;
set_checksum(slit, offsetof(struct acpi_header, checksum), size);
@@ -335,9 +339,9 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
void *lasa;
/* MADT. */
- if ( (hvm_info->nr_vcpus > 1) || hvm_info->apic_mode )
+ if ( (config->hvminfo->nr_vcpus > 1) || config->hvminfo->apic_mode )
{
- madt = construct_madt(info);
+ madt = construct_madt(config, info);
if (!madt) return -1;
table_ptrs[nr_tables++] = (unsigned long)madt;
}
@@ -419,10 +423,10 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
}
/* SRAT and SLIT */
- if ( nr_vnodes > 0 )
+ if ( config->numa.nr_vnodes > 0 )
{
- struct acpi_20_srat *srat = construct_srat();
- struct acpi_20_slit *slit = construct_slit();
+ struct acpi_20_srat *srat = construct_srat(config);
+ struct acpi_20_slit *slit = construct_slit(config);
if ( srat )
table_ptrs[nr_tables++] = (unsigned long)srat;
@@ -515,7 +519,7 @@ void acpi_build_tables(struct acpi_config *config)
* The latter is required for Windows 2000, which experiences a BSOD of
* KMODE_EXCEPTION_NOT_HANDLED if it sees more than 15 processor objects.
*/
- if ( hvm_info->nr_vcpus <= 15 && config->dsdt_15cpu)
+ if ( config->hvminfo->nr_vcpus <= 15 && config->dsdt_15cpu)
{
dsdt = mem_alloc(config->dsdt_15cpu_len, 16);
if (!dsdt) goto oom;
diff --git a/tools/firmware/hvmloader/acpi/libacpi.h b/tools/firmware/hvmloader/acpi/libacpi.h
index 22fd5f6..d1e7042 100644
--- a/tools/firmware/hvmloader/acpi/libacpi.h
+++ b/tools/firmware/hvmloader/acpi/libacpi.h
@@ -28,6 +28,14 @@
#define ACPI_HAS_SSDT_S3 (1<<5)
#define ACPI_HAS_SSDT_S4 (1<<6)
+struct xen_vmemrange;
+struct acpi_numa {
+ uint32_t nr_vmemranges;
+ uint32_t nr_vnodes;
+ const unsigned int *vcpu_to_vnode;
+ const unsigned int *vdistance;
+ const struct xen_vmemrange *vmemrange;
+};
struct acpi_config {
const unsigned char *dsdt_anycpu;
@@ -49,6 +57,9 @@ struct acpi_config {
uint32_t length;
} pt;
+ struct acpi_numa numa;
+ const struct hvm_info_table *hvminfo;
+
/*
* Address where acpi_info should be placed.
* This must match the OperationRegion(BIOS, SystemMemory, ....)
diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c
index b2d3421..f37b16e 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 "vnuma.h"
#include "acpi/acpi2_0.h"
#include "acpi/libacpi.h"
#include <stdint.h>
@@ -918,6 +919,14 @@ 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->numa.nr_vmemranges = nr_vmemranges;
+ config->numa.nr_vnodes = nr_vnodes;
+ config->numa.vcpu_to_vnode = vcpu_to_vnode;
+ config->numa.vdistance = vdistance;
+ config->numa.vmemrange = vmemrange;
+
+ config->hvminfo = hvm_info;
+
config->rsdp = physical;
config->infop = ACPI_INFO_PHYSICAL_ADDRESS;
diff --git a/tools/firmware/hvmloader/util.h b/tools/firmware/hvmloader/util.h
index 0fb266e..6062f0b 100644
--- a/tools/firmware/hvmloader/util.h
+++ b/tools/firmware/hvmloader/util.h
@@ -48,9 +48,9 @@ void __bug(char *file, int line) __attribute__((noreturn));
#define max_t(type,x,y) \
({ type __x = (x); type __y = (y); __x > __y ? __x: __y; })
-static inline int test_bit(unsigned int b, void *p)
+static inline int test_bit(unsigned int b, const void *p)
{
- return !!(((uint8_t *)p)[b>>3] & (1u<<(b&7)));
+ return !!(((const uint8_t *)p)[b>>3] & (1u<<(b&7)));
}
static inline int test_and_clear_bit(int nr, volatile void *addr)
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v5 06/21] acpi/hvmloader: Set TIS header address in hvmloader
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
` (4 preceding siblings ...)
2016-09-22 19:13 ` [PATCH v5 05/21] acpi/hvmloader: Collect processor and NUMA info in hvmloader Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 07/21] acpi/hvmloader: Make providing IOAPIC in MADT optional Boris Ostrovsky
` (14 subsequent siblings)
20 siblings, 0 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
Users other than hvmloader may provide TIS address as virtual.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---
tools/firmware/hvmloader/acpi/build.c | 9 ++++-----
tools/firmware/hvmloader/acpi/libacpi.h | 3 +++
tools/firmware/hvmloader/config.h | 2 ++
tools/firmware/hvmloader/util.c | 4 ++++
4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c
index 68eb7c4..c984e5a 100644
--- a/tools/firmware/hvmloader/acpi/build.c
+++ b/tools/firmware/hvmloader/acpi/build.c
@@ -335,7 +335,6 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
struct acpi_20_tcpa *tcpa;
unsigned char *ssdt;
static const uint16_t tis_signature[] = {0x0001, 0x0001, 0x0001};
- uint16_t *tis_hdr;
void *lasa;
/* MADT. */
@@ -388,10 +387,10 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
}
/* TPM TCPA and SSDT. */
- tis_hdr = (uint16_t *)0xFED40F00;
- if ( (tis_hdr[0] == tis_signature[0]) &&
- (tis_hdr[1] == tis_signature[1]) &&
- (tis_hdr[2] == tis_signature[2]) )
+ if ( (config->table_flags & ACPI_HAS_TCPA) &&
+ (config->tis_hdr[0] == tis_signature[0]) &&
+ (config->tis_hdr[1] == tis_signature[1]) &&
+ (config->tis_hdr[2] == tis_signature[2]) )
{
ssdt = mem_alloc(sizeof(ssdt_tpm), 16);
if (!ssdt) return -1;
diff --git a/tools/firmware/hvmloader/acpi/libacpi.h b/tools/firmware/hvmloader/acpi/libacpi.h
index d1e7042..70cf26b 100644
--- a/tools/firmware/hvmloader/acpi/libacpi.h
+++ b/tools/firmware/hvmloader/acpi/libacpi.h
@@ -27,6 +27,7 @@
#define ACPI_HAS_SSDT_PM (1<<4)
#define ACPI_HAS_SSDT_S3 (1<<5)
#define ACPI_HAS_SSDT_S4 (1<<6)
+#define ACPI_HAS_TCPA (1<<7)
struct xen_vmemrange;
struct acpi_numa {
@@ -60,6 +61,8 @@ struct acpi_config {
struct acpi_numa numa;
const struct hvm_info_table *hvminfo;
+ const uint16_t *tis_hdr;
+
/*
* Address where acpi_info should be placed.
* This must match the OperationRegion(BIOS, SystemMemory, ....)
diff --git a/tools/firmware/hvmloader/config.h b/tools/firmware/hvmloader/config.h
index a4429f4..6e00413 100644
--- a/tools/firmware/hvmloader/config.h
+++ b/tools/firmware/hvmloader/config.h
@@ -56,6 +56,8 @@ extern uint8_t ioapic_version;
/* MMIO hole: Hardcoded defaults, which can be dynamically expanded. */
#define PCI_MEM_END 0xfc000000
+#define ACPI_TIS_HDR_ADDRESS 0xFED40F00UL
+
extern unsigned long pci_mem_start, pci_mem_end;
extern uint64_t pci_hi_mem_start, pci_hi_mem_end;
diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c
index f37b16e..8875675 100644
--- a/tools/firmware/hvmloader/util.c
+++ b/tools/firmware/hvmloader/util.c
@@ -919,6 +919,10 @@ 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;
+
+ config->tis_hdr = (uint16_t *)ACPI_TIS_HDR_ADDRESS;
+
config->numa.nr_vmemranges = nr_vmemranges;
config->numa.nr_vnodes = nr_vnodes;
config->numa.vcpu_to_vnode = vcpu_to_vnode;
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v5 07/21] acpi/hvmloader: Make providing IOAPIC in MADT optional
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
` (5 preceding siblings ...)
2016-09-22 19:13 ` [PATCH v5 06/21] acpi/hvmloader: Set TIS header address " Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 08/21] acpi/hvmloader: Build WAET optionally Boris Ostrovsky
` (13 subsequent siblings)
20 siblings, 0 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---
tools/firmware/hvmloader/acpi/build.c | 70 ++++++++++++++++++---------------
tools/firmware/hvmloader/acpi/libacpi.h | 1 +
tools/firmware/hvmloader/util.c | 2 +-
3 files changed, 40 insertions(+), 33 deletions(-)
diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c
index c984e5a..dc489bb 100644
--- a/tools/firmware/hvmloader/acpi/build.c
+++ b/tools/firmware/hvmloader/acpi/build.c
@@ -100,43 +100,49 @@ static struct acpi_20_madt *construct_madt(const struct acpi_config *config,
madt->lapic_addr = LAPIC_BASE_ADDRESS;
madt->flags = ACPI_PCAT_COMPAT;
- intsrcovr = (struct acpi_20_madt_intsrcovr *)(madt + 1);
- for ( i = 0; i < 16; i++ )
- {
- memset(intsrcovr, 0, sizeof(*intsrcovr));
- intsrcovr->type = ACPI_INTERRUPT_SOURCE_OVERRIDE;
- intsrcovr->length = sizeof(*intsrcovr);
- intsrcovr->source = i;
-
- if ( i == 0 )
- {
- /* ISA IRQ0 routed to IOAPIC GSI 2. */
- intsrcovr->gsi = 2;
- intsrcovr->flags = 0x0;
- }
- else if ( PCI_ISA_IRQ_MASK & (1U << i) )
- {
- /* PCI: active-low level-triggered. */
- intsrcovr->gsi = i;
- intsrcovr->flags = 0xf;
- }
- else
+ if ( config->table_flags & ACPI_HAS_IOAPIC )
+ {
+ intsrcovr = (struct acpi_20_madt_intsrcovr *)(madt + 1);
+ for ( i = 0; i < 16; i++ )
{
- /* No need for a INT source override structure. */
- continue;
+ memset(intsrcovr, 0, sizeof(*intsrcovr));
+ intsrcovr->type = ACPI_INTERRUPT_SOURCE_OVERRIDE;
+ intsrcovr->length = sizeof(*intsrcovr);
+ intsrcovr->source = i;
+
+ if ( i == 0 )
+ {
+ /* ISA IRQ0 routed to IOAPIC GSI 2. */
+ intsrcovr->gsi = 2;
+ intsrcovr->flags = 0x0;
+ }
+ else if ( PCI_ISA_IRQ_MASK & (1U << i) )
+ {
+ /* PCI: active-low level-triggered. */
+ intsrcovr->gsi = i;
+ intsrcovr->flags = 0xf;
+ }
+ else
+ {
+ /* No need for a INT source override structure. */
+ continue;
+ }
+
+ intsrcovr++;
}
- intsrcovr++;
- }
+ io_apic = (struct acpi_20_madt_ioapic *)intsrcovr;
+ memset(io_apic, 0, sizeof(*io_apic));
+ io_apic->type = ACPI_IO_APIC;
+ io_apic->length = sizeof(*io_apic);
+ io_apic->ioapic_id = IOAPIC_ID;
+ io_apic->ioapic_addr = ioapic_base_address;
- io_apic = (struct acpi_20_madt_ioapic *)intsrcovr;
- memset(io_apic, 0, sizeof(*io_apic));
- io_apic->type = ACPI_IO_APIC;
- io_apic->length = sizeof(*io_apic);
- io_apic->ioapic_id = IOAPIC_ID;
- io_apic->ioapic_addr = ioapic_base_address;
+ lapic = (struct acpi_20_madt_lapic *)(io_apic + 1);
+ }
+ else
+ lapic = (struct acpi_20_madt_lapic *)(madt + 1);
- lapic = (struct acpi_20_madt_lapic *)(io_apic + 1);
info->nr_cpus = hvminfo->nr_vcpus;
info->madt_lapic0_addr = (uint32_t)lapic;
for ( i = 0; i < hvminfo->nr_vcpus; i++ )
diff --git a/tools/firmware/hvmloader/acpi/libacpi.h b/tools/firmware/hvmloader/acpi/libacpi.h
index 70cf26b..b8f28a3 100644
--- a/tools/firmware/hvmloader/acpi/libacpi.h
+++ b/tools/firmware/hvmloader/acpi/libacpi.h
@@ -28,6 +28,7 @@
#define ACPI_HAS_SSDT_S3 (1<<5)
#define ACPI_HAS_SSDT_S4 (1<<6)
#define ACPI_HAS_TCPA (1<<7)
+#define ACPI_HAS_IOAPIC (1<<8)
struct xen_vmemrange;
struct acpi_numa {
diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c
index 8875675..aa5fc20 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;
+ config->table_flags |= (ACPI_HAS_TCPA | ACPI_HAS_IOAPIC);
config->tis_hdr = (uint16_t *)ACPI_TIS_HDR_ADDRESS;
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v5 08/21] acpi/hvmloader: Build WAET optionally
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
` (6 preceding siblings ...)
2016-09-22 19:13 ` [PATCH v5 07/21] acpi/hvmloader: Make providing IOAPIC in MADT optional Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 09/21] acpi/hvmloader: Replace mem_alloc() and virt_to_phys() with memory ops Boris Ostrovsky
` (12 subsequent siblings)
20 siblings, 0 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---
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;
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v5 09/21] acpi/hvmloader: Replace mem_alloc() and virt_to_phys() with memory ops
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
` (7 preceding siblings ...)
2016-09-22 19:13 ` [PATCH v5 08/21] acpi/hvmloader: Build WAET optionally Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 10/21] acpi/hvmloader: Translate all addresses when assigning addresses in ACPI tables Boris Ostrovsky
` (11 subsequent siblings)
20 siblings, 0 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
Components that wish to use ACPI builder will need to provide their own
mem_alloc() and virt_to_phys() routines. Pointers to these routines will
be passed to the builder as memory ops.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
tools/firmware/hvmloader/acpi/build.c | 95 ++++++++++++++++++---------------
tools/firmware/hvmloader/acpi/libacpi.h | 10 +++-
tools/firmware/hvmloader/util.c | 24 ++++++++-
3 files changed, 84 insertions(+), 45 deletions(-)
diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c
index 537933b..1dd9987 100644
--- a/tools/firmware/hvmloader/acpi/build.c
+++ b/tools/firmware/hvmloader/acpi/build.c
@@ -71,7 +71,8 @@ static void set_checksum(
p[checksum_offset] = -sum;
}
-static struct acpi_20_madt *construct_madt(const struct acpi_config *config,
+static struct acpi_20_madt *construct_madt(struct acpi_ctxt *ctxt,
+ const struct acpi_config *config,
struct acpi_info *info)
{
struct acpi_20_madt *madt;
@@ -86,7 +87,7 @@ static struct acpi_20_madt *construct_madt(const struct acpi_config *config,
sz += sizeof(struct acpi_20_madt_ioapic);
sz += sizeof(struct acpi_20_madt_lapic) * hvminfo->nr_vcpus;
- madt = mem_alloc(sz, 16);
+ madt = ctxt->mem_ops.alloc(ctxt, sz, 16);
if (!madt) return NULL;
memset(madt, 0, sizeof(*madt));
@@ -166,11 +167,12 @@ static struct acpi_20_madt *construct_madt(const struct acpi_config *config,
return madt;
}
-static struct acpi_20_hpet *construct_hpet(void)
+static struct acpi_20_hpet *construct_hpet(struct acpi_ctxt *ctxt,
+ const struct acpi_config *config)
{
struct acpi_20_hpet *hpet;
- hpet = mem_alloc(sizeof(*hpet), 16);
+ hpet = ctxt->mem_ops.alloc(ctxt, sizeof(*hpet), 16);
if (!hpet) return NULL;
memset(hpet, 0, sizeof(*hpet));
@@ -189,11 +191,12 @@ static struct acpi_20_hpet *construct_hpet(void)
return hpet;
}
-static struct acpi_20_waet *construct_waet(void)
+static struct acpi_20_waet *construct_waet(struct acpi_ctxt *ctxt,
+ const struct acpi_config *config)
{
struct acpi_20_waet *waet;
- waet = mem_alloc(sizeof(*waet), 16);
+ waet = ctxt->mem_ops.alloc(ctxt, sizeof(*waet), 16);
if (!waet) return NULL;
memcpy(waet, &Waet, sizeof(*waet));
@@ -204,7 +207,8 @@ static struct acpi_20_waet *construct_waet(void)
return waet;
}
-static struct acpi_20_srat *construct_srat(const struct acpi_config *config)
+static struct acpi_20_srat *construct_srat(struct acpi_ctxt *ctxt,
+ const struct acpi_config *config)
{
struct acpi_20_srat *srat;
struct acpi_20_srat_processor *processor;
@@ -216,7 +220,7 @@ static struct acpi_20_srat *construct_srat(const struct acpi_config *config)
size = sizeof(*srat) + sizeof(*processor) * config->hvminfo->nr_vcpus +
sizeof(*memory) * config->numa.nr_vmemranges;
- p = mem_alloc(size, 16);
+ p = ctxt->mem_ops.alloc(ctxt, size, 16);
if ( !p )
return NULL;
@@ -262,7 +266,8 @@ static struct acpi_20_srat *construct_srat(const struct acpi_config *config)
return srat;
}
-static struct acpi_20_slit *construct_slit(const struct acpi_config *config)
+static struct acpi_20_slit *construct_slit(struct acpi_ctxt *ctxt,
+ const struct acpi_config *config)
{
struct acpi_20_slit *slit;
unsigned int i, num, size;
@@ -270,7 +275,7 @@ static struct acpi_20_slit *construct_slit(const struct acpi_config *config)
num = config->numa.nr_vnodes * config->numa.nr_vnodes;
size = sizeof(*slit) + num * sizeof(uint8_t);
- slit = mem_alloc(size, 16);
+ slit = ctxt->mem_ops.alloc(ctxt, size, 16);
if ( !slit )
return NULL;
@@ -294,7 +299,8 @@ static struct acpi_20_slit *construct_slit(const struct acpi_config *config)
return slit;
}
-static int construct_passthrough_tables(unsigned long *table_ptrs,
+static int construct_passthrough_tables(struct acpi_ctxt *ctxt,
+ unsigned long *table_ptrs,
int nr_tables,
struct acpi_config *config)
{
@@ -317,7 +323,7 @@ static int construct_passthrough_tables(unsigned long *table_ptrs,
header = (struct acpi_header*)pt_addr;
- buffer = mem_alloc(header->length, 16);
+ buffer = ctxt->mem_ops.alloc(ctxt, header->length, 16);
if ( buffer == NULL )
break;
memcpy(buffer, header, header->length);
@@ -330,7 +336,8 @@ static int construct_passthrough_tables(unsigned long *table_ptrs,
return nr_added;
}
-static int construct_secondary_tables(unsigned long *table_ptrs,
+static int construct_secondary_tables(struct acpi_ctxt *ctxt,
+ unsigned long *table_ptrs,
struct acpi_config *config,
struct acpi_info *info)
{
@@ -346,7 +353,7 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
/* MADT. */
if ( (config->hvminfo->nr_vcpus > 1) || config->hvminfo->apic_mode )
{
- madt = construct_madt(config, info);
+ madt = construct_madt(ctxt, config, info);
if (!madt) return -1;
table_ptrs[nr_tables++] = (unsigned long)madt;
}
@@ -354,7 +361,7 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
/* HPET. */
if ( info->hpet_present )
{
- hpet = construct_hpet();
+ hpet = construct_hpet(ctxt, config);
if (!hpet) return -1;
table_ptrs[nr_tables++] = (unsigned long)hpet;
}
@@ -362,7 +369,7 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
/* WAET. */
if ( config->table_flags & ACPI_HAS_WAET )
{
- waet = construct_waet();
+ waet = construct_waet(ctxt, config);
if ( !waet )
return -1;
table_ptrs[nr_tables++] = (unsigned long)waet;
@@ -370,7 +377,7 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
if ( config->table_flags & ACPI_HAS_SSDT_PM )
{
- ssdt = mem_alloc(sizeof(ssdt_pm), 16);
+ ssdt = ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_pm), 16);
if (!ssdt) return -1;
memcpy(ssdt, ssdt_pm, sizeof(ssdt_pm));
table_ptrs[nr_tables++] = (unsigned long)ssdt;
@@ -378,7 +385,7 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
if ( config->table_flags & ACPI_HAS_SSDT_S3 )
{
- ssdt = mem_alloc(sizeof(ssdt_s3), 16);
+ ssdt = ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_s3), 16);
if (!ssdt) return -1;
memcpy(ssdt, ssdt_s3, sizeof(ssdt_s3));
table_ptrs[nr_tables++] = (unsigned long)ssdt;
@@ -388,7 +395,7 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
if ( config->table_flags & ACPI_HAS_SSDT_S4 )
{
- ssdt = mem_alloc(sizeof(ssdt_s4), 16);
+ ssdt = ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_s4), 16);
if (!ssdt) return -1;
memcpy(ssdt, ssdt_s4, sizeof(ssdt_s4));
table_ptrs[nr_tables++] = (unsigned long)ssdt;
@@ -402,12 +409,12 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
(config->tis_hdr[1] == tis_signature[1]) &&
(config->tis_hdr[2] == tis_signature[2]) )
{
- ssdt = mem_alloc(sizeof(ssdt_tpm), 16);
+ ssdt = ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_tpm), 16);
if (!ssdt) return -1;
memcpy(ssdt, ssdt_tpm, sizeof(ssdt_tpm));
table_ptrs[nr_tables++] = (unsigned long)ssdt;
- tcpa = mem_alloc(sizeof(struct acpi_20_tcpa), 16);
+ tcpa = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_tcpa), 16);
if (!tcpa) return -1;
memset(tcpa, 0, sizeof(*tcpa));
table_ptrs[nr_tables++] = (unsigned long)tcpa;
@@ -420,9 +427,9 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
tcpa->header.oem_revision = ACPI_OEM_REVISION;
tcpa->header.creator_id = ACPI_CREATOR_ID;
tcpa->header.creator_revision = ACPI_CREATOR_REVISION;
- if ( (lasa = mem_alloc(ACPI_2_0_TCPA_LAML_SIZE, 16)) != NULL )
+ if ( (lasa = ctxt->mem_ops.alloc(ctxt, ACPI_2_0_TCPA_LAML_SIZE, 16)) != NULL )
{
- tcpa->lasa = virt_to_phys(lasa);
+ tcpa->lasa = ctxt->mem_ops.v2p(ctxt, lasa);
tcpa->laml = ACPI_2_0_TCPA_LAML_SIZE;
memset(lasa, 0, tcpa->laml);
set_checksum(tcpa,
@@ -434,8 +441,8 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
/* SRAT and SLIT */
if ( config->numa.nr_vnodes > 0 )
{
- struct acpi_20_srat *srat = construct_srat(config);
- struct acpi_20_slit *slit = construct_slit(config);
+ struct acpi_20_srat *srat = construct_srat(ctxt, config);
+ struct acpi_20_slit *slit = construct_slit(ctxt, config);
if ( srat )
table_ptrs[nr_tables++] = (unsigned long)srat;
@@ -448,7 +455,8 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
}
/* Load any additional tables passed through. */
- nr_tables += construct_passthrough_tables(table_ptrs, nr_tables, config);
+ nr_tables += construct_passthrough_tables(ctxt, table_ptrs,
+ nr_tables, config);
table_ptrs[nr_tables] = 0;
return nr_tables;
@@ -461,7 +469,8 @@ static int construct_secondary_tables(unsigned long *table_ptrs,
*
* Return 0 if memory failure, != 0 if success
*/
-static int new_vm_gid(struct acpi_config *config,
+static int new_vm_gid(struct acpi_ctxt *ctxt,
+ struct acpi_config *config,
struct acpi_info *info)
{
uint64_t *buf;
@@ -473,19 +482,19 @@ static int new_vm_gid(struct acpi_config *config,
return 1;
/* copy to allocate BIOS memory */
- buf = mem_alloc(sizeof(config->vm_gid), 8);
+ buf = ctxt->mem_ops.alloc(ctxt, sizeof(config->vm_gid), 8);
if ( !buf )
return 0;
memcpy(buf, config->vm_gid, sizeof(config->vm_gid));
/* set the address into ACPI table and also pass it back to the caller */
- info->vm_gid_addr = virt_to_phys(buf);
+ info->vm_gid_addr = ctxt->mem_ops.v2p(ctxt, buf);
config->vm_gid_addr = info->vm_gid_addr;
return 1;
}
-void acpi_build_tables(struct acpi_config *config)
+void acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config)
{
struct acpi_info *acpi_info;
struct acpi_20_rsdp *rsdp;
@@ -516,7 +525,7 @@ void acpi_build_tables(struct acpi_config *config)
* Fill in high-memory data structures, starting at @buf.
*/
- facs = mem_alloc(sizeof(struct acpi_20_facs), 16);
+ facs = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_facs), 16);
if (!facs) goto oom;
memcpy(facs, &Facs, sizeof(struct acpi_20_facs));
@@ -530,13 +539,13 @@ void acpi_build_tables(struct acpi_config *config)
*/
if ( config->hvminfo->nr_vcpus <= 15 && config->dsdt_15cpu)
{
- dsdt = mem_alloc(config->dsdt_15cpu_len, 16);
+ dsdt = ctxt->mem_ops.alloc(ctxt, config->dsdt_15cpu_len, 16);
if (!dsdt) goto oom;
memcpy(dsdt, config->dsdt_15cpu, config->dsdt_15cpu_len);
}
else
{
- dsdt = mem_alloc(config->dsdt_anycpu_len, 16);
+ dsdt = ctxt->mem_ops.alloc(ctxt, config->dsdt_anycpu_len, 16);
if (!dsdt) goto oom;
memcpy(dsdt, config->dsdt_anycpu, config->dsdt_anycpu_len);
}
@@ -549,7 +558,7 @@ void acpi_build_tables(struct acpi_config *config)
* compatible revision 1 FADT that is linked with the RSDT. Refer to:
* http://www.acpi.info/presentations/S01USMOBS169_OS%20new.ppt
*/
- fadt_10 = mem_alloc(sizeof(struct acpi_10_fadt), 16);
+ fadt_10 = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_10_fadt), 16);
if (!fadt_10) goto oom;
memcpy(fadt_10, &Fadt, sizeof(struct acpi_10_fadt));
fadt_10->header.length = sizeof(struct acpi_10_fadt);
@@ -560,7 +569,7 @@ void acpi_build_tables(struct acpi_config *config)
offsetof(struct acpi_header, checksum),
sizeof(struct acpi_10_fadt));
- fadt = mem_alloc(sizeof(struct acpi_20_fadt), 16);
+ fadt = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_fadt), 16);
if (!fadt) goto oom;
memcpy(fadt, &Fadt, sizeof(struct acpi_20_fadt));
fadt->dsdt = (unsigned long)dsdt;
@@ -571,14 +580,14 @@ void acpi_build_tables(struct acpi_config *config)
offsetof(struct acpi_header, checksum),
sizeof(struct acpi_20_fadt));
- nr_secondaries = construct_secondary_tables(secondary_tables,
+ nr_secondaries = construct_secondary_tables(ctxt, secondary_tables,
config, acpi_info);
if ( nr_secondaries < 0 )
goto oom;
- xsdt = mem_alloc(sizeof(struct acpi_20_xsdt)+
- sizeof(uint64_t)*nr_secondaries,
- 16);
+ xsdt = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_xsdt) +
+ sizeof(uint64_t) * nr_secondaries,
+ 16);
if (!xsdt) goto oom;
memcpy(xsdt, &Xsdt, sizeof(struct acpi_header));
xsdt->entry[0] = (unsigned long)fadt;
@@ -589,9 +598,9 @@ void acpi_build_tables(struct acpi_config *config)
offsetof(struct acpi_header, checksum),
xsdt->header.length);
- rsdt = mem_alloc(sizeof(struct acpi_20_rsdt)+
- sizeof(uint32_t)*nr_secondaries,
- 16);
+ rsdt = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_rsdt) +
+ sizeof(uint32_t) * nr_secondaries,
+ 16);
if (!rsdt) goto oom;
memcpy(rsdt, &Rsdt, sizeof(struct acpi_header));
rsdt->entry[0] = (unsigned long)fadt_10;
@@ -617,7 +626,7 @@ void acpi_build_tables(struct acpi_config *config)
offsetof(struct acpi_20_rsdp, extended_checksum),
sizeof(struct acpi_20_rsdp));
- if ( !new_vm_gid(config, acpi_info) )
+ if ( !new_vm_gid(ctxt, config, acpi_info) )
goto oom;
return;
diff --git a/tools/firmware/hvmloader/acpi/libacpi.h b/tools/firmware/hvmloader/acpi/libacpi.h
index b411a6e..35b6f47 100644
--- a/tools/firmware/hvmloader/acpi/libacpi.h
+++ b/tools/firmware/hvmloader/acpi/libacpi.h
@@ -40,6 +40,14 @@ struct acpi_numa {
const struct xen_vmemrange *vmemrange;
};
+struct acpi_ctxt {
+ struct acpi_mem_ops {
+ void *(*alloc)(struct acpi_ctxt *ctxt, uint32_t size, uint32_t align);
+ void (*free)(struct acpi_ctxt *ctxt, void *v, uint32_t size);
+ unsigned long (*v2p)(struct acpi_ctxt *ctxt, void *v);
+ } mem_ops;
+};
+
struct acpi_config {
const unsigned char *dsdt_anycpu;
unsigned int dsdt_anycpu_len;
@@ -76,7 +84,7 @@ struct acpi_config {
unsigned int rsdp;
};
-void acpi_build_tables(struct acpi_config *config);
+void acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config);
#endif /* __LIBACPI_H__ */
diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c
index b345576..3a423ab 100644
--- a/tools/firmware/hvmloader/util.c
+++ b/tools/firmware/hvmloader/util.c
@@ -866,10 +866,28 @@ static uint8_t battery_port_exists(void)
return (inb(0x88) == 0x1F);
}
+static unsigned long acpi_v2p(struct acpi_ctxt *ctxt, void *v)
+{
+ return virt_to_phys(v);
+}
+
+static void *acpi_mem_alloc(struct acpi_ctxt *ctxt,
+ uint32_t size, uint32_t align)
+{
+ return mem_alloc(size, align);
+}
+
+static void acpi_mem_free(struct acpi_ctxt *ctxt,
+ void *v, uint32_t size)
+{
+ /* ACPI builder currently doesn't free memory so this is just a stub */
+}
+
void hvmloader_acpi_build_tables(struct acpi_config *config,
unsigned int physical)
{
const char *s;
+ struct acpi_ctxt ctxt;
/* Allocate and initialise the acpi info area. */
mem_hole_populate_ram(ACPI_INFO_PHYSICAL_ADDRESS >> PAGE_SHIFT, 1);
@@ -934,7 +952,11 @@ void hvmloader_acpi_build_tables(struct acpi_config *config,
config->rsdp = physical;
config->infop = ACPI_INFO_PHYSICAL_ADDRESS;
- acpi_build_tables(config);
+ ctxt.mem_ops.alloc = acpi_mem_alloc;
+ ctxt.mem_ops.free = acpi_mem_free;
+ ctxt.mem_ops.v2p = acpi_v2p;
+
+ acpi_build_tables(&ctxt, config);
hvm_param_set(HVM_PARAM_VM_GENERATION_ID_ADDR, config->vm_gid_addr);
}
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v5 10/21] acpi/hvmloader: Translate all addresses when assigning addresses in ACPI tables
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
` (8 preceding siblings ...)
2016-09-22 19:13 ` [PATCH v5 09/21] acpi/hvmloader: Replace mem_alloc() and virt_to_phys() with memory ops Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 11/21] acpi/hvmloader: Link ACPI object files directly Boris Ostrovsky
` (10 subsequent siblings)
20 siblings, 0 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
Non-hvmloader users may be building tables in virtual address space
and therefore we need to make sure that values that end up in tables
are physical addresses.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---
tools/firmware/hvmloader/acpi/build.c | 47 ++++++++++++++++++-----------------
1 file changed, 24 insertions(+), 23 deletions(-)
diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c
index 1dd9987..b295ef0 100644
--- a/tools/firmware/hvmloader/acpi/build.c
+++ b/tools/firmware/hvmloader/acpi/build.c
@@ -145,7 +145,7 @@ static struct acpi_20_madt *construct_madt(struct acpi_ctxt *ctxt,
lapic = (struct acpi_20_madt_lapic *)(madt + 1);
info->nr_cpus = hvminfo->nr_vcpus;
- info->madt_lapic0_addr = (uint32_t)lapic;
+ info->madt_lapic0_addr = ctxt->mem_ops.v2p(ctxt, lapic);
for ( i = 0; i < hvminfo->nr_vcpus; i++ )
{
memset(lapic, 0, sizeof(*lapic));
@@ -162,7 +162,8 @@ static struct acpi_20_madt *construct_madt(struct acpi_ctxt *ctxt,
madt->header.length = (unsigned char *)lapic - (unsigned char *)madt;
set_checksum(madt, offsetof(struct acpi_header, checksum),
madt->header.length);
- info->madt_csum_addr = (uint32_t)&madt->header.checksum;
+ info->madt_csum_addr =
+ ctxt->mem_ops.v2p(ctxt, &madt->header.checksum);
return madt;
}
@@ -328,7 +329,7 @@ static int construct_passthrough_tables(struct acpi_ctxt *ctxt,
break;
memcpy(buffer, header, header->length);
- table_ptrs[nr_tables++] = (unsigned long)buffer;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, buffer);
total += header->length;
pt_addr += header->length;
}
@@ -355,7 +356,7 @@ static int construct_secondary_tables(struct acpi_ctxt *ctxt,
{
madt = construct_madt(ctxt, config, info);
if (!madt) return -1;
- table_ptrs[nr_tables++] = (unsigned long)madt;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, madt);
}
/* HPET. */
@@ -363,7 +364,7 @@ static int construct_secondary_tables(struct acpi_ctxt *ctxt,
{
hpet = construct_hpet(ctxt, config);
if (!hpet) return -1;
- table_ptrs[nr_tables++] = (unsigned long)hpet;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, hpet);
}
/* WAET. */
@@ -372,7 +373,7 @@ static int construct_secondary_tables(struct acpi_ctxt *ctxt,
waet = construct_waet(ctxt, config);
if ( !waet )
return -1;
- table_ptrs[nr_tables++] = (unsigned long)waet;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, waet);
}
if ( config->table_flags & ACPI_HAS_SSDT_PM )
@@ -380,7 +381,7 @@ static int construct_secondary_tables(struct acpi_ctxt *ctxt,
ssdt = ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_pm), 16);
if (!ssdt) return -1;
memcpy(ssdt, ssdt_pm, sizeof(ssdt_pm));
- table_ptrs[nr_tables++] = (unsigned long)ssdt;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, ssdt);
}
if ( config->table_flags & ACPI_HAS_SSDT_S3 )
@@ -388,7 +389,7 @@ static int construct_secondary_tables(struct acpi_ctxt *ctxt,
ssdt = ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_s3), 16);
if (!ssdt) return -1;
memcpy(ssdt, ssdt_s3, sizeof(ssdt_s3));
- table_ptrs[nr_tables++] = (unsigned long)ssdt;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, ssdt);
} else {
printf("S3 disabled\n");
}
@@ -398,7 +399,7 @@ static int construct_secondary_tables(struct acpi_ctxt *ctxt,
ssdt = ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_s4), 16);
if (!ssdt) return -1;
memcpy(ssdt, ssdt_s4, sizeof(ssdt_s4));
- table_ptrs[nr_tables++] = (unsigned long)ssdt;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, ssdt);
} else {
printf("S4 disabled\n");
}
@@ -412,12 +413,12 @@ static int construct_secondary_tables(struct acpi_ctxt *ctxt,
ssdt = ctxt->mem_ops.alloc(ctxt, sizeof(ssdt_tpm), 16);
if (!ssdt) return -1;
memcpy(ssdt, ssdt_tpm, sizeof(ssdt_tpm));
- table_ptrs[nr_tables++] = (unsigned long)ssdt;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, ssdt);
tcpa = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_tcpa), 16);
if (!tcpa) return -1;
memset(tcpa, 0, sizeof(*tcpa));
- table_ptrs[nr_tables++] = (unsigned long)tcpa;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, tcpa);
tcpa->header.signature = ACPI_2_0_TCPA_SIGNATURE;
tcpa->header.length = sizeof(*tcpa);
@@ -445,11 +446,11 @@ static int construct_secondary_tables(struct acpi_ctxt *ctxt,
struct acpi_20_slit *slit = construct_slit(ctxt, config);
if ( srat )
- table_ptrs[nr_tables++] = (unsigned long)srat;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, srat);
else
printf("Failed to build SRAT, skipping...\n");
if ( slit )
- table_ptrs[nr_tables++] = (unsigned long)slit;
+ table_ptrs[nr_tables++] = ctxt->mem_ops.v2p(ctxt, slit);
else
printf("Failed to build SLIT, skipping...\n");
}
@@ -563,8 +564,8 @@ void acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config)
memcpy(fadt_10, &Fadt, sizeof(struct acpi_10_fadt));
fadt_10->header.length = sizeof(struct acpi_10_fadt);
fadt_10->header.revision = ACPI_1_0_FADT_REVISION;
- fadt_10->dsdt = (unsigned long)dsdt;
- fadt_10->firmware_ctrl = (unsigned long)facs;
+ fadt_10->dsdt = ctxt->mem_ops.v2p(ctxt, dsdt);
+ fadt_10->firmware_ctrl = ctxt->mem_ops.v2p(ctxt, facs);
set_checksum(fadt_10,
offsetof(struct acpi_header, checksum),
sizeof(struct acpi_10_fadt));
@@ -572,10 +573,10 @@ void acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config)
fadt = ctxt->mem_ops.alloc(ctxt, sizeof(struct acpi_20_fadt), 16);
if (!fadt) goto oom;
memcpy(fadt, &Fadt, sizeof(struct acpi_20_fadt));
- fadt->dsdt = (unsigned long)dsdt;
- fadt->x_dsdt = (unsigned long)dsdt;
- fadt->firmware_ctrl = (unsigned long)facs;
- fadt->x_firmware_ctrl = (unsigned long)facs;
+ fadt->dsdt = ctxt->mem_ops.v2p(ctxt, dsdt);
+ fadt->x_dsdt = ctxt->mem_ops.v2p(ctxt, dsdt);
+ fadt->firmware_ctrl = ctxt->mem_ops.v2p(ctxt, facs);
+ fadt->x_firmware_ctrl = ctxt->mem_ops.v2p(ctxt, facs);
set_checksum(fadt,
offsetof(struct acpi_header, checksum),
sizeof(struct acpi_20_fadt));
@@ -590,7 +591,7 @@ void acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config)
16);
if (!xsdt) goto oom;
memcpy(xsdt, &Xsdt, sizeof(struct acpi_header));
- xsdt->entry[0] = (unsigned long)fadt;
+ xsdt->entry[0] = ctxt->mem_ops.v2p(ctxt, fadt);
for ( i = 0; secondary_tables[i]; i++ )
xsdt->entry[i+1] = secondary_tables[i];
xsdt->header.length = sizeof(struct acpi_header) + (i+1)*sizeof(uint64_t);
@@ -603,7 +604,7 @@ void acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config)
16);
if (!rsdt) goto oom;
memcpy(rsdt, &Rsdt, sizeof(struct acpi_header));
- rsdt->entry[0] = (unsigned long)fadt_10;
+ rsdt->entry[0] = ctxt->mem_ops.v2p(ctxt, fadt_10);
for ( i = 0; secondary_tables[i]; i++ )
rsdt->entry[i+1] = secondary_tables[i];
rsdt->header.length = sizeof(struct acpi_header) + (i+1)*sizeof(uint32_t);
@@ -617,8 +618,8 @@ void acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config)
rsdp = (struct acpi_20_rsdp *)config->rsdp;
memcpy(rsdp, &Rsdp, sizeof(struct acpi_20_rsdp));
- rsdp->rsdt_address = (unsigned long)rsdt;
- rsdp->xsdt_address = (unsigned long)xsdt;
+ rsdp->rsdt_address = ctxt->mem_ops.v2p(ctxt, rsdt);
+ rsdp->xsdt_address = ctxt->mem_ops.v2p(ctxt, xsdt);
set_checksum(rsdp,
offsetof(struct acpi_10_rsdp, checksum),
sizeof(struct acpi_10_rsdp));
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v5 11/21] acpi/hvmloader: Link ACPI object files directly
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
` (9 preceding siblings ...)
2016-09-22 19:13 ` [PATCH v5 10/21] acpi/hvmloader: Translate all addresses when assigning addresses in ACPI tables Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 12/21] acpi/hvmloader: Include file/paths adjustments Boris Ostrovsky
` (9 subsequent siblings)
20 siblings, 0 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
ACPI sources will be available to various component which will build
them according to their own rules. ACPI's Makefile will only generate
necessary source files.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
Changes in v5:
* .gitignore lists all dsdt* / ssdt* files as not tracked.
* Clarified use of TMP_SUFFIX afor iasl bug workaround
.gitignore | 7 +++--
tools/firmware/hvmloader/Makefile | 11 +++++++-
tools/firmware/hvmloader/acpi/Makefile | 47 +++++++++++++++++++---------------
3 files changed, 39 insertions(+), 26 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6dee857..8e30a5d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -127,13 +127,12 @@ tools/firmware/*bios/*bios*.txt
tools/firmware/etherboot/gpxe/*
tools/firmware/extboot/extboot.img
tools/firmware/extboot/signrom
-tools/firmware/hvmloader/acpi/mk_dsdt
-tools/firmware/hvmloader/acpi/dsdt*.c
-tools/firmware/hvmloader/acpi/dsdt_*cpu*.asl
-tools/firmware/hvmloader/acpi/ssdt_*.h
+tools/firmware/hvmloader/dsdt*
tools/firmware/hvmloader/hvmloader
+tools/firmware/hvmloader/mk_dsdt
tools/firmware/hvmloader/roms.h
tools/firmware/hvmloader/roms.inc
+tools/firmware/hvmloader/ssdt*
tools/firmware/rombios/BIOS-bochs-[^/]*
tools/firmware/rombios/_rombios[^/]*_.c
tools/firmware/rombios/rombios[^/]*.s
diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index 23b0a58..2565832 100644
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -20,6 +20,7 @@
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:
@@ -76,7 +77,15 @@ all: subdirs-all
rombios.o: roms.inc
smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(SMBIOS_REL_DATE)\""
-hvmloader: $(OBJS) acpi/acpi.a
+ACPI_PATH = acpi
+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$(ACPI_PATH) -I.
+vpath build.c $(ACPI_PATH)
+vpath static_tables.c $(ACPI_PATH)
+OBJS += $(ACPI_OBJS)
+
+hvmloader: $(OBJS)
$(LD) $(LDFLAGS_DIRECT) -N -Ttext $(LOADADDR) -o hvmloader.tmp $^
$(OBJCOPY) hvmloader.tmp hvmloader
rm -f hvmloader.tmp
diff --git a/tools/firmware/hvmloader/acpi/Makefile b/tools/firmware/hvmloader/acpi/Makefile
index b14b3ea..3550a84 100644
--- a/tools/firmware/hvmloader/acpi/Makefile
+++ b/tools/firmware/hvmloader/acpi/Makefile
@@ -15,52 +15,57 @@
XEN_ROOT = $(CURDIR)/../../../..
include $(XEN_ROOT)/tools/firmware/Rules.mk
-C_SRC-$(GPL) = build.c dsdt_anycpu.c dsdt_15cpu.c dsdt_anycpu_qemu_xen.c
-C_SRC = build.c static_tables.c $(C_SRC-y)
-OBJS = $(patsubst %.c,%.o,$(C_SRC))
+MK_DSDT = $(ACPI_BUILD_DIR)/mk_dsdt
-CFLAGS += $(CFLAGS_xeninclude)
+C_SRC-$(GPL) = dsdt_anycpu.c dsdt_15cpu.c dsdt_anycpu_qemu_xen.c
+C_SRC = $(addprefix $(ACPI_BUILD_DIR)/, $(C_SRC-y))
+H_SRC = $(addprefix $(ACPI_BUILD_DIR)/, ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h)
# Suffix for temporary files.
+#
+# We will also use this suffix to workaround a bug in older iasl
+# versions where the tool will ignore everything after last '.' in the
+# path ('-p' argument). By adding ".<suffix>" we force iasl to use
+# complete $(ACPI_BUILD_DIR) as path, even if it has '.' symbols.
TMP_SUFFIX = tmp
vpath iasl $(PATH)
-all: acpi.a
+all: $(C_SRC) $(H_SRC)
-ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h: %.h: %.asl iasl
- iasl -vs -p $* -tc $<
- sed -e 's/AmlCode/$*/g' $*.hex >$@
- rm -f $*.hex $*.aml
+$(H_SRC): $(ACPI_BUILD_DIR)/%.h: %.asl iasl
+ iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $<
+ sed -e 's/AmlCode/$*/g' $(ACPI_BUILD_DIR)/$*.hex >$@
+ rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex)
-mk_dsdt: mk_dsdt.c
+$(MK_DSDT): mk_dsdt.c
$(HOSTCC) $(HOSTCFLAGS) $(CFLAGS_xeninclude) -o $@ mk_dsdt.c
ifeq ($(GPL),y)
-dsdt_anycpu_qemu_xen.asl: dsdt.asl dsdt_acpi_info.asl gpl/mk_dsdt_gpl.sh mk_dsdt
+$(ACPI_BUILD_DIR)/dsdt_anycpu_qemu_xen.asl: dsdt.asl dsdt_acpi_info.asl gpl/mk_dsdt_gpl.sh $(MK_DSDT)
awk 'NR > 1 {print s} {s=$$0}' $< > $@.$(TMP_SUFFIX)
# Strip license comment
sed -i '1,/\*\//{/\/\*/,/\*\//d}' $@.$(TMP_SUFFIX)
./gpl/mk_dsdt_gpl.sh >> $@.$(TMP_SUFFIX)
cat dsdt_acpi_info.asl >> $@.$(TMP_SUFFIX)
- ./mk_dsdt --debug=$(debug) --dm-version qemu-xen >> $@.$(TMP_SUFFIX)
+ $(MK_DSDT) --debug=$(debug) --dm-version qemu-xen >> $@.$(TMP_SUFFIX)
mv -f $@.$(TMP_SUFFIX) $@
# NB. awk invocation is a portable alternative to 'head -n -1'
-dsdt_%cpu.asl: dsdt.asl dsdt_acpi_info.asl gpl/mk_dsdt_gpl.sh mk_dsdt
+$(ACPI_BUILD_DIR)/dsdt_%cpu.asl: dsdt.asl dsdt_acpi_info.asl gpl/mk_dsdt_gpl.sh $(MK_DSDT)
awk 'NR > 1 {print s} {s=$$0}' $< > $@.$(TMP_SUFFIX)
sed -i '1,/\*\//{/\/\*/,/\*\//d}' $@.$(TMP_SUFFIX)
./gpl/mk_dsdt_gpl.sh >> $@.$(TMP_SUFFIX)
cat dsdt_acpi_info.asl >> $@.$(TMP_SUFFIX)
- ./mk_dsdt --debug=$(debug) --maxcpu $* >> $@.$(TMP_SUFFIX)
+ $(MK_DSDT) --debug=$(debug) --maxcpu $* >> $@.$(TMP_SUFFIX)
mv -f $@.$(TMP_SUFFIX) $@
endif
-$(filter dsdt_%.c,$(C_SRC)): %.c: iasl %.asl
- iasl -vs -p $* -tc $*.asl
- sed -e 's/AmlCode/$*/g' $*.hex >$@.$(TMP_SUFFIX)
- echo "int $*_len=sizeof($*);" >>$@.$(TMP_SUFFIX)
+$(C_SRC): $(ACPI_BUILD_DIR)/%.c: iasl $(ACPI_BUILD_DIR)/%.asl
+ iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $(ACPI_BUILD_DIR)/$*.asl
+ sed -e 's/AmlCode/$*/g' $(ACPI_BUILD_DIR)/$*.hex > $@.$(TMP_SUFFIX)
+ echo "int $*_len=sizeof($*);" >> $@.$(TMP_SUFFIX)
mv -f $@.$(TMP_SUFFIX) $@
- rm -f $*.aml $*.hex
+ rm -f $(addprefix $(ACPI_BUILD_DIR)/, $*.aml $*.hex)
iasl:
@echo
@@ -76,8 +81,8 @@ acpi.a: $(OBJS)
$(AR) rc $@ $(OBJS)
clean:
- rm -rf *.a *.o $(IASL_VER) $(IASL_VER).tar.gz $(DEPS)
- rm -rf ssdt_*.h dsdt*.c *~ *.aml *.hex mk_dsdt dsdt_*cpu*.asl *.$(TMP_SUFFIX)
+ rm -f $(C_SRC) $(H_SRC) $(MK_DSDT) $(C_SRC:=.$(TMP_SUFFIX))
+ rm -f $(patsubst %.c,%.hex,$(C_SRC)) $(patsubst %.c,%.aml,$(C_SRC)) $(patsubst %.c,%.asl,$(C_SRC))
distclean: clean
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v5 12/21] acpi/hvmloader: Include file/paths adjustments
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
` (10 preceding siblings ...)
2016-09-22 19:13 ` [PATCH v5 11/21] acpi/hvmloader: Link ACPI object files directly Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 13/21] acpi: Move ACPI code to tools/libacpi Boris Ostrovsky
` (8 subsequent siblings)
20 siblings, 0 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
In prepearation to moving acpi sources into generally available
libacpi:
1. Pass IOAPIC/LAPIC/PCI mask values via struct acpi_config
2. Modify include files search paths to point to acpi directory
3. Macro-ise include file for build.c that defines various
utilities used by that file. Users of libacpi will be expected
to define this macro when compiling build.c
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
Changes in v5:
* Include <xen/hvm/hvm_info_table.h> in build.c
tools/firmware/hvmloader/Makefile | 3 ++-
tools/firmware/hvmloader/acpi/README | 16 ++++++++++++----
tools/firmware/hvmloader/acpi/build.c | 20 +++++++++++---------
tools/firmware/hvmloader/acpi/libacpi.h | 7 +++++++
tools/firmware/hvmloader/hvmloader.c | 2 +-
tools/firmware/hvmloader/rombios.c | 2 +-
tools/firmware/hvmloader/seabios.c | 5 +++--
tools/firmware/hvmloader/util.c | 15 +++++++++++++--
tools/firmware/rombios/32bit/Makefile | 2 +-
tools/firmware/rombios/32bit/tcgbios/Makefile | 2 +-
tools/firmware/rombios/32bit/util.h | 2 +-
11 files changed, 53 insertions(+), 23 deletions(-)
diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index 2565832..7b3641c 100644
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -80,7 +80,8 @@ smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(SMBIOS_REL_DATE)\""
ACPI_PATH = acpi
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$(ACPI_PATH) -I.
+$(ACPI_OBJS): CFLAGS += -I. -DLIBACPI_STDUTILS=\"../util.h\"
+CFLAGS += -I$(ACPI_PATH)
vpath build.c $(ACPI_PATH)
vpath static_tables.c $(ACPI_PATH)
OBJS += $(ACPI_OBJS)
diff --git a/tools/firmware/hvmloader/acpi/README b/tools/firmware/hvmloader/acpi/README
index 210d5ba..2b9d6e1 100644
--- a/tools/firmware/hvmloader/acpi/README
+++ b/tools/firmware/hvmloader/acpi/README
@@ -1,11 +1,19 @@
-ACPI Table for domain firmware
+ACPI builder for domain firmware
-INSTALL
+BUILDING ACPI
-----------------
-Simply make is OK.
-# make
+Users of ACPI builder are expected to provide an include file that makes available
+the following:
+* strncpy
+* printf
+* NULL
+* test_bit
+* offsetof
+When compiling build.c, the name of this include file should be given to
+compiler as -DLIBACPI_STDUTILS=\"<filename>\". See tools/firmware/hvmloader/Makefile
+for an example.
Note on DSDT Table
------------------
diff --git a/tools/firmware/hvmloader/acpi/build.c b/tools/firmware/hvmloader/acpi/build.c
index b295ef0..6749c9b 100644
--- a/tools/firmware/hvmloader/acpi/build.c
+++ b/tools/firmware/hvmloader/acpi/build.c
@@ -13,15 +13,14 @@
* GNU Lesser General Public License for more details.
*/
+#include LIBACPI_STDUTILS
#include "acpi2_0.h"
#include "libacpi.h"
#include "ssdt_s3.h"
#include "ssdt_s4.h"
#include "ssdt_tpm.h"
#include "ssdt_pm.h"
-#include "../config.h"
-#include "../util.h"
-#include "../vnuma.h"
+#include <xen/hvm/hvm_info_table.h>
#include <xen/hvm/hvm_xs_strings.h>
#include <xen/hvm/params.h>
#include <xen/memory.h>
@@ -82,6 +81,9 @@ static struct acpi_20_madt *construct_madt(struct acpi_ctxt *ctxt,
const struct hvm_info_table *hvminfo = config->hvminfo;
int i, sz;
+ if ( config->lapic_id == NULL )
+ return NULL;
+
sz = sizeof(struct acpi_20_madt);
sz += sizeof(struct acpi_20_madt_intsrcovr) * 16;
sz += sizeof(struct acpi_20_madt_ioapic);
@@ -98,7 +100,7 @@ static struct acpi_20_madt *construct_madt(struct acpi_ctxt *ctxt,
madt->header.oem_revision = ACPI_OEM_REVISION;
madt->header.creator_id = ACPI_CREATOR_ID;
madt->header.creator_revision = ACPI_CREATOR_REVISION;
- madt->lapic_addr = LAPIC_BASE_ADDRESS;
+ madt->lapic_addr = config->lapic_base_address;
madt->flags = ACPI_PCAT_COMPAT;
if ( config->table_flags & ACPI_HAS_IOAPIC )
@@ -117,7 +119,7 @@ static struct acpi_20_madt *construct_madt(struct acpi_ctxt *ctxt,
intsrcovr->gsi = 2;
intsrcovr->flags = 0x0;
}
- else if ( PCI_ISA_IRQ_MASK & (1U << i) )
+ else if ( config->pci_isa_irq_mask & (1U << i) )
{
/* PCI: active-low level-triggered. */
intsrcovr->gsi = i;
@@ -136,8 +138,8 @@ static struct acpi_20_madt *construct_madt(struct acpi_ctxt *ctxt,
memset(io_apic, 0, sizeof(*io_apic));
io_apic->type = ACPI_IO_APIC;
io_apic->length = sizeof(*io_apic);
- io_apic->ioapic_id = IOAPIC_ID;
- io_apic->ioapic_addr = ioapic_base_address;
+ io_apic->ioapic_id = config->ioapic_id;
+ io_apic->ioapic_addr = config->ioapic_base_address;
lapic = (struct acpi_20_madt_lapic *)(io_apic + 1);
}
@@ -153,7 +155,7 @@ static struct acpi_20_madt *construct_madt(struct acpi_ctxt *ctxt,
lapic->length = sizeof(*lapic);
/* Processor ID must match processor-object IDs in the DSDT. */
lapic->acpi_processor_id = i;
- lapic->apic_id = LAPIC_ID(i);
+ lapic->apic_id = config->lapic_id(i);
lapic->flags = (test_bit(i, hvminfo->vcpu_online)
? ACPI_LOCAL_APIC_ENABLED : 0);
lapic++;
@@ -241,7 +243,7 @@ static struct acpi_20_srat *construct_srat(struct acpi_ctxt *ctxt,
processor->type = ACPI_PROCESSOR_AFFINITY;
processor->length = sizeof(*processor);
processor->domain = config->numa.vcpu_to_vnode[i];
- processor->apic_id = LAPIC_ID(i);
+ processor->apic_id = config->lapic_id(i);
processor->flags = ACPI_LOCAL_APIC_AFFIN_ENABLED;
processor++;
}
diff --git a/tools/firmware/hvmloader/acpi/libacpi.h b/tools/firmware/hvmloader/acpi/libacpi.h
index 35b6f47..e386362 100644
--- a/tools/firmware/hvmloader/acpi/libacpi.h
+++ b/tools/firmware/hvmloader/acpi/libacpi.h
@@ -82,6 +82,13 @@ struct acpi_config {
/* RSDP address */
unsigned int rsdp;
+
+ /* x86-specific parameters */
+ uint8_t (*lapic_id)(unsigned cpu);
+ uint32_t lapic_base_address;
+ uint32_t ioapic_base_address;
+ uint16_t pci_isa_irq_mask;
+ uint8_t ioapic_id;
};
void acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config);
diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c
index bbd4e34..77b9536 100644
--- a/tools/firmware/hvmloader/hvmloader.c
+++ b/tools/firmware/hvmloader/hvmloader.c
@@ -24,8 +24,8 @@
#include "config.h"
#include "pci_regs.h"
#include "apic_regs.h"
-#include "acpi/acpi2_0.h"
#include "vnuma.h"
+#include <acpi2_0.h>
#include <xen/version.h>
#include <xen/hvm/params.h>
#include <xen/arch-x86/hvm/start_info.h>
diff --git a/tools/firmware/hvmloader/rombios.c b/tools/firmware/hvmloader/rombios.c
index 9acf03f..56b39b7 100644
--- a/tools/firmware/hvmloader/rombios.c
+++ b/tools/firmware/hvmloader/rombios.c
@@ -24,12 +24,12 @@
#include "../rombios/config.h"
#include "smbios_types.h"
-#include "acpi/libacpi.h"
#include "pci_regs.h"
#include "util.h"
#include "hypercall.h"
#include "option_rom.h"
+#include <libacpi.h>
#include <xen/hvm/params.h>
#define ROM_INCLUDE_ROMBIOS
diff --git a/tools/firmware/hvmloader/seabios.c b/tools/firmware/hvmloader/seabios.c
index 44ff0d7..870576a 100644
--- a/tools/firmware/hvmloader/seabios.c
+++ b/tools/firmware/hvmloader/seabios.c
@@ -25,8 +25,9 @@
#include "util.h"
#include "smbios_types.h"
-#include "acpi/acpi2_0.h"
-#include "acpi/libacpi.h"
+
+#include <acpi2_0.h>
+#include <libacpi.h>
extern unsigned char dsdt_anycpu_qemu_xen[];
extern int dsdt_anycpu_qemu_xen_len;
diff --git a/tools/firmware/hvmloader/util.c b/tools/firmware/hvmloader/util.c
index 3a423ab..6e0cfe7 100644
--- a/tools/firmware/hvmloader/util.c
+++ b/tools/firmware/hvmloader/util.c
@@ -22,8 +22,8 @@
#include "hypercall.h"
#include "ctype.h"
#include "vnuma.h"
-#include "acpi/acpi2_0.h"
-#include "acpi/libacpi.h"
+#include <acpi2_0.h>
+#include <libacpi.h>
#include <stdint.h>
#include <xen/xen.h>
#include <xen/memory.h>
@@ -883,6 +883,11 @@ static void acpi_mem_free(struct acpi_ctxt *ctxt,
/* ACPI builder currently doesn't free memory so this is just a stub */
}
+static uint8_t acpi_lapic_id(unsigned cpu)
+{
+ return LAPIC_ID(cpu);
+}
+
void hvmloader_acpi_build_tables(struct acpi_config *config,
unsigned int physical)
{
@@ -892,6 +897,12 @@ void hvmloader_acpi_build_tables(struct acpi_config *config,
/* Allocate and initialise the acpi info area. */
mem_hole_populate_ram(ACPI_INFO_PHYSICAL_ADDRESS >> PAGE_SHIFT, 1);
+ config->lapic_base_address = LAPIC_BASE_ADDRESS;
+ config->lapic_id = acpi_lapic_id;
+ config->ioapic_base_address = ioapic_base_address;
+ config->ioapic_id = IOAPIC_ID;
+ config->pci_isa_irq_mask = PCI_ISA_IRQ_MASK;
+
if ( uart_exists(0x3f8) )
config->table_flags |= ACPI_HAS_COM1;
if ( uart_exists(0x2f8) )
diff --git a/tools/firmware/rombios/32bit/Makefile b/tools/firmware/rombios/32bit/Makefile
index 396906c..71399d2 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../../hvmloader/acpi
SUBDIRS = tcgbios
diff --git a/tools/firmware/rombios/32bit/tcgbios/Makefile b/tools/firmware/rombios/32bit/tcgbios/Makefile
index f6f2649..6822027 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../../../hvmloader/acpi
.PHONY: all
all: $(TARGET)
diff --git a/tools/firmware/rombios/32bit/util.h b/tools/firmware/rombios/32bit/util.h
index e245be6..6b90c43 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);
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v5 13/21] acpi: Move ACPI code to tools/libacpi
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
` (11 preceding siblings ...)
2016-09-22 19:13 ` [PATCH v5 12/21] acpi/hvmloader: Include file/paths adjustments Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 14/21] x86: Allow LAPIC-only emulation_flags for HVM guests Boris Ostrovsky
` (7 subsequent siblings)
20 siblings, 0 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
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}/COPYING | 0
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
.../hvmloader/acpi => libacpi}/dsdt_acpi_info.asl | 0
tools/{firmware/hvmloader/acpi => libacpi}/gpl/COPYING | 0
.../hvmloader/acpi => libacpi}/gpl/mk_dsdt_gpl.sh | 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
21 files changed, 13 insertions(+), 10 deletions(-)
rename tools/{firmware/hvmloader/acpi => libacpi}/COPYING (100%)
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}/dsdt_acpi_info.asl (100%)
rename tools/{firmware/hvmloader/acpi => libacpi}/gpl/COPYING (100%)
rename tools/{firmware/hvmloader/acpi => libacpi}/gpl/mk_dsdt_gpl.sh (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 <suravee.suthikulpanit@amd.com>
diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile
index 7b3641c..c19986a 100644
--- a/tools/firmware/hvmloader/Makefile
+++ b/tools/firmware/hvmloader/Makefile
@@ -20,10 +20,7 @@
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
# SMBIOS spec requires format mm/dd/yyyy
@@ -71,16 +68,20 @@ GPL = y
export GPL
.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)
@@ -122,6 +123,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/COPYING b/tools/libacpi/COPYING
similarity index 100%
rename from tools/firmware/hvmloader/acpi/COPYING
rename to tools/libacpi/COPYING
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 3550a84..aecac04 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/dsdt_acpi_info.asl b/tools/libacpi/dsdt_acpi_info.asl
similarity index 100%
rename from tools/firmware/hvmloader/acpi/dsdt_acpi_info.asl
rename to tools/libacpi/dsdt_acpi_info.asl
diff --git a/tools/firmware/hvmloader/acpi/gpl/COPYING b/tools/libacpi/gpl/COPYING
similarity index 100%
rename from tools/firmware/hvmloader/acpi/gpl/COPYING
rename to tools/libacpi/gpl/COPYING
diff --git a/tools/firmware/hvmloader/acpi/gpl/mk_dsdt_gpl.sh b/tools/libacpi/gpl/mk_dsdt_gpl.sh
similarity index 100%
rename from tools/firmware/hvmloader/acpi/gpl/mk_dsdt_gpl.sh
rename to tools/libacpi/gpl/mk_dsdt_gpl.sh
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
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v5 14/21] x86: Allow LAPIC-only emulation_flags for HVM guests
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
` (12 preceding siblings ...)
2016-09-22 19:13 ` [PATCH v5 13/21] acpi: Move ACPI code to tools/libacpi Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 15/21] libacpi: Build DSDT for PVH guests Boris Ostrovsky
` (6 subsequent siblings)
20 siblings, 0 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
PVHv2 guests may request LAPIC emulation (and nothing else)
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: Jan Beulich <jbeulich@suse.com>
---
xen/arch/x86/domain.c | 26 ++++++++++++++++----------
1 file changed, 16 insertions(+), 10 deletions(-)
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index 3c4b094..1bd5eb6 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -545,25 +545,31 @@ int arch_domain_create(struct domain *d, unsigned int domcr_flags,
}
else
{
- if ( (config->emulation_flags & ~XEN_X86_EMU_ALL) != 0 )
+ uint32_t emflags;
+
+ if ( is_hardware_domain(d) )
+ config->emulation_flags |= XEN_X86_EMU_PIT;
+
+ emflags = config->emulation_flags;
+ if ( emflags & ~XEN_X86_EMU_ALL )
{
printk(XENLOG_G_ERR "d%d: Invalid emulation bitmap: %#x\n",
- d->domain_id, config->emulation_flags);
+ d->domain_id, emflags);
return -EINVAL;
}
- if ( is_hardware_domain(d) )
- config->emulation_flags |= XEN_X86_EMU_PIT;
- if ( config->emulation_flags != 0 &&
- (config->emulation_flags !=
- (is_hvm_domain(d) ? XEN_X86_EMU_ALL : XEN_X86_EMU_PIT)) )
+
+ /* PVHv2 guests can request emulated APIC. */
+ if ( emflags &&
+ (is_hvm_domain(d) ? ((emflags != XEN_X86_EMU_ALL) &&
+ (emflags != XEN_X86_EMU_LAPIC)) :
+ (emflags != XEN_X86_EMU_PIT)) )
{
printk(XENLOG_G_ERR "d%d: Xen does not allow %s domain creation "
"with the current selection of emulators: %#x\n",
- d->domain_id, is_hvm_domain(d) ? "HVM" : "PV",
- config->emulation_flags);
+ d->domain_id, is_hvm_domain(d) ? "HVM" : "PV", emflags);
return -EOPNOTSUPP;
}
- d->arch.emulation_flags = config->emulation_flags;
+ d->arch.emulation_flags = emflags;
}
if ( has_hvm_container_domain(d) )
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v5 15/21] libacpi: Build DSDT for PVH guests
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
` (13 preceding siblings ...)
2016-09-22 19:13 ` [PATCH v5 14/21] x86: Allow LAPIC-only emulation_flags for HVM guests Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 16/21] libxc/libxl: Allow multiple ACPI modules Boris Ostrovsky
` (5 subsequent siblings)
20 siblings, 0 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
PVH guests require DSDT with only ACPI INFO (Xen-specific) and Processor
objects. We separate ASL's ACPI INFO definition into dsdt_acpi_info.asl so
that it can be included in ASLs for both HVM and PVH2.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
tools/libacpi/Makefile | 7 ++++++-
tools/libacpi/mk_dsdt.c | 8 ++++++++
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/tools/libacpi/Makefile b/tools/libacpi/Makefile
index aecac04..470b898 100644
--- a/tools/libacpi/Makefile
+++ b/tools/libacpi/Makefile
@@ -18,7 +18,7 @@ include $(XEN_ROOT)/tools/firmware/Rules.mk
MK_DSDT = $(ACPI_BUILD_DIR)/mk_dsdt
C_SRC-$(GPL) = dsdt_anycpu.c dsdt_15cpu.c dsdt_anycpu_qemu_xen.c
-C_SRC = $(addprefix $(ACPI_BUILD_DIR)/, $(C_SRC-y))
+C_SRC = $(addprefix $(ACPI_BUILD_DIR)/, dsdt_pvh.c $(C_SRC-y))
H_SRC = $(addprefix $(ACPI_BUILD_DIR)/, ssdt_s3.h ssdt_s4.h ssdt_pm.h ssdt_tpm.h)
# Suffix for temporary files.
@@ -60,6 +60,11 @@ $(ACPI_BUILD_DIR)/dsdt_%cpu.asl: dsdt.asl dsdt_acpi_info.asl gpl/mk_dsdt_gpl.sh
mv -f $@.$(TMP_SUFFIX) $@
endif
+$(ACPI_BUILD_DIR)/dsdt_pvh.asl: dsdt_acpi_info.asl $(MK_DSDT)
+ printf "DefinitionBlock (\"DSDT.aml\", \"DSDT\", 5, \"Xen\", \"HVM\", 0)\n{" > $@
+ cat dsdt_acpi_info.asl >> $@
+ $(MK_DSDT) --debug=$(debug) --maxcpu any --dm-version none >> $@
+
$(C_SRC): $(ACPI_BUILD_DIR)/%.c: iasl $(ACPI_BUILD_DIR)/%.asl
iasl -vs -p $(ACPI_BUILD_DIR)/$*.$(TMP_SUFFIX) -tc $(ACPI_BUILD_DIR)/$*.asl
sed -e 's/AmlCode/$*/g' $(ACPI_BUILD_DIR)/$*.hex > $@.$(TMP_SUFFIX)
diff --git a/tools/libacpi/mk_dsdt.c b/tools/libacpi/mk_dsdt.c
index e750820..8130cbd 100644
--- a/tools/libacpi/mk_dsdt.c
+++ b/tools/libacpi/mk_dsdt.c
@@ -23,6 +23,7 @@ static unsigned int indent_level;
static bool debug = false;
typedef enum dm_version {
+ QEMU_NONE,
QEMU_XEN_TRADITIONAL,
QEMU_XEN,
} dm_version;
@@ -135,6 +136,8 @@ int main(int argc, char **argv)
dm_version = QEMU_XEN;
} else if (strcmp(optarg, "qemu-xen-traditional") == 0) {
dm_version = QEMU_XEN_TRADITIONAL;
+ } else if (strcmp(optarg, "none") == 0) {
+ dm_version = QEMU_NONE;
} else {
fprintf(stderr, "Unknown device model version `%s'.\n", optarg);
return -1;
@@ -252,6 +255,11 @@ int main(int argc, char **argv)
pop_block();
+ if (dm_version == QEMU_NONE) {
+ pop_block();
+ return 0;
+ }
+
/* Define GPE control method. */
push_block("Scope", "\\_GPE");
push_block("Method",
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v5 16/21] libxc/libxl: Allow multiple ACPI modules
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
` (14 preceding siblings ...)
2016-09-22 19:13 ` [PATCH v5 15/21] libacpi: Build DSDT for PVH guests Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 17/21] libxl/acpi: Add ACPI e820 entry Boris Ostrovsky
` (4 subsequent siblings)
20 siblings, 0 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
Provide ability to load multiple ACPI modules. Thie feature is needed
by PVHv2 guests and will be used in subsequent patches.
We assume that PVHv2 guests do not load their ACPI modules specified
in the configuration file. We can extend support for that in the future
if desired.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---
tools/libxc/include/xc_dom.h | 5 +++--
tools/libxc/xc_dom_hvmloader.c | 3 ++-
tools/libxl/libxl_dom.c | 26 ++++++++++++++++++--------
3 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/tools/libxc/include/xc_dom.h b/tools/libxc/include/xc_dom.h
index de7dca9..608cbc2 100644
--- a/tools/libxc/include/xc_dom.h
+++ b/tools/libxc/include/xc_dom.h
@@ -212,8 +212,9 @@ struct xc_dom_image {
/* BIOS/Firmware passed to HVMLOADER */
struct xc_hvm_firmware_module system_firmware_module;
- /* Extra ACPI tables passed to HVMLOADER */
- struct xc_hvm_firmware_module acpi_module;
+ /* Extra ACPI tables */
+#define MAX_ACPI_MODULES 4
+ struct xc_hvm_firmware_module acpi_modules[MAX_ACPI_MODULES];
/* Extra SMBIOS structures passed to HVMLOADER */
struct xc_hvm_firmware_module smbios_module;
diff --git a/tools/libxc/xc_dom_hvmloader.c b/tools/libxc/xc_dom_hvmloader.c
index 6eb8516..59f94e5 100644
--- a/tools/libxc/xc_dom_hvmloader.c
+++ b/tools/libxc/xc_dom_hvmloader.c
@@ -172,7 +172,8 @@ static int modules_init(struct xc_dom_image *dom)
rc = module_init_one(dom, &dom->system_firmware_module,
"System Firmware module");
if ( rc ) goto err;
- rc = module_init_one(dom, &dom->acpi_module, "ACPI module");
+ /* Only one module can be added */
+ rc = module_init_one(dom, &dom->acpi_modules[0], "ACPI module");
if ( rc ) goto err;
rc = module_init_one(dom, &dom->smbios_module, "SMBIOS module");
if ( rc ) goto err;
diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
index c895649..c4be916 100644
--- a/tools/libxl/libxl_dom.c
+++ b/tools/libxl/libxl_dom.c
@@ -818,7 +818,8 @@ static int hvm_build_set_params(xc_interface *handle, uint32_t domid,
static int hvm_build_set_xs_values(libxl__gc *gc,
uint32_t domid,
- struct xc_dom_image *dom)
+ struct xc_dom_image *dom,
+ const libxl_domain_build_info *info)
{
char *path = NULL;
int ret = 0;
@@ -839,18 +840,20 @@ static int hvm_build_set_xs_values(libxl__gc *gc,
goto err;
}
- if (dom->acpi_module.guest_addr_out) {
+ /* Only one module can be passed. PVHv2 guests do not support this. */
+ if (dom->acpi_modules[0].guest_addr_out &&
+ info->device_model_version !=LIBXL_DEVICE_MODEL_VERSION_NONE) {
path = GCSPRINTF("/local/domain/%d/"HVM_XS_ACPI_PT_ADDRESS, domid);
ret = libxl__xs_printf(gc, XBT_NULL, path, "0x%"PRIx64,
- dom->acpi_module.guest_addr_out);
+ dom->acpi_modules[0].guest_addr_out);
if (ret)
goto err;
path = GCSPRINTF("/local/domain/%d/"HVM_XS_ACPI_PT_LENGTH, domid);
ret = libxl__xs_printf(gc, XBT_NULL, path, "0x%x",
- dom->acpi_module.length);
+ dom->acpi_modules[0].length);
if (ret)
goto err;
}
@@ -994,6 +997,13 @@ static int libxl__domain_firmware(libxl__gc *gc,
}
if (info->u.hvm.acpi_firmware) {
+
+ if (info->device_model_version == LIBXL_DEVICE_MODEL_VERSION_NONE) {
+ LOGE(ERROR, "PVH guests do not allow loading ACPI modules");
+ rc = ERROR_FAIL;
+ goto out;
+ }
+
data = NULL;
e = libxl_read_file_contents(ctx, info->u.hvm.acpi_firmware,
&data, &datalen);
@@ -1005,9 +1015,9 @@ static int libxl__domain_firmware(libxl__gc *gc,
}
libxl__ptr_add(gc, data);
if (datalen) {
- /* Only accept non-empty files */
- dom->acpi_module.data = data;
- dom->acpi_module.length = (uint32_t)datalen;
+ /* Only accept a non-empty file */
+ dom->acpi_modules[0].data = data;
+ dom->acpi_modules[0].length = (uint32_t)datalen;
}
}
@@ -1143,7 +1153,7 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid,
goto out;
}
- rc = hvm_build_set_xs_values(gc, domid, dom);
+ rc = hvm_build_set_xs_values(gc, domid, dom, info);
if (rc != 0) {
LOG(ERROR, "hvm build set xenstore values failed");
goto out;
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v5 17/21] libxl/acpi: Add ACPI e820 entry
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
` (15 preceding siblings ...)
2016-09-22 19:13 ` [PATCH v5 16/21] libxc/libxl: Allow multiple ACPI modules Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 18/21] libxl/pvhv2: Include APIC page in MMIO hole for PVHv2 guests Boris Ostrovsky
` (3 subsequent siblings)
20 siblings, 0 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
Add entry for ACPI tables created for PVHv2 guests to e820 map.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---
tools/libxl/libxl_dom.c | 8 ++++----
tools/libxl/libxl_x86.c | 15 +++++++++++++++
2 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
index c4be916..7974302 100644
--- a/tools/libxl/libxl_dom.c
+++ b/tools/libxl/libxl_dom.c
@@ -1134,16 +1134,16 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid,
dom->vnode_to_pnode[i] = info->vnuma_nodes[i].pnode;
}
+ rc = libxl__build_dom(gc, domid, info, state, dom);
+ if (rc != 0)
+ goto out;
+
rc = libxl__arch_domain_construct_memmap(gc, d_config, domid, dom);
if (rc != 0) {
LOG(ERROR, "setting domain memory map failed");
goto out;
}
- rc = libxl__build_dom(gc, domid, info, state, dom);
- if (rc != 0)
- goto out;
-
rc = hvm_build_set_params(ctx->xch, domid, info, state->store_port,
&state->store_mfn, state->console_port,
&state->console_mfn, state->store_domid,
diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c
index 46cfafb..2b221aa 100644
--- a/tools/libxl/libxl_x86.c
+++ b/tools/libxl/libxl_x86.c
@@ -492,6 +492,7 @@ int libxl__arch_domain_construct_memmap(libxl__gc *gc,
uint64_t highmem_size =
dom->highmem_end ? dom->highmem_end - (1ull << 32) : 0;
uint32_t lowmem_start = dom->device_model ? GUEST_LOW_MEM_START_DEFAULT : 0;
+ unsigned page_size = XC_DOM_PAGE_SIZE(dom);
/* Add all rdm entries. */
for (i = 0; i < d_config->num_rdms; i++)
@@ -503,6 +504,10 @@ int libxl__arch_domain_construct_memmap(libxl__gc *gc,
if (highmem_size)
e820_entries++;
+ for (i = 0; i < MAX_ACPI_MODULES; i++)
+ if (dom->acpi_modules[i].length)
+ e820_entries++;
+
if (e820_entries >= E820MAX) {
LOG(ERROR, "Ooops! Too many entries in the memory map!");
rc = ERROR_INVAL;
@@ -528,6 +533,16 @@ int libxl__arch_domain_construct_memmap(libxl__gc *gc,
nr++;
}
+ for (i = 0; i < MAX_ACPI_MODULES; i++) {
+ if (dom->acpi_modules[i].length) {
+ e820[nr].addr = dom->acpi_modules[i].guest_addr_out & ~(page_size - 1);
+ e820[nr].size = dom->acpi_modules[i].length +
+ (dom->acpi_modules[i].guest_addr_out & (page_size - 1));
+ e820[nr].type = E820_ACPI;
+ nr++;
+ }
+ }
+
/* High memory */
if (highmem_size) {
e820[nr].addr = ((uint64_t)1 << 32);
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v5 18/21] libxl/pvhv2: Include APIC page in MMIO hole for PVHv2 guests
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
` (16 preceding siblings ...)
2016-09-22 19:13 ` [PATCH v5 17/21] libxl/acpi: Add ACPI e820 entry Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 19/21] libxl: Initialize domain build info before calling libxl__domain_make Boris Ostrovsky
` (2 subsequent siblings)
20 siblings, 0 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---
tools/libxl/Makefile | 2 ++
tools/libxl/libxl_arch.h | 6 ++++++
tools/libxl/libxl_dom.c | 19 +++++++++++++++----
3 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index a3c0af8..90427ff 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -166,6 +166,8 @@ $(XL_OBJS) $(TEST_PROG_OBJS) _libxl.api-for-check: \
$(XL_OBJS): CFLAGS += $(CFLAGS_XL)
$(XL_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h # libxl_json.h needs it.
+libxl_dom.o: CFLAGS += -I$(XEN_ROOT)/tools # include libacpi/x86.h
+
SAVE_HELPER_OBJS = libxl_save_helper.o _libxl_save_msgs_helper.o
$(SAVE_HELPER_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenevtchn)
diff --git a/tools/libxl/libxl_arch.h b/tools/libxl/libxl_arch.h
index 34a853c..253a037 100644
--- a/tools/libxl/libxl_arch.h
+++ b/tools/libxl/libxl_arch.h
@@ -62,4 +62,10 @@ int libxl__arch_domain_construct_memmap(libxl__gc *gc,
uint32_t domid,
struct xc_dom_image *dom);
+#if defined(__i386__) || defined(__x86_64__)
+
+#define LAPIC_BASE_ADDRESS 0xfee00000
+
+#endif
+
#endif
diff --git a/tools/libxl/libxl_dom.c b/tools/libxl/libxl_dom.c
index 7974302..2924629 100644
--- a/tools/libxl/libxl_dom.c
+++ b/tools/libxl/libxl_dom.c
@@ -1077,10 +1077,21 @@ int libxl__build_hvm(libxl__gc *gc, uint32_t domid,
dom->target_pages = mem_size >> XC_PAGE_SHIFT;
if (dom->mmio_size == 0 && device_model)
dom->mmio_size = HVM_BELOW_4G_MMIO_LENGTH;
- else if (dom->mmio_size == 0 && !device_model)
- dom->mmio_size = GB(4) -
- ((X86_HVM_END_SPECIAL_REGION - X86_HVM_NR_SPECIAL_PAGES)
- << XC_PAGE_SHIFT);
+ else if (dom->mmio_size == 0 && !device_model) {
+#if defined(__i386__) || defined(__x86_64__)
+ if (libxl_defbool_val(info->u.hvm.apic)) {
+ /* Make sure LAPIC_BASE_ADDRESS is below special pages */
+ assert(((((X86_HVM_END_SPECIAL_REGION - X86_HVM_NR_SPECIAL_PAGES)
+ << XC_PAGE_SHIFT) - LAPIC_BASE_ADDRESS)) >= XC_PAGE_SIZE);
+ dom->mmio_size = GB(4) - LAPIC_BASE_ADDRESS;
+ } else
+ dom->mmio_size = GB(4) -
+ ((X86_HVM_END_SPECIAL_REGION - X86_HVM_NR_SPECIAL_PAGES)
+ << XC_PAGE_SHIFT);
+#else
+ assert(1);
+#endif
+ }
lowmem_end = mem_size;
highmem_end = 0;
mmio_start = (1ull << 32) - dom->mmio_size;
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v5 19/21] libxl: Initialize domain build info before calling libxl__domain_make
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
` (17 preceding siblings ...)
2016-09-22 19:13 ` [PATCH v5 18/21] libxl/pvhv2: Include APIC page in MMIO hole for PVHv2 guests Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 20/21] libxl/acpi: Build ACPI tables for HVMlite guests Boris Ostrovsky
2016-09-22 19:13 ` [PATCH v5 21/21] libxc/xc_dom_core: Copy ACPI tables to guest space Boris Ostrovsky
20 siblings, 0 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
libxl__domain_make() may want to use b_info so we should set defaults
a little earlier.
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---
tools/libxl/libxl_create.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/tools/libxl/libxl_create.c b/tools/libxl/libxl_create.c
index 04f8ae9..07b2b4b 100644
--- a/tools/libxl/libxl_create.c
+++ b/tools/libxl/libxl_create.c
@@ -899,17 +899,6 @@ static void initiate_domain_create(libxl__egc *egc,
goto error_out;
}
- ret = libxl__domain_make(gc, d_config, &domid, &state->config);
- if (ret) {
- LOG(ERROR, "cannot make domain: %d", ret);
- dcs->guest_domid = domid;
- ret = ERROR_FAIL;
- goto error_out;
- }
-
- dcs->guest_domid = domid;
- dcs->sdss.dm.guest_domid = 0; /* means we haven't spawned */
-
ret = libxl__domain_build_info_setdefault(gc, &d_config->b_info);
if (ret) {
LOG(ERROR, "Unable to set domain build info defaults");
@@ -923,6 +912,17 @@ static void initiate_domain_create(libxl__egc *egc,
goto error_out;
}
+ ret = libxl__domain_make(gc, d_config, &domid, &state->config);
+ if (ret) {
+ LOG(ERROR, "cannot make domain: %d", ret);
+ dcs->guest_domid = domid;
+ ret = ERROR_FAIL;
+ goto error_out;
+ }
+
+ dcs->guest_domid = domid;
+ dcs->sdss.dm.guest_domid = 0; /* means we haven't spawned */
+
/*
* Set the dm version quite early so that libxl doesn't have to pass the
* build info around just to know if the domain has a device model or not.
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v5 20/21] libxl/acpi: Build ACPI tables for HVMlite guests
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
` (18 preceding siblings ...)
2016-09-22 19:13 ` [PATCH v5 19/21] libxl: Initialize domain build info before calling libxl__domain_make Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
2016-09-22 19:21 ` Wei Liu
2016-09-22 19:13 ` [PATCH v5 21/21] libxc/xc_dom_core: Copy ACPI tables to guest space Boris Ostrovsky
20 siblings, 1 reply; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
Changes in v5:
* Dropped include from Makefile
* .gitignore drops all libxl/ssdt* and libxl/ssdt* files from tracking
* Various style adjustments
.gitignore | 11 +-
tools/libacpi/build.c | 6 +-
tools/libacpi/libacpi.h | 6 +-
tools/libxl/Makefile | 17 ++-
tools/libxl/libxl_arch.h | 3 +
tools/libxl/libxl_x86.c | 28 +++--
tools/libxl/libxl_x86_acpi.c | 240 +++++++++++++++++++++++++++++++++++++++++++
tools/libxl/libxl_x86_acpi.h | 35 +++++++
8 files changed, 328 insertions(+), 18 deletions(-)
create mode 100644 tools/libxl/libxl_x86_acpi.c
create mode 100644 tools/libxl/libxl_x86_acpi.h
diff --git a/.gitignore b/.gitignore
index 8e30a5d..06bad34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -172,15 +172,18 @@ tools/include/xen/*
tools/include/xen-xsm/*
tools/include/xen-foreign/*.(c|h|size)
tools/include/xen-foreign/checker
-tools/libxl/libxlu_cfg_y.output
+tools/libxl/_libxl.api-for-check
+tools/libxl/*.api-ok
tools/libxl/*.pc
tools/libxl/*.pc.in
-tools/libxl/xl
+tools/libxl/dsdt*
+tools/libxl/libxlu_cfg_y.output
+tools/libxl/mk_dsdt
+tools/libxl/ssdt*
tools/libxl/testenum
tools/libxl/testenum.c
tools/libxl/tmp.*
-tools/libxl/_libxl.api-for-check
-tools/libxl/*.api-ok
+tools/libxl/xl
tools/misc/cpuperf/cpuperf-perfcntr
tools/misc/cpuperf/cpuperf-xen
tools/misc/xc_shadow
diff --git a/tools/libacpi/build.c b/tools/libacpi/build.c
index 6749c9b..47dae01 100644
--- a/tools/libacpi/build.c
+++ b/tools/libacpi/build.c
@@ -497,7 +497,7 @@ static int new_vm_gid(struct acpi_ctxt *ctxt,
return 1;
}
-void acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config)
+int acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config)
{
struct acpi_info *acpi_info;
struct acpi_20_rsdp *rsdp;
@@ -632,11 +632,11 @@ void acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config)
if ( !new_vm_gid(ctxt, config, acpi_info) )
goto oom;
- return;
+ return 0;
oom:
printf("unable to build ACPI tables: out of memory\n");
-
+ return -1;
}
/*
diff --git a/tools/libacpi/libacpi.h b/tools/libacpi/libacpi.h
index e386362..1d388f9 100644
--- a/tools/libacpi/libacpi.h
+++ b/tools/libacpi/libacpi.h
@@ -78,10 +78,10 @@ struct acpi_config {
* This must match the OperationRegion(BIOS, SystemMemory, ....)
* definition in the DSDT
*/
- unsigned int infop;
+ unsigned long infop;
/* RSDP address */
- unsigned int rsdp;
+ unsigned long rsdp;
/* x86-specific parameters */
uint8_t (*lapic_id)(unsigned cpu);
@@ -91,7 +91,7 @@ struct acpi_config {
uint8_t ioapic_id;
};
-void acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config);
+int acpi_build_tables(struct acpi_ctxt *ctxt, struct acpi_config *config);
#endif /* __LIBACPI_H__ */
diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile
index 90427ff..3c63bf9 100644
--- a/tools/libxl/Makefile
+++ b/tools/libxl/Makefile
@@ -75,7 +75,20 @@ else
LIBXL_OBJS-y += libxl_no_colo.o
endif
-LIBXL_OBJS-$(CONFIG_X86) += libxl_cpuid.o libxl_x86.o libxl_psr.o
+ACPI_PATH = $(XEN_ROOT)/tools/libacpi
+ACPI_FILES = dsdt_pvh.c
+ACPI_OBJS = $(patsubst %.c,%.o,$(ACPI_FILES)) build.o static_tables.o
+$(ACPI_FILES): acpi
+$(ACPI_OBJS): CFLAGS += -I. -DLIBACPI_STDUTILS=\"$(CURDIR)/libxl_x86_acpi.h\"
+vpath build.c $(ACPI_PATH)/
+vpath static_tables.c $(ACPI_PATH)/
+LIBXL_OBJS-$(CONFIG_X86) += $(ACPI_OBJS)
+
+.PHONY: acpi
+acpi:
+ $(MAKE) -C $(ACPI_PATH) ACPI_BUILD_DIR=$(CURDIR)
+
+LIBXL_OBJS-$(CONFIG_X86) += libxl_cpuid.o libxl_x86.o libxl_psr.o libxl_x86_acpi.o
LIBXL_OBJS-$(CONFIG_ARM) += libxl_nocpuid.o libxl_arm.o libxl_libfdt_compat.o
ifeq ($(CONFIG_NetBSD),y)
@@ -167,6 +180,7 @@ $(XL_OBJS): CFLAGS += $(CFLAGS_XL)
$(XL_OBJS): CFLAGS += -include $(XEN_ROOT)/tools/config.h # libxl_json.h needs it.
libxl_dom.o: CFLAGS += -I$(XEN_ROOT)/tools # include libacpi/x86.h
+libxl_x86_acpi.o: CFLAGS += -I$(XEN_ROOT)/tools
SAVE_HELPER_OBJS = libxl_save_helper.o _libxl_save_msgs_helper.o
$(SAVE_HELPER_OBJS): CFLAGS += $(CFLAGS_libxenctrl) $(CFLAGS_libxenevtchn)
@@ -309,6 +323,7 @@ clean:
$(RM) -f testidl.c.new testidl.c *.api-ok
$(RM) -f xenlight.pc
$(RM) -f xlutil.pc
+ $(MAKE) -C $(ACPI_PATH) ACPI_BUILD_DIR=$(CURDIR) clean
distclean: clean
$(RM) -f xenlight.pc.in xlutil.pc.in
diff --git a/tools/libxl/libxl_arch.h b/tools/libxl/libxl_arch.h
index 253a037..b35f7b6 100644
--- a/tools/libxl/libxl_arch.h
+++ b/tools/libxl/libxl_arch.h
@@ -66,6 +66,9 @@ int libxl__arch_domain_construct_memmap(libxl__gc *gc,
#define LAPIC_BASE_ADDRESS 0xfee00000
+int libxl__dom_load_acpi(libxl__gc *gc,
+ const libxl_domain_build_info *b_info,
+ struct xc_dom_image *dom);
#endif
#endif
diff --git a/tools/libxl/libxl_x86.c b/tools/libxl/libxl_x86.c
index 2b221aa..0190baa 100644
--- a/tools/libxl/libxl_x86.c
+++ b/tools/libxl/libxl_x86.c
@@ -8,13 +8,18 @@ int libxl__arch_domain_prepare_config(libxl__gc *gc,
xc_domain_configuration_t *xc_config)
{
- if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM &&
- d_config->b_info.device_model_version !=
- LIBXL_DEVICE_MODEL_VERSION_NONE) {
- /* HVM domains with a device model. */
- xc_config->emulation_flags = XEN_X86_EMU_ALL;
+ if (d_config->c_info.type == LIBXL_DOMAIN_TYPE_HVM) {
+ if (d_config->b_info.device_model_version !=
+ LIBXL_DEVICE_MODEL_VERSION_NONE) {
+ xc_config->emulation_flags = XEN_X86_EMU_ALL;
+ } else if (libxl_defbool_val(d_config->b_info.u.hvm.apic)) {
+ /*
+ * HVM guests without device model may want
+ * to have LAPIC emulation.
+ */
+ xc_config->emulation_flags = XEN_X86_EMU_LAPIC;
+ }
} else {
- /* PV or HVM domains without a device model. */
xc_config->emulation_flags = 0;
}
@@ -366,7 +371,16 @@ int libxl__arch_domain_finalise_hw_description(libxl__gc *gc,
libxl_domain_build_info *info,
struct xc_dom_image *dom)
{
- return 0;
+ int rc = 0;
+
+ if ((info->type == LIBXL_DOMAIN_TYPE_HVM) &&
+ (info->device_model_version == LIBXL_DEVICE_MODEL_VERSION_NONE)) {
+ rc = libxl__dom_load_acpi(gc, info, dom);
+ if (rc != 0)
+ LOGE(ERROR, "libxl_dom_load_acpi failed");
+ }
+
+ return rc;
}
/* Return 0 on success, ERROR_* on failure. */
diff --git a/tools/libxl/libxl_x86_acpi.c b/tools/libxl/libxl_x86_acpi.c
new file mode 100644
index 0000000..ff0e2df
--- /dev/null
+++ b/tools/libxl/libxl_x86_acpi.c
@@ -0,0 +1,240 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ */
+
+#include "libxl_internal.h"
+#include "libxl_arch.h"
+#include <xen/hvm/hvm_info_table.h>
+#include <xen/hvm/e820.h>
+#include "libacpi/libacpi.h"
+
+#include <xc_dom.h>
+
+ /* Number of pages holding ACPI tables */
+#define NUM_ACPI_PAGES 16
+/* Store RSDP in the last 64 bytes of BIOS RO memory */
+#define RSDP_ADDRESS (0x100000 - 64)
+#define ACPI_INFO_PHYSICAL_ADDRESS 0xfc000000
+
+struct libxl_acpi_ctxt {
+ struct acpi_ctxt c;
+
+ unsigned int page_size;
+ unsigned int page_shift;
+
+ /* Memory allocator */
+ unsigned long alloc_base_paddr;
+ unsigned long alloc_base_vaddr;
+ unsigned long alloc_currp;
+ unsigned long alloc_end;
+};
+
+extern const unsigned char dsdt_pvh[];
+extern const unsigned int dsdt_pvh_len;
+
+/* Assumes contiguous physical space */
+static unsigned long virt_to_phys(struct acpi_ctxt *ctxt, void *v)
+{
+ struct libxl_acpi_ctxt *libxl_ctxt =
+ CONTAINER_OF(ctxt, struct libxl_acpi_ctxt, c);
+
+ return (((unsigned long)v - libxl_ctxt->alloc_base_vaddr) +
+ libxl_ctxt->alloc_base_paddr);
+}
+
+static void *mem_alloc(struct acpi_ctxt *ctxt,
+ uint32_t size, uint32_t align)
+{
+ struct libxl_acpi_ctxt *libxl_ctxt =
+ CONTAINER_OF(ctxt, struct libxl_acpi_ctxt, c);
+ unsigned long s, e;
+
+ /* Align to at least 16 bytes. */
+ if (align < 16)
+ align = 16;
+
+ s = (libxl_ctxt->alloc_currp + align) & ~((unsigned long)align - 1);
+ e = s + size - 1;
+
+ /* TODO: Reallocate memory */
+ if ((e < s) || (e >= libxl_ctxt->alloc_end))
+ return NULL;
+
+ while (libxl_ctxt->alloc_currp >> libxl_ctxt->page_shift !=
+ e >> libxl_ctxt->page_shift)
+ libxl_ctxt->alloc_currp += libxl_ctxt->page_size;
+
+ libxl_ctxt->alloc_currp = e;
+
+ return (void *)s;
+}
+
+static void acpi_mem_free(struct acpi_ctxt *ctxt,
+ void *v, uint32_t size)
+{
+}
+
+static uint8_t acpi_lapic_id(unsigned cpu)
+{
+ return cpu * 2;
+}
+
+static int init_acpi_config(libxl__gc *gc,
+ struct xc_dom_image *dom,
+ const libxl_domain_build_info *b_info,
+ struct acpi_config *config)
+{
+ xc_interface *xch = dom->xch;
+ uint32_t domid = dom->guest_domid;
+ xc_dominfo_t info;
+ struct hvm_info_table *hvminfo;
+ int i, rc = 0;
+
+ config->dsdt_anycpu = config->dsdt_15cpu = dsdt_pvh;
+ config->dsdt_anycpu_len = config->dsdt_15cpu_len = dsdt_pvh_len;
+
+ rc = xc_domain_getinfo(xch, domid, 1, &info);
+ if (rc < 0) {
+ LOG(ERROR, "getdomaininfo failed (rc=%d)", rc);
+ goto out;
+ }
+
+ hvminfo = libxl__zalloc(gc, sizeof(*hvminfo));
+
+ hvminfo->apic_mode = libxl_defbool_val(b_info->u.hvm.apic);
+
+ if (dom->nr_vnodes) {
+ unsigned int *vcpu_to_vnode, *vdistance;
+ struct xen_vmemrange *vmemrange;
+ struct acpi_numa *numa = &config->numa;
+
+ rc = xc_domain_getvnuma(xch, domid, &numa->nr_vnodes,
+ &numa->nr_vmemranges,
+ &hvminfo->nr_vcpus, NULL, NULL, NULL);
+ if (rc) {
+ LOG(ERROR, "xc_domain_getvnuma failed (rc=%d)", rc);
+ goto out;
+ }
+
+ vmemrange = libxl__zalloc(gc, dom->nr_vmemranges * sizeof(*vmemrange));
+ vdistance = libxl__zalloc(gc, dom->nr_vnodes * sizeof(*vdistance));
+ vcpu_to_vnode = libxl__zalloc(gc, hvminfo->nr_vcpus *
+ sizeof(*vcpu_to_vnode));
+ rc = xc_domain_getvnuma(xch, domid, &numa->nr_vnodes,
+ &numa->nr_vmemranges, &hvminfo->nr_vcpus,
+ vmemrange, vdistance, vcpu_to_vnode);
+ if (rc) {
+ LOG(ERROR, "xc_domain_getvnuma failed (rc=%d)", rc);
+ goto out;
+ }
+ numa->vmemrange = vmemrange;
+ numa->vdistance = vdistance;
+ numa->vcpu_to_vnode = vcpu_to_vnode;
+ } else {
+ hvminfo->nr_vcpus = info.max_vcpu_id + 1;
+ }
+
+ for (i = 0; i < hvminfo->nr_vcpus; i++)
+ hvminfo->vcpu_online[i / 8] |= 1 << (i & 7);
+
+ config->hvminfo = hvminfo;
+
+ config->lapic_base_address = LAPIC_BASE_ADDRESS;
+ config->lapic_id = acpi_lapic_id;
+
+out:
+ return 0;
+}
+
+int libxl__dom_load_acpi(libxl__gc *gc,
+ const libxl_domain_build_info *b_info,
+ struct xc_dom_image *dom)
+{
+ struct acpi_config config = {0};
+ struct libxl_acpi_ctxt libxl_ctxt;
+ int rc = 0, acpi_pages_num;
+ void *acpi_pages;
+ unsigned long page_mask;
+
+ if ((b_info->type != LIBXL_DOMAIN_TYPE_HVM) ||
+ (b_info->device_model_version != LIBXL_DEVICE_MODEL_VERSION_NONE))
+ goto out;
+
+ libxl_ctxt.page_size = XC_DOM_PAGE_SIZE(dom);
+ libxl_ctxt.page_shift = XC_DOM_PAGE_SHIFT(dom);
+ page_mask = (1UL << libxl_ctxt.page_shift) - 1;
+
+ libxl_ctxt.c.mem_ops.alloc = mem_alloc;
+ libxl_ctxt.c.mem_ops.v2p = virt_to_phys;
+ libxl_ctxt.c.mem_ops.free = acpi_mem_free;
+
+ rc = init_acpi_config(gc, dom, b_info, &config);
+ if (rc) {
+ LOG(ERROR, "init_acpi_config failed (rc=%d)", rc);
+ goto out;
+ }
+
+ config.rsdp = (unsigned long)libxl__malloc(gc, libxl_ctxt.page_size);
+ config.infop = (unsigned long)libxl__malloc(gc, libxl_ctxt.page_size);
+ /* Pages to hold ACPI tables */
+ acpi_pages = libxl__malloc(gc, (NUM_ACPI_PAGES + 1) *
+ libxl_ctxt.page_size);
+
+ /*
+ * Set up allocator memory.
+ * Start next to acpi_info page to avoid fracturing e820.
+ */
+ libxl_ctxt.alloc_base_paddr = ACPI_INFO_PHYSICAL_ADDRESS +
+ libxl_ctxt.page_size;
+ libxl_ctxt.alloc_base_vaddr = libxl_ctxt.alloc_currp =
+ (unsigned long)acpi_pages;
+ libxl_ctxt.alloc_end = (unsigned long)acpi_pages +
+ (NUM_ACPI_PAGES * libxl_ctxt.page_size);
+
+ /* Build the tables. */
+ rc = acpi_build_tables(&libxl_ctxt.c, &config);
+ if (rc) {
+ LOG(ERROR, "acpi_build_tables failed with %d", rc);
+ goto out;
+ }
+
+ /* Calculate how many pages are needed for the tables. */
+ acpi_pages_num =
+ ((libxl_ctxt.alloc_currp - (unsigned long)acpi_pages)
+ >> libxl_ctxt.page_shift) +
+ ((libxl_ctxt.alloc_currp & page_mask) ? 1 : 0);
+
+ dom->acpi_modules[0].data = (void *)config.rsdp;
+ dom->acpi_modules[0].length = 64;
+ dom->acpi_modules[0].guest_addr_out = RSDP_ADDRESS;
+
+ dom->acpi_modules[1].data = (void *)config.infop;
+ dom->acpi_modules[1].length = 4096;
+ dom->acpi_modules[1].guest_addr_out = ACPI_INFO_PHYSICAL_ADDRESS;
+
+ dom->acpi_modules[2].data = acpi_pages;
+ dom->acpi_modules[2].length = acpi_pages_num << libxl_ctxt.page_shift;
+ dom->acpi_modules[2].guest_addr_out = ACPI_INFO_PHYSICAL_ADDRESS +
+ libxl_ctxt.page_size;
+
+out:
+ return rc;
+}
+
+/*
+ * Local variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
diff --git a/tools/libxl/libxl_x86_acpi.h b/tools/libxl/libxl_x86_acpi.h
new file mode 100644
index 0000000..d404637
--- /dev/null
+++ b/tools/libxl/libxl_x86_acpi.h
@@ -0,0 +1,35 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published
+ * by the Free Software Foundation; version 2.1 only. with the special
+ * exception on linking described in file LICENSE.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ */
+
+#ifndef LIBXL_X86_ACPI_H
+#define LIBXL_X86_ACPI_H
+
+#include "libxl_internal.h"
+
+#define ASSERT(x) assert(x)
+
+static inline int test_bit(unsigned int b, const void *p)
+{
+ return !!(((const uint8_t *)p)[b>>3] & (1u<<(b&7)));
+}
+
+#endif /* LIBXL_X_86_ACPI_H */
+
+/*
+ * Local variables:
+ * mode: C
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread* Re: [PATCH v5 20/21] libxl/acpi: Build ACPI tables for HVMlite guests
2016-09-22 19:13 ` [PATCH v5 20/21] libxl/acpi: Build ACPI tables for HVMlite guests Boris Ostrovsky
@ 2016-09-22 19:21 ` Wei Liu
0 siblings, 0 replies; 38+ messages in thread
From: Wei Liu @ 2016-09-22 19:21 UTC (permalink / raw)
To: Boris Ostrovsky
Cc: wei.liu2, andrew.cooper3, ian.jackson, xen-devel, julien.grall,
jbeulich, zhaoshenglong, roger.pau
On Thu, Sep 22, 2016 at 03:13:45PM -0400, Boris Ostrovsky wrote:
> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> Acked-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v5 21/21] libxc/xc_dom_core: Copy ACPI tables to guest space
2016-09-22 19:13 [PATCH v5 00/21] Make ACPI builder available to components other than hvmloader Boris Ostrovsky
` (19 preceding siblings ...)
2016-09-22 19:13 ` [PATCH v5 20/21] libxl/acpi: Build ACPI tables for HVMlite guests Boris Ostrovsky
@ 2016-09-22 19:13 ` Boris Ostrovsky
20 siblings, 0 replies; 38+ messages in thread
From: Boris Ostrovsky @ 2016-09-22 19:13 UTC (permalink / raw)
To: xen-devel
Cc: wei.liu2, andrew.cooper3, ian.jackson, julien.grall, jbeulich,
zhaoshenglong, Boris Ostrovsky, roger.pau
Load ACPI modules into guest space
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---
Changes ni v5:
* Style adjustments
tools/libxc/xc_dom_core.c | 95 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 95 insertions(+)
diff --git a/tools/libxc/xc_dom_core.c b/tools/libxc/xc_dom_core.c
index ebada89..87b450c 100644
--- a/tools/libxc/xc_dom_core.c
+++ b/tools/libxc/xc_dom_core.c
@@ -1040,6 +1040,97 @@ static int xc_dom_build_ramdisk(struct xc_dom_image *dom)
return -1;
}
+static int populate_acpi_pages(struct xc_dom_image *dom,
+ xen_pfn_t *extents,
+ unsigned int num_pages)
+{
+ int rc;
+ xc_interface *xch = dom->xch;
+ uint32_t domid = dom->guest_domid;
+ unsigned long idx;
+ unsigned int first_high_idx = (4 << 30) >> PAGE_SHIFT; /* 4GB */
+
+ for ( ; num_pages; num_pages--, extents++ )
+ {
+
+ if ( xc_domain_populate_physmap(xch, domid, 1, 0, 0, extents) == 1 )
+ continue;
+
+ if ( dom->highmem_end )
+ {
+ idx = --dom->highmem_end;
+ if ( idx == first_high_idx )
+ dom->highmem_end = 0;
+ }
+ else
+ {
+ idx = --dom->lowmem_end;
+ }
+
+ rc = xc_domain_add_to_physmap(xch, domid,
+ XENMAPSPACE_gmfn,
+ idx, *extents);
+ if ( rc )
+ return rc;
+ }
+
+ return 0;
+}
+
+static int xc_dom_load_acpi(struct xc_dom_image *dom)
+{
+ int j, i = 0;
+ unsigned num_pages;
+ xen_pfn_t *extents, base;
+ void *ptr;
+
+ while ( (i < MAX_ACPI_MODULES) && dom->acpi_modules[i].length )
+ {
+ DOMPRINTF("%s: %d bytes at address %" PRIx64 "\n", __FUNCTION__,
+ dom->acpi_modules[i].length,
+ dom->acpi_modules[i].guest_addr_out);
+
+ num_pages = (dom->acpi_modules[i].length + (XC_PAGE_SIZE - 1)) >>
+ XC_PAGE_SHIFT;
+ extents = malloc(num_pages * sizeof(*extents));
+ if ( !extents )
+ {
+ DOMPRINTF("%s: Out of memory", __FUNCTION__);
+ goto err;
+ }
+
+ base = dom->acpi_modules[i].guest_addr_out >> XC_PAGE_SHIFT;
+ for ( j = 0; j < num_pages; j++ )
+ extents[j] = base + j;
+ if ( populate_acpi_pages(dom, extents, num_pages) )
+ {
+ DOMPRINTF("%s: Can populate ACPI pages", __FUNCTION__);
+ goto err;
+ }
+
+ ptr = xc_map_foreign_range(dom->xch, dom->guest_domid,
+ XC_PAGE_SIZE * num_pages,
+ PROT_READ | PROT_WRITE, base);
+ if ( !ptr )
+ {
+ DOMPRINTF("%s: Can't map %d pages at 0x%lx",
+ __FUNCTION__, num_pages, base);
+ goto err;
+ }
+
+ memcpy(ptr, dom->acpi_modules[i].data, dom->acpi_modules[i].length);
+
+ free(extents);
+ i++;
+ }
+
+ return 0;
+
+err:
+ free(extents);
+ return -1;
+}
+
int xc_dom_build_image(struct xc_dom_image *dom)
{
unsigned int page_size;
@@ -1097,6 +1188,10 @@ int xc_dom_build_image(struct xc_dom_image *dom)
memcpy(devicetreemap, dom->devicetree_blob, dom->devicetree_size);
}
+ /* load ACPI tables */
+ if ( xc_dom_load_acpi(dom) != 0 )
+ goto err;
+
/* allocate other pages */
if ( !dom->arch_hooks->p2m_base_supported ||
dom->parms.p2m_base >= dom->parms.virt_base ||
--
1.8.3.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 38+ messages in thread