mb/google/octopus: Add LPDDR4 memory init

Add LPDDR4 initialization support.

BUG=b:73136980
BRANCH=None
TEST=Build coreboot for Octopus board.

Change-Id: Ieffcfa2f9d075eb0be13562f1a0c7ee503b005d9
Signed-off-by: Ravi Sarawadi <ravishankar.sarawadi@intel.com>
Reviewed-on: https://review.coreboot.org/23832
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>

3 files changed, 71 insertions, 1 deletions

diff --git a/src/mainboard/google/octopus/romstage.c b/src/mainboard/google/octopus/romstage.c
index 54f596b080..15c1fd144e 100644
--- a/src/mainboard/google/octopus/romstage.c
+++ b/src/mainboard/google/octopus/romstage.c
@@ -20,6 +20,8 @@
 
 void mainboard_memory_init_params(FSPM_UPD *memupd)
 {
+	meminit_lpddr4_by_sku(&memupd->FspmConfig,
+		variant_lpddr4_config(), variant_memory_sku());
 }
 
 void mainboard_save_dimm_info(void)
diff --git a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/gpio.h b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/gpio.h
index 4cb57011c1..90b9a2a613 100644
--- a/src/mainboard/google/octopus/variants/baseboard/include/baseboard/gpio.h
+++ b/src/mainboard/google/octopus/variants/baseboard/include/baseboard/gpio.h
@@ -33,4 +33,10 @@
 
 #define GPIO_PCH_WP	GPIO_190
 
+/*  Memory SKU GPIOs. */
+#define MEM_CONFIG0	GPIO_68
+#define MEM_CONFIG1	GPIO_69
+#define MEM_CONFIG2	GPIO_70
+#define MEM_CONFIG3	GPIO_71
+
 #endif /* BASEBOARD_GPIO_H */
diff --git a/src/mainboard/google/octopus/variants/baseboard/memory.c b/src/mainboard/google/octopus/variants/baseboard/memory.c
index b708b5ca76..887d5524cd 100644
--- a/src/mainboard/google/octopus/variants/baseboard/memory.c
+++ b/src/mainboard/google/octopus/variants/baseboard/memory.c
@@ -18,7 +18,64 @@
 #include <soc/meminit.h>
 #include <variant/gpio.h>
 
+const struct lpddr4_swizzle_cfg baseboard_lpddr4_swizzle = {
+	/* CH0_DQA[0:31] SoC pins -> U22 LPDDR4 module pins */
+	.phys[LP4_PHYS_CH0A] = {
+		/* DQA[0:7] pins of LPDDR4 module. */
+		.dqs[LP4_DQS0] = { 4, 6, 7, 5, 3, 2, 1, 0 },
+		/* DQA[8:15] pins of LPDDR4 module. */
+		.dqs[LP4_DQS1] = { 12, 15, 13, 8, 9, 10, 11, 14 },
+		/* DQB[0:7] pins of LPDDR4 module with offset of 16. */
+		.dqs[LP4_DQS2] = { 17, 18, 19, 16, 23, 20, 21, 22 },
+		/* DQB[7:15] pins of LPDDR4 module with offset of 16. */
+		.dqs[LP4_DQS3] = { 30, 31, 25, 27, 26, 29, 28, 24 },
+	},
+	.phys[LP4_PHYS_CH0B] = {
+		/* DQA[0:7] pins of LPDDR4 module. */
+		.dqs[LP4_DQS0] = { 1, 3, 2, 0, 5, 4, 6, 7 },
+		/* DQA[8:15] pins of LPDDR4 module. */
+		.dqs[LP4_DQS1] = { 15, 14, 13, 12, 8, 9, 11, 10 },
+		/* DQB[0:7] pins of LPDDR4 module with offset of 16. */
+		.dqs[LP4_DQS2] = { 20, 21, 22, 16, 23, 17, 18, 19 },
+		/* DQB[7:15] pins of LPDDR4 module with offset of 16. */
+		.dqs[LP4_DQS3] = { 30, 26, 24, 25, 28, 29, 31, 27 },
+	},
+	.phys[LP4_PHYS_CH1A] = {
+		/* DQA[0:7] pins of LPDDR4 module. */
+		.dqs[LP4_DQS0] = { 15, 14, 13, 12, 8, 9, 10, 11 },
+		/* DQA[8:15] pins of LPDDR4 module. */
+		.dqs[LP4_DQS1] = { 7, 6, 5, 0, 4, 2, 1, 3 },
+		/* DQB[0:7] pins of LPDDR4 module with offset of 16. */
+		.dqs[LP4_DQS2] = { 20, 21, 23, 22, 19, 17, 18, 16 },
+		/* DQB[7:15] pins of LPDDR4 module with offset of 16. */
+		.dqs[LP4_DQS3] = { 24, 27, 26, 30, 25, 31, 28, 29 },
+	},
+	.phys[LP4_PHYS_CH1B] = {
+		/* DQA[0:7] pins of LPDDR4 module. */
+		.dqs[LP4_DQS0] = { 0, 4, 7, 1, 6, 5, 3, 2 },
+		/* DQA[8:15] pins of LPDDR4 module. */
+		.dqs[LP4_DQS1] = { 11, 12, 13, 15, 10, 9, 8, 14 },
+		/* DQB[0:7] pins of LPDDR4 module with offset of 16. */
+		.dqs[LP4_DQS2] = { 19, 21, 17, 16, 22, 23, 18, 20 },
+		/* DQB[7:15] pins of LPDDR4 module with offset of 16. */
+		.dqs[LP4_DQS3] = { 30, 26, 25, 24, 31, 29, 28, 27 },
+	},
+};
+
+static const struct lpddr4_sku skus[] = {
+	/* K4F8E304HB-MGCH - both logical channels  */
+	[0] = {
+		.speed = LP4_SPEED_2400,
+		.ch0_rank_density = LP4_8Gb_DENSITY,
+		.ch1_rank_density = LP4_8Gb_DENSITY,
+		.part_num = "K4F8E304HB-MGCH",
+	},
+};
+
 static const struct lpddr4_cfg lp4cfg = {
+	.skus = skus,
+	.num_skus = ARRAY_SIZE(skus),
+	.swizzle_config = &baseboard_lpddr4_swizzle,
 };
 
 const struct lpddr4_cfg *__attribute__((weak)) variant_lpddr4_config(void)
@@ -28,5 +85,10 @@ const struct lpddr4_cfg *__attribute__((weak)) variant_lpddr4_config(void)
 
 size_t __attribute__((weak)) variant_memory_sku(void)
 {
-	return 0;
+	gpio_t pads[] = {
+		[3] = MEM_CONFIG3, [2] = MEM_CONFIG2,
+		[1] = MEM_CONFIG1, [0] = MEM_CONFIG0,
+	};
+
+	return gpio_base2_value(pads, ARRAY_SIZE(pads));
 }