mb/google/glados: Refactor to get rid of `pei_data`

The SoC specific `struct pei_data` was filled with values that were
later only consumed by the mainboard code again. Avoid jumping through
this hoop and fill FSP UPDs directly.

Change-Id: I040f4a55b4f4bad3f6072920e5e2eceded4cb9bb
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/32594
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>

8 files changed, 83 insertions, 67 deletions

diff --git a/src/mainboard/google/glados/variants/asuka/variant.c b/src/mainboard/google/glados/variants/asuka/variant.c
index 13cfe4fecd..4c778970fe 100644
--- a/src/mainboard/google/glados/variants/asuka/variant.c
+++ b/src/mainboard/google/glados/variants/asuka/variant.c
@@ -17,10 +17,10 @@
 #include <stdint.h>
 #include <string.h>
 #include <baseboard/variant.h>
-#include <soc/pei_data.h>
-#include <soc/pei_wrapper.h>
+#include <fsp/soc_binding.h>
 
-void mainboard_fill_pei_data(struct pei_data *pei_data)
+void variant_memory_init_params(
+		MEMORY_INIT_UPD *const memory_params, const int spd_index)
 {
 	/* DQ byte map */
 	const u8 dq_map[2][12] = {
@@ -39,12 +39,14 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
 	/* Rcomp target */
 	const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
 
-	memcpy(pei_data->dq_map, dq_map, sizeof(dq_map));
-	memcpy(pei_data->dqs_map, dqs_map, sizeof(dqs_map));
-	memcpy(pei_data->RcompResistor, RcompResistor,
-		 sizeof(RcompResistor));
-	memcpy(pei_data->RcompTarget, RcompTarget,
-		 sizeof(RcompTarget));
+	memcpy(memory_params->DqByteMapCh0, dq_map,
+			sizeof(memory_params->DqByteMapCh0) * 2);
+	memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map,
+			sizeof(memory_params->DqsMapCpu2DramCh0) * 2);
+	memcpy(memory_params->RcompResistor, RcompResistor,
+			sizeof(memory_params->RcompResistor));
+	memcpy(memory_params->RcompTarget, RcompTarget,
+			sizeof(memory_params->RcompTarget));
 }
 
 int is_dual_channel(const int spd_index)
diff --git a/src/mainboard/google/glados/variants/baseboard/include/baseboard/variant.h b/src/mainboard/google/glados/variants/baseboard/include/baseboard/variant.h
index bbab7fc1f5..72eef684b8 100644
--- a/src/mainboard/google/glados/variants/baseboard/include/baseboard/variant.h
+++ b/src/mainboard/google/glados/variants/baseboard/include/baseboard/variant.h
@@ -15,7 +15,10 @@
 #ifndef GLADOS_VARIANT_H
 #define GLADOS_VARIANT_H
 
+#include <fsp/soc_binding.h>
+
 int is_dual_channel(const int spd_index);
 void mainboard_gpio_smi_sleep(void);
+void variant_memory_init_params(MEMORY_INIT_UPD *memory_params, int spd_index);
 
 #endif /* GLADOS_VARIANT_H */
diff --git a/src/mainboard/google/glados/variants/caroline/variant.c b/src/mainboard/google/glados/variants/caroline/variant.c
index a00eacf0ed..d61a538d56 100644
--- a/src/mainboard/google/glados/variants/caroline/variant.c
+++ b/src/mainboard/google/glados/variants/caroline/variant.c
@@ -15,14 +15,14 @@
  */
 
 #include <baseboard/variant.h>
+#include <fsp/soc_binding.h>
 #include <gpio.h>
 #include <stdint.h>
 #include <string.h>
-#include <soc/pei_data.h>
-#include <soc/pei_wrapper.h>
 #include <variant/gpio.h>
 
