From 06c761ca948544861ef50cb494a1043839259b5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ky=C3=B6sti=20M=C3=A4lkki?= <kyosti.malkki@gmail.com>
Date: Sun, 14 Feb 2021 14:06:38 +0200
Subject: [PATCH] soc/intel/xeon_sp: Use common acpi_fill_mcfg()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add MMCONF_BUS_NUMBER=256 as this was not defined for
this SoC.

Change-Id: I6ba861d3b7d5ac083c9b16c8f6ad179efd403bcd
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/50664
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-by: Nico Huber <nico.h@gmx.de>
---
 src/soc/intel/xeon_sp/Kconfig        | 3 +++
 src/soc/intel/xeon_sp/cpx/soc_acpi.c | 8 --------
 src/soc/intel/xeon_sp/skx/soc_acpi.c | 8 --------
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/src/soc/intel/xeon_sp/Kconfig b/src/soc/intel/xeon_sp/Kconfig
index 49af38454fd5..929af131de10 100644
--- a/src/soc/intel/xeon_sp/Kconfig
+++ b/src/soc/intel/xeon_sp/Kconfig
@@ -104,6 +104,9 @@ config DCACHE_BSP_STACK_SIZE
 config MMCONF_BASE_ADDRESS
 	default 0x80000000
 
+config MMCONF_BUS_NUMBER
+	default 256
+
 config HEAP_SIZE
 	hex
 	default 0x80000
diff --git a/src/soc/intel/xeon_sp/cpx/soc_acpi.c b/src/soc/intel/xeon_sp/cpx/soc_acpi.c
index 5e1b412fd358..0d102a13a611 100644
--- a/src/soc/intel/xeon_sp/cpx/soc_acpi.c
+++ b/src/soc/intel/xeon_sp/cpx/soc_acpi.c
@@ -17,14 +17,6 @@
 #include <soc/soc_util.h>
 #include <soc/util.h>
 
-/* TODO: Check if the common/acpi weak function can be used */
-unsigned long acpi_fill_mcfg(unsigned long current)
-{
-	current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
-		CONFIG_MMCONF_BASE_ADDRESS, 0, 0, 255);
-	return current;
-}
-
 int soc_madt_sci_irq_polarity(int sci)
 {
 	if (sci >= 20)
diff --git a/src/soc/intel/xeon_sp/skx/soc_acpi.c b/src/soc/intel/xeon_sp/skx/soc_acpi.c
index 79768d48c9ac..1f1d058c811f 100644
--- a/src/soc/intel/xeon_sp/skx/soc_acpi.c
+++ b/src/soc/intel/xeon_sp/skx/soc_acpi.c
@@ -16,14 +16,6 @@
 #include <soc/soc_util.h>
 #include <soc/util.h>
 
-/* TODO: Check if the common/acpi weak function can be used */
-unsigned long acpi_fill_mcfg(unsigned long current)
-{
-	current += acpi_create_mcfg_mmconfig((acpi_mcfg_mmconfig_t *)current,
-		CONFIG_MMCONF_BASE_ADDRESS, 0, 0, 255);
-	return current;
-}
-
 int soc_madt_sci_irq_polarity(int sci)
 {
 	if (sci >= 20)