mb/google/brya: Add memory DQ map

Add memory DQ map based on latest schematic.

BUG=b:174266035
TEST=Build Test

Signed-off-by: Eric Lai <ericr_lai@compal.corp-partner.google.com>
Change-Id: I94102240b13d2b95e0295f41bc2c0ba078faf242
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48446
Reviewed-by: Furquan Shaikh <furquan@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

4 files changed, 108 insertions, 1 deletions

diff --git a/src/mainboard/google/brya/romstage.c b/src/mainboard/google/brya/romstage.c
index 341df1570e5d..475bf611485a 100644
--- a/src/mainboard/google/brya/romstage.c
+++ b/src/mainboard/google/brya/romstage.c
@@ -1,9 +1,20 @@
 /* SPDX-License-Identifier: GPL-2.0-or-later */
 
+#include <baseboard/gpio.h>
+#include <baseboard/variants.h>
 #include <fsp/api.h>
+#include <gpio.h>
 #include <soc/romstage.h>
 
 void mainboard_memory_init_params(FSPM_UPD *memupd)
 {
-	/* ToDo : Fill FSP-M memory params */
+	const struct mb_cfg *mem_config = variant_memory_params();
+	bool half_populated = variant_is_half_populated();
+
+	const struct mem_spd spd_info = {
+		.topo = MEM_TOPO_MEMORY_DOWN,
+		.cbfs_index = variant_memory_sku(),
+	};
+
+	memcfg_init(&memupd->FspmConfig, mem_config, &spd_info, half_populated);
 }
diff --git a/src/mainboard/google/brya/variants/baseboard/Makefile.inc b/src/mainboard/google/brya/variants/baseboard/Makefile.inc
index 9fb63f5f433b..1d38b77ea028 100644
--- a/src/mainboard/google/brya/variants/baseboard/Makefile.inc
+++ b/src/mainboard/google/brya/variants/baseboard/Makefile.inc
@@ -1,3 +1,5 @@
 bootblock-y += gpio.c
 
+romstage-y += memory.c
+
 ramstage-y += gpio.c
diff --git a/src/mainboard/google/brya/variants/baseboard/include/baseboard/variants.h b/src/mainboard/google/brya/variants/baseboard/include/baseboard/variants.h
index 663306c291e1..fb105e806a9e 100644
--- a/src/mainboard/google/brya/variants/baseboard/include/baseboard/variants.h
+++ b/src/mainboard/google/brya/variants/baseboard/include/baseboard/variants.h
@@ -4,6 +4,7 @@
 #define __BASEBOARD_VARIANTS_H__
 
 #include <soc/gpio.h>
+#include <soc/meminit.h>
 #include <stdint.h>
 
 /* The next set of functions return the gpio table and fill in the number of entries for
@@ -14,4 +15,8 @@ const struct pad_config *variant_gpio_table(size_t *num);
 const struct pad_config *variant_early_gpio_table(size_t *num);
 const struct cros_gpio *variant_cros_gpios(size_t *num);
 
+const struct mb_cfg *variant_memory_params(void);
+int variant_memory_sku(void);
+bool variant_is_half_populated(void);
+
 #endif /*__BASEBOARD_VARIANTS_H__ */
diff --git a/src/mainboard/google/brya/variants/baseboard/memory.c b/src/mainboard/google/brya/variants/baseboard/memory.c
new file mode 100644
index 000000000000..b0c150946dd1
--- /dev/null
+++ b/src/mainboard/google/brya/variants/baseboard/memory.c
@@ -0,0 +1,89 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include <baseboard/gpio.h>
+#include <baseboard/variants.h>
+#include <gpio.h>
+
+static const struct mb_cfg baseboard_memcfg = {
+	.type = MEM_TYPE_LP4X,
+
+	/* DQ byte map */
+	.lpx_dq_map = {
+		.ddr0 = {
+			.dq0 = {  0,  1,  2,  3,  4,  5,  6,  7, },
+			.dq1 = { 12, 13, 14, 15, 11, 10,  9,  8, },
+		},
+		.ddr1 = {
+			.dq0 = {  7,  2,  6,  3,  5,  1,  4,  0, },
+			.dq1 = { 10,  8,  9, 11, 15, 12, 14, 13, },
+		},
+		.ddr2 = {
+			.dq0 = {  3,  2,  1,  0,  4,  5,  6,  7, },
+			.dq1 = { 12, 13, 14, 15, 11, 10,  9,  8, },
+		},
+		.ddr3 = {
+			.dq0 = {  7,  0,  1,  6,  5,  4,  2,  3, },
+			.dq1 = { 15, 14,  8,  9, 10, 12, 11, 13, },
+		},
+		.ddr4 = {
+			.dq0 = {  3,  2,  1,  0,  4,  5,  6,  7, },
+			.dq1 = { 12, 13, 14, 15, 11, 10,  9,  8, },
+		},
+		.ddr5 = {
+			.dq0 = {  3,  4,  2,  5,  0,  6,  1,  7, },
+			.dq1 = { 13, 12, 11, 10, 14, 15,  9,  8, },
+		},
+		.ddr6 = {
+			.dq0 = {  3,  2,  1,  0,  7,  4,  5,  6, },
+			.dq1 = { 15, 14, 13, 12,  8,  9, 10, 11, },
+		},
+		.ddr7 = {
+			.dq0 = {  3,  4,  2,  5,  1,  0,  7,  6, },
+			.dq1 = { 15, 14,  9,  8, 12, 10, 11, 13, },
+		},
+	},
+
+	/* DQS CPU<>DRAM map */
+	.lpx_dqs_map = {
+		.ddr0 = { .dqs0 = 0, .dqs1 = 1 },
+		.ddr1 = { .dqs0 = 0, .dqs1 = 1 },
+		.ddr2 = { .dqs0 = 0, .dqs1 = 1 },
+		.ddr3 = { .dqs0 = 0, .dqs1 = 1 },
+		.ddr4 = { .dqs0 = 0, .dqs1 = 1 },
+		.ddr5 = { .dqs0 = 0, .dqs1 = 1 },
+		.ddr6 = { .dqs0 = 0, .dqs1 = 1 },
+		.ddr7 = { .dqs0 = 0, .dqs1 = 1 },
+	},
+
+	.ect = 1, /* Enable Early Command Training */
+};
+
+const struct mb_cfg *__weak variant_memory_params(void)
+{
+	return &baseboard_memcfg;
+}
+
+int __weak variant_memory_sku(void)
+{
+	/*
+	 * Memory configuration board straps
+	 * GPIO_MEM_CONFIG_0	GPP_E11
+	 * GPIO_MEM_CONFIG_1	GPP_E2
+	 * GPIO_MEM_CONFIG_2	GPP_E1
+	 * GPIO_MEM_CONFIG_3	GPP_E12
+	 */
+	gpio_t spd_gpios[] = {
+		GPP_E11,
+		GPP_E2,
+		GPP_E1,
+		GPP_E12,
+	};
+
+	return gpio_base2_value(spd_gpios, ARRAY_SIZE(spd_gpios));
+}
+
+bool __weak variant_is_half_populated(void)
+{
+	/* GPIO_MEM_CH_SEL GPP_E13 */
+	return gpio_get(GPP_E13);
+}