From 8c41000862a1031782e6890b833b25704a3b378d Mon Sep 17 00:00:00 2001
From: Felix Held <felix-coreboot@felixheld.de>
Date: Sat, 14 Jan 2023 00:39:08 +0100
Subject: [PATCH] soc/amd/picasso/include/acpi: introduce and use ACPI_SCI_IRQ
 definition

The newer AMD SoCs define ACPI_SCI_IRQ in the SoC's acpi.h header file
and use this definition in the mainboard code, so port this back to
Picasso.

Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Change-Id: Ib569747aa388d7953e79de747905fb52c2a05e74
Reviewed-on: https://review.coreboot.org/c/coreboot/+/71912
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Fred Reitberger <reitbergerfred@gmail.com>
---
 src/mainboard/amd/bilby/mainboard.c    | 3 ++-
 src/mainboard/amd/mandolin/mainboard.c | 3 ++-
 src/mainboard/google/zork/mainboard.c  | 3 ++-
 src/soc/amd/picasso/include/soc/acpi.h | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/mainboard/amd/bilby/mainboard.c b/src/mainboard/amd/bilby/mainboard.c
index a751126ef7..5e209462ae 100644
--- a/src/mainboard/amd/bilby/mainboard.c
+++ b/src/mainboard/amd/bilby/mainboard.c
@@ -5,6 +5,7 @@
 #include <amdblocks/amd_pci_util.h>
 #include <FspsUpd.h>
 #include <gpio.h>
+#include <soc/acpi.h>
 #include <soc/cpu.h>
 #include <soc/southbridge.h>
 #include <soc/pci_devs.h>
@@ -26,7 +27,7 @@ static const struct fch_irq_routing fch_irq_map[] = {
 	{ PIRQ_B,	10,		17 },
 	{ PIRQ_C,	11,		18 },
 	{ PIRQ_D,	12,		19 },
-	{ PIRQ_SCI,	9,		 9 },
+	{ PIRQ_SCI,	ACPI_SCI_IRQ,	ACPI_SCI_IRQ },
 	{ PIRQ_SD,	PIRQ_NC,	16 },
 	{ PIRQ_SDIO,	PIRQ_NC,	16 },
 	{ PIRQ_SATA,	PIRQ_NC,	19 },
diff --git a/src/mainboard/amd/mandolin/mainboard.c b/src/mainboard/amd/mandolin/mainboard.c
index 6a275145eb..d3b79e6134 100644
--- a/src/mainboard/amd/mandolin/mainboard.c
+++ b/src/mainboard/amd/mandolin/mainboard.c
@@ -4,6 +4,7 @@
 #include <device/device.h>
 #include <amdblocks/amd_pci_util.h>
 #include <FspsUpd.h>
+#include <soc/acpi.h>
 #include <soc/cpu.h>
 #include <soc/southbridge.h>
 #include <soc/pci_devs.h>
@@ -21,7 +22,7 @@ static const struct fch_irq_routing fch_irq_map[] = {
 	{ PIRQ_B,	10,		17 },
 	{ PIRQ_C,	11,		18 },
 	{ PIRQ_D,	12,		19 },
-	{ PIRQ_SCI,	9,		 9 },
+	{ PIRQ_SCI,	ACPI_SCI_IRQ,	ACPI_SCI_IRQ },
 	{ PIRQ_SD,	PIRQ_NC,	16 },
 	{ PIRQ_SDIO,	PIRQ_NC,	16 },
 	{ PIRQ_SATA,	PIRQ_NC,	19 },
diff --git a/src/mainboard/google/zork/mainboard.c b/src/mainboard/google/zork/mainboard.c
index 89460cc676..74ed679d9b 100644
--- a/src/mainboard/google/zork/mainboard.c
+++ b/src/mainboard/google/zork/mainboard.c
@@ -11,6 +11,7 @@
 #include <boardid.h>
 #include <gpio.h>
 #include <smbios.h>
+#include <soc/acpi.h>
 #include <soc/cpu.h>
 #include <soc/pci_devs.h>
 #include <soc/platform_descriptors.h>
@@ -52,7 +53,7 @@ static const struct fch_irq_routing fch_irq_map[] = {
 	{ PIRQ_G,	13,		PIRQ_NC },
 	{ PIRQ_H,	6,		PIRQ_NC },
 
-	{ PIRQ_SCI,	9,		9 },
+	{ PIRQ_SCI,	ACPI_SCI_IRQ,	ACPI_SCI_IRQ },
 	{ PIRQ_EMMC,	5,		5 },
 	{ PIRQ_GPIO,	7,		7 },
 	{ PIRQ_I2C2,	10,		10 },
diff --git a/src/soc/amd/picasso/include/soc/acpi.h b/src/soc/amd/picasso/include/soc/acpi.h
index 20876906c5..741b732163 100644
--- a/src/soc/amd/picasso/include/soc/acpi.h
+++ b/src/soc/amd/picasso/include/soc/acpi.h
@@ -8,6 +8,8 @@
 #include <device/device.h>
 #include <stdint.h>
 
+#define ACPI_SCI_IRQ 9
+
 /* RTC Registers */
 #define RTC_DATE_ALARM		0x0d