mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
acpi: Extract acpi info description into a separate ASL file
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> Acked-by: Jan Beulich <jbeulich@suse.com>
This commit is contained in:
Boris Ostrovsky authored and Wei Liu committed
1 parent
da9207c864
commit
e8c4e3af73
4 files changed
+32
-23
No files matched your search
+1
-1
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
}
|
||||
}
|
||||