commit 6b446b991b00c44902b70d86c75b23a8f93d510b
author Raul E Rangel <rrangel@chromium.org> Fri Nov 19 11:38:35 2021 -0700
committer Raul Rangel <rrangel@chromium.org> Mon Nov 29 20:35:33 2021 +0000
tree 85bea9358740e1053c3ead24532ab1cea3329383
parent a19d6253f8a92ab50b279b859efce1ae27eec9d0

acpi,Makefile: Add preload_acpi_dsdt

This will allow us to preload the dsdt.aml file.

BUG=b:179699789
TEST=Build guybrush
| 80 - write tables                                   | 1.564     | 1.08      Δ( -0.48,   -0.03%) |
| 85 - finalize chips                                 | 15.483    | 13.543    Δ( -1.94,   -0.14%) |

Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Change-Id: Ibf69ecb947811a2eec861018e3ba5f858155f1c3
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59504
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>

Makefile.inc

diff --git a/Makefile.inc b/Makefile.inc
index 1b1e973..090505e 100644
--- a/Makefile.inc
+++ b/Makefile.inc
@@ -280,6 +280,9 @@
 $(CONFIG_CBFS_PREFIX)/$(1).aml-file = $(obj)/$(1).aml
 $(CONFIG_CBFS_PREFIX)/$(1).aml-type = raw
 $(CONFIG_CBFS_PREFIX)/$(1).aml-compression = none
+ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_LPC_SPI_DMA),y)
+$(CONFIG_CBFS_PREFIX)/$(1).aml-align = 64
+endif
 cbfs-files-$(if $(2),$(2),y) += $(CONFIG_CBFS_PREFIX)/$(1).aml
 -include $(obj)/$(1).d
 $(obj)/$(1).aml: $(src)/mainboard/$(MAINBOARDDIR)/$(1).asl $(obj)/config.h

src/acpi/acpi.c

diff --git a/src/acpi/acpi.c b/src/acpi/acpi.c
index 78c3fd3..3bf57c6 100644
--- a/src/acpi/acpi.c
+++ b/src/acpi/acpi.c
@@ -1577,6 +1577,17 @@
 	return 0;
 }
 
+void preload_acpi_dsdt(void)
+{
+	const char *file = CONFIG_CBFS_PREFIX "/dsdt.aml";
+
+	if (!CONFIG(CBFS_PRELOAD))
+		return;
+
+	printk(BIOS_DEBUG, "Preloading %s\n", file);
+	cbfs_preload(file);
+}
+
 unsigned long write_acpi_tables(unsigned long start)
 {
 	unsigned long current;

src/include/acpi/acpi.h

diff --git a/src/include/acpi/acpi.h b/src/include/acpi/acpi.h
index 4f059bb..4a95855 100644
--- a/src/include/acpi/acpi.h
+++ b/src/include/acpi/acpi.h
@@ -1215,6 +1215,7 @@
 unsigned long fw_cfg_acpi_tables(unsigned long start);
 
 /* These are implemented by the target port or north/southbridge. */
+void preload_acpi_dsdt(void);
 unsigned long write_acpi_tables(unsigned long addr);
 unsigned long acpi_fill_madt(unsigned long current);
 unsigned long acpi_fill_ivrs_ioapic(acpi_ivrs_t *ivrs, unsigned long current);