commit 995a7e25a1b84f01a07dacca043ec8cd17a5efd3
author Marc Jones <marcjones@sysproconsulting.com> Wed Oct 28 17:08:54 2020 -0600
committer Marc Jones <marc@marcjonesconsulting.com> Tue Nov 03 17:18:52 2020 +0000
tree 0693918ae92c026c057fc2624e3f534cfd5d6b8e
parent 3dea2b63eeb8f97b31571f6f0eb37f38f9967b6b

soc/intel/xeon_sp; Use soc specific stack-port function

Separate the get_stack_for_port into soc specific functions. This
removes a #if in common code.

Change-Id: Ib38a7d66947ded9b56193a9163e5128b2523e99c
Signed-off-by: Marc Jones <marcjones@sysproconsulting.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46971
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

src/soc/intel/xeon_sp/nb_acpi.c

diff --git a/src/soc/intel/xeon_sp/nb_acpi.c b/src/soc/intel/xeon_sp/nb_acpi.c
index 5955fa0..f6bf6ed 100644
--- a/src/soc/intel/xeon_sp/nb_acpi.c
+++ b/src/soc/intel/xeon_sp/nb_acpi.c
@@ -143,48 +143,6 @@
 }
 
 /*
- * EX: CPX-SP
- * Ports    Stack   Stack(HOB)  IioConfigIou
- * ==========================================
- * 0        CSTACK      stack 0     IOU0
- * 1A..1D   PSTACKZ     stack 1     IOU1
- * 2A..2D   PSTACK1     stack 2     IOU2
- * 3A..3D   PSTACK2     stack 4     IOU3
- */
-static int get_stack_for_port(int port)
-{
-#if (CONFIG(SOC_INTEL_COOPERLAKE_SP))
-	if (port == PORT_0)
-		return CSTACK;
-	else if (port >= PORT_1A && port <= PORT_1D)
-		return PSTACK0;
-	else if (port >= PORT_2A && port <= PORT_2D)
-		return PSTACK1;
-	else if (port >= PORT_3A && port <= PORT_3D)
-		return PSTACK2;
-	else
-		return -1;
-#endif /* SOC_INTEL_COOPERLAKE_SP */
-
-#if (CONFIG(SOC_INTEL_SKYLAKE_SP))
-	if (port == PORT_0)
-		return CSTACK;
-	else if (port >= PORT_1A && port <= PORT_1D)
-		return PSTACK0;
-	else if (port >= PORT_2A && port <= PORT_2D)
-		return PSTACK1;
-	else if (port >= PORT_3A && port <= PORT_3D)
-		return PSTACK2;
-	else if (port >= PORT_4A && port <= PORT_4D)
-		return PSTACK3; // MCP0
-	else if (port >= PORT_5A && port <= PORT_5D)
-		return PSTACK4; // MCP1
-	else
-		return -1;
-#endif /* SOC_INTEL_SKYLAKE_SP */
-}
-
-/*
  * This function adds PCIe bridge device entry in DMAR table. If it is called
  * in the context of ATSR subtable, it adds ATSR subtable when it is first called.
  */
@@ -193,7 +151,7 @@
 	bool is_atsr, bool *first)
 {
 
-	if (get_stack_for_port(port) != stack)
+	if (soc_get_stack_for_port(port) != stack)
 		return 0;
 
 	const uint32_t bus = iio_resource.StackRes[stack].BusBase;