Angel Pons has submitted this change. ( https://review.coreboot.org/c/coreboot/+/44115 )
Change subject: soc/intel/baytrail: Factor out `acpi_fill_madt()` ......................................................................
soc/intel/baytrail: Factor out `acpi_fill_madt()`
It is the same for the two Bay Trail boards in the tree.
Change-Id: I5110cfa8807406232e4f7f1fe79dfe9c3ae4dac4 Signed-off-by: Angel Pons th3fanbus@gmail.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/44115 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Arthur Heymans arthur@aheymans.xyz Reviewed-by: Máté Kukri kukri.mate@gmail.com --- M src/mainboard/bostentech/gbyt4/acpi_tables.c M src/mainboard/google/rambi/acpi_tables.c M src/soc/intel/baytrail/acpi.c 3 files changed, 15 insertions(+), 35 deletions(-)
Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved Máté Kukri: Looks good to me, but someone else must approve
diff --git a/src/mainboard/bostentech/gbyt4/acpi_tables.c b/src/mainboard/bostentech/gbyt4/acpi_tables.c index 162a08c..7445fb0 100644 --- a/src/mainboard/bostentech/gbyt4/acpi_tables.c +++ b/src/mainboard/bostentech/gbyt4/acpi_tables.c @@ -1,13 +1,9 @@ /* SPDX-License-Identifier: GPL-2.0-only */
-#include <types.h> #include <acpi/acpi.h> #include <acpi/acpi_gnvs.h> -#include <arch/ioapic.h> -#include <device/device.h> #include <soc/acpi.h> #include <soc/nvs.h> -#include <soc/iomap.h>
void acpi_create_gnvs(struct global_nvs *gnvs) { @@ -28,20 +24,6 @@ gnvs->dpte = 0; }
-unsigned long acpi_fill_madt(unsigned long current) -{ - /* Local APICs */ - current = acpi_create_madt_lapics(current); - - /* IOAPIC */ - current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current, - 2, IO_APIC_ADDR, 0); - - current = acpi_madt_irq_overrides(current); - - return current; -} - void mainboard_fill_fadt(acpi_fadt_t *fadt) { fadt->preferred_pm_profile = PM_DESKTOP; diff --git a/src/mainboard/google/rambi/acpi_tables.c b/src/mainboard/google/rambi/acpi_tables.c index a9a0885..dedec21 100644 --- a/src/mainboard/google/rambi/acpi_tables.c +++ b/src/mainboard/google/rambi/acpi_tables.c @@ -2,11 +2,8 @@
#include <acpi/acpi.h> #include <acpi/acpi_gnvs.h> -#include <arch/ioapic.h> -#include <device/device.h> #include <soc/acpi.h> #include <soc/nvs.h> -#include <soc/iomap.h>
void acpi_create_gnvs(struct global_nvs *gnvs) { @@ -27,20 +24,6 @@ gnvs->dpte = 1; }
-unsigned long acpi_fill_madt(unsigned long current) -{ - /* Local APICs */ - current = acpi_create_madt_lapics(current); - - /* IOAPIC */ - current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current, - 2, IO_APIC_ADDR, 0); - - current = acpi_madt_irq_overrides(current); - - return current; -} - void mainboard_fill_fadt(acpi_fadt_t *fadt) { fadt->preferred_pm_profile = PM_MOBILE; diff --git a/src/soc/intel/baytrail/acpi.c b/src/soc/intel/baytrail/acpi.c index 458e2d5..1144749 100644 --- a/src/soc/intel/baytrail/acpi.c +++ b/src/soc/intel/baytrail/acpi.c @@ -3,6 +3,7 @@ #include <acpi/acpi.h> #include <acpi/acpi_gnvs.h> #include <acpi/acpigen.h> +#include <arch/ioapic.h> #include <device/mmio.h> #include <arch/smp/mpspec.h> #include <cbmem.h> @@ -125,6 +126,20 @@ return current; }
+unsigned long acpi_fill_madt(unsigned long current) +{ + /* Local APICs */ + current = acpi_create_madt_lapics(current); + + /* IOAPIC */ + current += acpi_create_madt_ioapic((acpi_madt_ioapic_t *) current, + 2, IO_APIC_ADDR, 0); + + current = acpi_madt_irq_overrides(current); + + return current; +} + static acpi_tstate_t soc_tss_table[] = { { 100, 1000, 0, 0x00, 0 }, { 88, 875, 0, 0x1e, 0 },