-void mainboard_fill_pei_data(struct pei_data *pei_data)
+void variant_memory_init_params(
+		MEMORY_INIT_UPD *const memory_params, const int spd_index)
 {
 	/* DQ byte map */
 	const u8 dq_map[2][12] = {
@@ -41,12 +41,15 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
 	/* Rcomp target */
 	const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
 
-	memcpy(pei_data->dq_map, dq_map, sizeof(dq_map));
-	memcpy(pei_data->dqs_map, dqs_map, sizeof(dqs_map));
-	memcpy(pei_data->RcompResistor, RcompResistor,
-		 sizeof(RcompResistor));
-	memcpy(pei_data->RcompTarget, RcompTarget,
-		 sizeof(RcompTarget));
+	memcpy(memory_params->DqByteMapCh0, dq_map,
+			sizeof(memory_params->DqByteMapCh0) * 2);
+	memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map,
+			sizeof(memory_params->DqsMapCpu2DramCh0) * 2);
+	memcpy(memory_params->RcompResistor, RcompResistor,
+			sizeof(memory_params->RcompResistor));
+	memcpy(memory_params->RcompTarget, RcompTarget,
+			sizeof(memory_params->RcompTarget));
+	memory_params->DdrFreqLimit = 1600;
 }
 
 void mainboard_gpio_smi_sleep(void)
diff --git a/src/mainboard/google/glados/variants/cave/variant.c b/src/mainboard/google/glados/variants/cave/variant.c
index 2ce0a9001c..fc27fb4b61 100644
--- a/src/mainboard/google/glados/variants/cave/variant.c
+++ b/src/mainboard/google/glados/variants/cave/variant.c
@@ -15,14 +15,14 @@
  */
 
 #include <baseboard/variant.h>
+#include <fsp/soc_binding.h>
 #include <gpio.h>
 #include <stdint.h>
 #include <string.h>
-#include <soc/pei_data.h>
-#include <soc/pei_wrapper.h>
 #include <variant/gpio.h>
 
-void mainboard_fill_pei_data(struct pei_data *pei_data)
+void variant_memory_init_params(
+		MEMORY_INIT_UPD *const memory_params, const int spd_index)
 {
 	/* DQ byte map */
 	const u8 dq_map[2][12] = {
@@ -41,12 +41,14 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
 	/* Rcomp target */
 	const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
 
-	memcpy(pei_data->dq_map, dq_map, sizeof(dq_map));
-	memcpy(pei_data->dqs_map, dqs_map, sizeof(dqs_map));
-	memcpy(pei_data->RcompResistor, RcompResistor,
-		 sizeof(RcompResistor));
-	memcpy(pei_data->RcompTarget, RcompTarget,
-		 sizeof(RcompTarget));
+	memcpy(memory_params->DqByteMapCh0, dq_map,
+			sizeof(memory_params->DqByteMapCh0) * 2);
+	memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map,
+			sizeof(memory_params->DqsMapCpu2DramCh0) * 2);
+	memcpy(memory_params->RcompResistor, RcompResistor,
+			sizeof(memory_params->RcompResistor));
+	memcpy(memory_params->RcompTarget, RcompTarget,
+			sizeof(memory_params->RcompTarget));
 }
 
 void mainboard_gpio_smi_sleep(void)
diff --git a/src/mainboard/google/glados/variants/chell/variant.c b/src/mainboard/google/glados/variants/chell/variant.c
index da83ed0f7d..2d1b363cab 100644
--- a/src/mainboard/google/glados/variants/chell/variant.c
+++ b/src/mainboard/google/glados/variants/chell/variant.c
@@ -15,14 +15,14 @@
  */
 
 #include <baseboard/variant.h>
+#include <fsp/soc_binding.h>
 #include <gpio.h>
 #include <stdint.h>
 #include <string.h>
-#include <soc/pei_data.h>
-#include <soc/pei_wrapper.h>
 #include <variant/gpio.h>
 
