diff options
| author | Raul E Rangel <rrangel@chromium.org> | 2021-02-11 10:35:32 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2021-02-12 20:45:37 +0000 |
| commit | 1c88b10be277bb65ebf3f4ff12361c53eb054e01 (patch) | |
| tree | e56a12af1d8c4b63675ddeeb85790ca7896a0aa2 | |
| parent | 0e560e7015fffa209a3a5e5db0f8d786030cf2c0 (diff) | |
| download | coreboot-1c88b10be277bb65ebf3f4ff12361c53eb054e01.tar.xz | |
soc/amd: Move fadt device tree settings into common_config
This is ACPI specific config that applies to all the AMD SoCs. Stoney
doesn't currently use this, but we can add that functionality later.
Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Change-Id: I0be7d917d7c5ba71347aa646822a883e2cf55743
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50557
Reviewed-by: Mathew King <mathewk@chromium.org>
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Reviewed-by: Jason Glenesk <jason.glenesk@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
7 files changed, 14 insertions, 13 deletions
diff --git a/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb b/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb index 1a8164f0a2..addb328ba4 100644 --- a/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb +++ b/src/mainboard/amd/mandolin/variants/cereme/devicetree.cb @@ -4,8 +4,8 @@ chip soc/amd/picasso register "acp_pin_cfg" = "I2S_PINS_MAX_HDA" # Set FADT Configuration - register "fadt_boot_arch" = "ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042" - register "fadt_flags" = "ACPI_FADT_SLEEP_BUTTON" # See table 5-34 ACPI 6.3 spec + register "common_config.fadt_boot_arch" = "ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042" + register "common_config.fadt_flags" = "ACPI_FADT_SLEEP_BUTTON" # See table 5-34 ACPI 6.3 spec register "emmc_config" = "{ .timing = SD_EMMC_DISABLE, diff --git a/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb b/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb index db73ac73aa..f4f178a3d3 100644 --- a/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb +++ b/src/mainboard/amd/mandolin/variants/mandolin/devicetree.cb @@ -4,8 +4,8 @@ chip soc/amd/picasso register "acp_pin_cfg" = "I2S_PINS_MAX_HDA" # Set FADT Configuration - register "fadt_boot_arch" = "ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042" - register "fadt_flags" = "ACPI_FADT_SLEEP_BUTTON" # See table 5-34 ACPI 6.3 spec + register "common_config.fadt_boot_arch" = "ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042" + register "common_config.fadt_flags" = "ACPI_FADT_SLEEP_BUTTON" # See table 5-34 ACPI 6.3 spec register "emmc_config" = "{ .timing = SD_EMMC_DISABLE, diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb index 8bc87f7099..c79f3629ee 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree_dalboz.cb @@ -2,9 +2,9 @@ chip soc/amd/picasso # Set FADT Configuration - register "fadt_boot_arch" = "ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042" + register "common_config.fadt_boot_arch" = "ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042" # See table 5-34 ACPI 6.3 spec - register "fadt_flags" = "ACPI_FADT_SLEEP_BUTTON | ACPI_FADT_SEALED_CASE" + register "common_config.fadt_flags" = "ACPI_FADT_SLEEP_BUTTON | ACPI_FADT_SEALED_CASE" register "acp_pin_cfg" = "I2S_PINS_I2S_TDM" register "acp_i2s_wake_enable" = "0" diff --git a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb index f354991970..0e0eb05c0a 100644 --- a/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb +++ b/src/mainboard/google/zork/variants/baseboard/devicetree_trembyle.cb @@ -2,9 +2,9 @@ chip soc/amd/picasso # Set FADT Configuration - register "fadt_boot_arch" = "ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042" + register "common_config.fadt_boot_arch" = "ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042" # See table 5-34 ACPI 6.3 spec - register "fadt_flags" = "ACPI_FADT_SLEEP_BUTTON | ACPI_FADT_SEALED_CASE" + register "common_config.fadt_flags" = "ACPI_FADT_SLEEP_BUTTON | ACPI_FADT_SEALED_CASE" register "acp_pin_cfg" = "I2S_PINS_I2S_TDM" register "acp_i2s_wake_enable" = "0" diff --git a/src/soc/amd/common/block/include/amdblocks/chip.h b/src/soc/amd/common/block/include/amdblocks/chip.h index c1820e2659..b365e4d5d0 100644 --- a/src/soc/amd/common/block/include/amdblocks/chip.h +++ b/src/soc/amd/common/block/include/amdblocks/chip.h @@ -20,6 +20,10 @@ struct soc_amd_common_config { /* eSPI configuration */ struct espi_config espi_config; + + /* Options for these are in src/include/acpi/acpi.h */ + uint16_t fadt_boot_arch; + uint32_t fadt_flags; }; /* diff --git a/src/soc/amd/picasso/acpi.c b/src/soc/amd/picasso/acpi.c index 5cee2039e8..a6bc97b361 100644 --- a/src/soc/amd/picasso/acpi.c +++ b/src/soc/amd/picasso/acpi.c @@ -19,6 +19,7 @@ #include <device/pci.h> #include <amdblocks/acpimmio.h> #include <amdblocks/acpi.h> +#include <amdblocks/chip.h> #include <amdblocks/cpu.h> #include <soc/acpi.h> #include <soc/pci_devs.h> @@ -80,7 +81,7 @@ unsigned long acpi_fill_madt(unsigned long current) */ void acpi_fill_fadt(acpi_fadt_t *fadt) { - const struct soc_amd_picasso_config *cfg = config_of_soc(); + const struct soc_amd_common_config *cfg = soc_get_common_config(); printk(BIOS_DEBUG, "pm_base: 0x%04x\n", ACPI_IO_BASE); diff --git a/src/soc/amd/picasso/chip.h b/src/soc/amd/picasso/chip.h index 313b6c3abf..a66d77c89e 100644 --- a/src/soc/amd/picasso/chip.h +++ b/src/soc/amd/picasso/chip.h @@ -131,10 +131,6 @@ struct soc_amd_picasso_config { uint8_t flags; } irq_override[16]; - /* Options for these are in src/arch/x86/include/acpi/acpi.h */ - uint16_t fadt_boot_arch; - uint32_t fadt_flags; - /* System config index */ uint8_t system_config; |