From 1c88b10be277bb65ebf3f4ff12361c53eb054e01 Mon Sep 17 00:00:00 2001
From: Raul E Rangel <rrangel@chromium.org>
Date: Thu, 11 Feb 2021 10:35:32 -0700
Subject: 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>
---
 src/soc/amd/common/block/include/amdblocks/chip.h | 4 ++++
 src/soc/amd/picasso/acpi.c                        | 3 ++-
 src/soc/amd/picasso/chip.h                        | 4 ----
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'src/soc')

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;
 
-- 
cgit v1.2.3