-void mainboard_fill_pei_data(struct pei_data *pei_data)
+void variant_memory_init_params(
+		MEMORY_INIT_UPD *const memory_params, const int spd_index)
 {
 	/* DQ byte map */
 	const u8 dq_map[2][12] = {
@@ -41,12 +41,14 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
 	/* Rcomp target */
 	const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
 
-	memcpy(pei_data->dq_map, dq_map, sizeof(dq_map));
-	memcpy(pei_data->dqs_map, dqs_map, sizeof(dqs_map));
-	memcpy(pei_data->RcompResistor, RcompResistor,
-		 sizeof(RcompResistor));
-	memcpy(pei_data->RcompTarget, RcompTarget,
-		 sizeof(RcompTarget));
+	memcpy(memory_params->DqByteMapCh0, dq_map,
+			sizeof(memory_params->DqByteMapCh0) * 2);
+	memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map,
+			sizeof(memory_params->DqsMapCpu2DramCh0) * 2);
+	memcpy(memory_params->RcompResistor, RcompResistor,
+			sizeof(memory_params->RcompResistor));
+	memcpy(memory_params->RcompTarget, RcompTarget,
+			sizeof(memory_params->RcompTarget));
 }
 
 void mainboard_gpio_smi_sleep(void)
diff --git a/src/mainboard/google/glados/variants/glados/variant.c b/src/mainboard/google/glados/variants/glados/variant.c
index 2ce0a9001c..fc27fb4b61 100644
--- a/src/mainboard/google/glados/variants/glados/variant.c
+++ b/src/mainboard/google/glados/variants/glados/variant.c
@@ -15,14 +15,14 @@
  */
 
 #include <baseboard/variant.h>
+#include <fsp/soc_binding.h>
 #include <gpio.h>
 #include <stdint.h>
 #include <string.h>
-#include <soc/pei_data.h>
-#include <soc/pei_wrapper.h>
 #include <variant/gpio.h>
 
-void mainboard_fill_pei_data(struct pei_data *pei_data)
+void variant_memory_init_params(
+		MEMORY_INIT_UPD *const memory_params, const int spd_index)
 {
 	/* DQ byte map */
 	const u8 dq_map[2][12] = {
@@ -41,12 +41,14 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
 	/* Rcomp target */
 	const u16 RcompTarget[5] = { 100, 40, 40, 23, 40 };
 
-	memcpy(pei_data->dq_map, dq_map, sizeof(dq_map));
-	memcpy(pei_data->dqs_map, dqs_map, sizeof(dqs_map));
-	memcpy(pei_data->RcompResistor, RcompResistor,
-		 sizeof(RcompResistor));
-	memcpy(pei_data->RcompTarget, RcompTarget,
-		 sizeof(RcompTarget));
+	memcpy(memory_params->DqByteMapCh0, dq_map,
+			sizeof(memory_params->DqByteMapCh0) * 2);
+	memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map,
+			sizeof(memory_params->DqsMapCpu2DramCh0) * 2);
+	memcpy(memory_params->RcompResistor, RcompResistor,
+			sizeof(memory_params->RcompResistor));
+	memcpy(memory_params->RcompTarget, RcompTarget,
+			sizeof(memory_params->RcompTarget));
 }
 
 void mainboard_gpio_smi_sleep(void)
diff --git a/src/mainboard/google/glados/variants/lars/variant.c b/src/mainboard/google/glados/variants/lars/variant.c
index 4fe88ef7c8..cff0096291 100644
--- a/src/mainboard/google/glados/variants/lars/variant.c
+++ b/src/mainboard/google/glados/variants/lars/variant.c
@@ -17,8 +17,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <baseboard/variant.h>
-#include <soc/pei_data.h>
-#include <soc/pei_wrapper.h>
+#include <fsp/soc_binding.h>
 
 #define K4E6E304EB_MEM_ID	0x5
 
@@ -29,7 +28,8 @@
 #define MEM_SINGLE_CHANB	0xb
 #define MEM_SINGLE_CHANC	0xc
 
-void mainboard_fill_pei_data(struct pei_data *pei_data)
+void variant_memory_init_params(
+		MEMORY_INIT_UPD *const params, const int spd_index)
 {
 	/* DQ byte map */
 	const u8 dq_map[2][12] = {
@@ -54,17 +54,18 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
 	/* Default Rcomp Target assignment */
 	const u16 *targeted_rcomp = RcompTarget;
 
-	memcpy(pei_data->dq_map, dq_map, sizeof(dq_map));
-	memcpy(pei_data->dqs_map, dqs_map, sizeof(dqs_map));
-	memcpy(pei_data->RcompResistor, RcompResistor,
-		sizeof(RcompResistor));
-
 	/* Override Rcomp Target assignment for specific SKU(s) */
-	if (pei_data->mem_cfg_id == K4E6E304EB_MEM_ID)
+	if (spd_index == K4E6E304EB_MEM_ID)
 		targeted_rcomp = StrengthendRcompTarget;
 
-	memcpy(pei_data->RcompTarget, targeted_rcomp,
-		sizeof(pei_data->RcompTarget));
+	memcpy(params->DqByteMapCh0, dq_map,
+			sizeof(params->DqByteMapCh0) * 2);
+	memcpy(params->DqsMapCpu2DramCh0, dqs_map,
+			sizeof(params->DqsMapCpu2DramCh0) * 2);
+	memcpy(params->RcompResistor, RcompResistor,
+			sizeof(params->RcompResistor));
+	memcpy(params->RcompTarget, targeted_rcomp,
+			sizeof(params->RcompTarget));
 }
 
 int is_dual_channel(const int spd_index)
diff --git a/src/mainboard/google/glados/variants/sentry/variant.c b/src/mainboard/google/glados/variants/sentry/variant.c
index 00f49fecf7..4c7fa23f08 100644
--- a/src/mainboard/google/glados/variants/sentry/variant.c
+++ b/src/mainboard/google/glados/variants/sentry/variant.c
@@ -17,12 +17,12 @@
 #include <stdint.h>
 #include <string.h>
 #include <baseboard/variant.h>
-#include <soc/pei_data.h>
-#include <soc/pei_wrapper.h>
+#include <fsp/soc_binding.h>
 
 #define K4E6E304EE_MEM_ID	0x3
 
-void mainboard_fill_pei_data(struct pei_data *pei_data)
+void variant_memory_init_params(
+		MEMORY_INIT_UPD *const memory_params, const int spd_index)
 {
 	/* DQ byte map */
 	const u8 dq_map[2][12] = {
@@ -47,15 +47,16 @@ void mainboard_fill_pei_data(struct pei_data *pei_data)
 	/* Default Rcomp Target assignment */
 	const u16 *targeted_rcomp = RcompTarget;
 
-	memcpy(pei_data->dq_map, dq_map, sizeof(dq_map));
-	memcpy(pei_data->dqs_map, dqs_map, sizeof(dqs_map));
-	memcpy(pei_data->RcompResistor, RcompResistor,
-		sizeof(RcompResistor));
-
 	/* Override Rcomp Target assignment for specific SKU(s) */
-	if (pei_data->mem_cfg_id == K4E6E304EE_MEM_ID)
+	if (spd_index == K4E6E304EE_MEM_ID)
 		targeted_rcomp = StrengthendRcompTarget;
 
-	memcpy(pei_data->RcompTarget, targeted_rcomp,
-		sizeof(pei_data->RcompTarget));
+	memcpy(memory_params->DqByteMapCh0, dq_map,
+			sizeof(memory_params->DqByteMapCh0) * 2);
+	memcpy(memory_params->DqsMapCpu2DramCh0, dqs_map,
+			sizeof(memory_params->DqsMapCpu2DramCh0) * 2);
+	memcpy(memory_params->RcompResistor, RcompResistor,
+			sizeof(memory_params->RcompResistor));
+	memcpy(memory_params->RcompTarget, targeted_rcomp,
+			sizeof(memory_params->RcompTarget));
 }