Change in coreboot[master]: Update dq/dqs mappings based on voxel schematics.

[Sheng-Liang Pan (Code Review)]

Sheng-Liang Pan has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/43794 )

Change subject: Update dq/dqs mappings based on voxel schematics.
......................................................................

Update dq/dqs mappings based on voxel schematics.

BUG=b:155062561
BRANCH=none
TEST=FW_NAME=voxel emerge-volteer coreboot chromeos-bootimage

Signed-off-by: Pan Sheng-Liang 
Change-Id: Ida248094a1477fe457026e18f313385082ee71f0
---
M src/mainboard/google/volteer/variants/voxel/Makefile.inc
A src/mainboard/google/volteer/variants/voxel/memory.c
2 files changed, 62 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/94/43794/1

diff --git a/src/mainboard/google/volteer/variants/voxel/Makefile.inc b/src/mainboard/google/volteer/variants/voxel/Makefile.inc
index 13269db..b0bfc56 100644
--- a/src/mainboard/google/volteer/variants/voxel/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/voxel/Makefile.inc
@@ -2,4 +2,6 @@

bootblock-y += gpio.c

+romstage-y += memory.c
+
 ramstage-y += gpio.c
diff --git a/src/mainboard/google/volteer/variants/voxel/memory.c b/src/mainboard/google/volteer/variants/voxel/memory.c
new file mode 100644
index 0000000..2f062f0
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/voxel/memory.c
@@ -0,0 +1,60 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <baseboard/variants.h>
+
+static const struct lpddr4x_cfg voxel_memcfg = {
+	/* DQ byte map */
+	.dq_map = {
+		[0] = {
+			{ 3,  0,  1,  2,  6,  7,  5,  4, }, /* DDR0_DQ0[7:0] */
+			{ 12, 15, 14,  13, 8,  9, 10, 11 }, /* DDR0_DQ1[7:0] */
+		},
+		[1] = {
+			{ 12,  15,  13,  14,  10,  8,  11,  9, }, /* DDR1_DQ0[7:0] */
+			{ 5, 6, 7, 4,  0, 3, 1, 2  }, /* DDR1_DQ1[7:0] */
+		},
+		[2] = {
+			{ 2, 3, 0, 1,  7, 6, 15, 4, }, /* DDR2_DQ0[7:0] */
+			{ 12,  14,  15,  13,  10,  9,  8,  11  }, /* DDR2_DQ1[7:0] */
+		},
+		[3] = {
+			{ 15, 12, 13, 14, 8, 9, 10,  11, }, /* DDR3_DQ0[7:0] */
+			{ 7,  6,  4,  5,  2,  0,  3,  1  }, /* DDR3_DQ1[7:0] */
+		},
+		[4] = {
+			{ 6,  5,  4,  7,  0,  3,  2,  1, }, /* DDR4_DQ0[7:0] */
+			{ 15, 14,  13, 12, 11,  8, 9, 10 }, /* DDR4_DQ1[7:0] */
+		},
+		[5] = {
+			{ 11,  9,  10,  8,  12,  14,  13,  15, }, /* DDR5_DQ0[7:0] */
+			{ 1, 0, 2, 3, 6, 7,  5,  4 }, /* DDR5_DQ1[7:0] */
+		},
+		[6] = {
+			{ 2, 3, 0, 1, 5,  4, 6, 7, }, /* DDR6_DQ0[7:0] */
+			{ 13,  14,  15,  12,  11,  10,  8,  9  }, /* DDR6_DQ1[7:0] */
+		},
+		[7] = {
+			{ 14, 13, 15,  12, 9, 8, 10, 11, }, /* DDR7_DQ0[7:0] */
+			{ 4,  5,  1,  2,  6,  0,  3,  7  }, /* DDR7_DQ1[7:0] */
+		},
+	},
+
+	/* DQS CPU<>DRAM map */
+	.dqs_map = {
+		[0] = { 0, 1 },  /* DDR0_DQS[1:0] */
+		[1] = { 1, 0 },  /* DDR1_DQS[1:0] */
+		[2] = { 0, 1 },  /* DDR2_DQS[1:0] */
+		[3] = { 1, 0 },  /* DDR3_DQS[1:0] */
+		[4] = { 0, 1 },  /* DDR4_DQS[1:0] */
+		[5] = { 1, 0 },  /* DDR5_DQS[1:0] */
+		[6] = { 0, 1 },  /* DDR6_DQS[1:0] */
+		[7] = { 1, 0 },  /* DDR7_DQS[1:0] */
+	},
+
+	.ect = 1, /* Enable Early Command Training */
+};
+
+const struct lpddr4x_cfg *variant_memory_params(void)
+{
+	return &voxel_memcfg;
+}

[Sheng-Liang Pan (Code Review)]

Hello build bot (Jenkins), Patrick Georgi, Martin Roth,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/43794

to look at the new patch set (#2).

Change subject: Update dq/dqs mappings based on voxel schematics.
......................................................................

Update dq/dqs mappings based on voxel schematics.

BUG=b:155062561
BRANCH=none
TEST=FW_NAME=voxel emerge-volteer coreboot chromeos-bootimage

Signed-off-by: Pan Sheng-Liang 
Change-Id: Ida248094a1477fe457026e18f313385082ee71f0
---
M src/mainboard/google/volteer/variants/voxel/Makefile.inc
A src/mainboard/google/volteer/variants/voxel/memory.c
2 files changed, 62 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/94/43794/2

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43794 )

Change subject: Update dq/dqs mappings based on voxel schematics.
......................................................................

Patch Set 2: Code-Review+1

(1 comment)

https://review.coreboot.org/c/coreboot/+/43794/2//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/43794/2//COMMIT_MSG@6 
PS2, Line 6: 
Add a commit summary:

mb/google/volteer/var/voxel: Add memory configuration

Change in coreboot[master]: mb/google/volteer/var/voxel: Add memory configuration

[Sheng-Liang Pan (Code Review)]

Hello build bot (Jenkins), Patrick Georgi, Martin Roth, Nick Vaccaro, Angel Pons, Derek Huang,

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/43794

to look at the new patch set (#3).

Change subject: mb/google/volteer/var/voxel: Add memory configuration
......................................................................

mb/google/volteer/var/voxel: Add memory configuration

Update dq/dqs mappings based on voxel schematics.

BUG=b:155062561
BRANCH=none
TEST=FW_NAME=voxel emerge-volteer coreboot chromeos-bootimage

Signed-off-by: Pan Sheng-Liang 
Change-Id: Ida248094a1477fe457026e18f313385082ee71f0
---
M src/mainboard/google/volteer/variants/voxel/Makefile.inc
A src/mainboard/google/volteer/variants/voxel/memory.c
2 files changed, 62 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/94/43794/3

Change in coreboot[master]: mb/google/volteer/var/voxel: Add memory configuration

[Sheng-Liang Pan (Code Review)]

Sheng-Liang Pan has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43794 )

Change subject: mb/google/volteer/var/voxel: Add memory configuration
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/c/coreboot/+/43794/2//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/43794/2//COMMIT_MSG@6 
PS2, Line 6:
> Add a commit summary: […]

Done, thanks.

Change in coreboot[master]: mb/google/volteer/var/voxel: Add memory configuration

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/43794 )

Change subject: mb/google/volteer/var/voxel: Add memory configuration
......................................................................

Patch Set 3: Code-Review+2

(1 comment)

https://review.coreboot.org/c/coreboot/+/43794/2//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/43794/2//COMMIT_MSG@6 
PS2, Line 6:
> Done, thanks.

Done

Change in coreboot[master]: mb/google/volteer/var/voxel: Add memory configuration

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/43794 )

Change subject: mb/google/volteer/var/voxel: Add memory configuration
......................................................................

mb/google/volteer/var/voxel: Add memory configuration

Update dq/dqs mappings based on voxel schematics.

BUG=b:155062561
BRANCH=none
TEST=FW_NAME=voxel emerge-volteer coreboot chromeos-bootimage

Signed-off-by: Pan Sheng-Liang 
Change-Id: Ida248094a1477fe457026e18f313385082ee71f0
Reviewed-on: https://review.coreboot.org/c/coreboot/+/43794
Reviewed-by: Angel Pons 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/google/volteer/variants/voxel/Makefile.inc
A src/mainboard/google/volteer/variants/voxel/memory.c
2 files changed, 62 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Angel Pons: Looks good to me, approved

diff --git a/src/mainboard/google/volteer/variants/voxel/Makefile.inc b/src/mainboard/google/volteer/variants/voxel/Makefile.inc
index 13269db..b0bfc56 100644
--- a/src/mainboard/google/volteer/variants/voxel/Makefile.inc
+++ b/src/mainboard/google/volteer/variants/voxel/Makefile.inc
@@ -2,4 +2,6 @@

bootblock-y += gpio.c

+romstage-y += memory.c
+
 ramstage-y += gpio.c
diff --git a/src/mainboard/google/volteer/variants/voxel/memory.c b/src/mainboard/google/volteer/variants/voxel/memory.c
new file mode 100644
index 0000000..455b180
--- /dev/null
+++ b/src/mainboard/google/volteer/variants/voxel/memory.c
@@ -0,0 +1,60 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#include <baseboard/variants.h>
+
+static const struct lpddr4x_cfg voxel_memcfg = {
+	/* DQ byte map */
+	.dq_map = {
+		[0] = {
+			{ 3,  0,  1,  2,  6,  7,  5,  4, }, /* DDR0_DQ0[7:0] */
+			{ 12, 15, 14,  13, 8,  9, 10, 11 }, /* DDR0_DQ1[7:0] */
+		},
+		[1] = {
+			{ 12,  15,  13,  14,  10,  8,  11,  9, }, /* DDR1_DQ0[7:0] */
+			{ 5, 6, 7, 4,  0, 3, 1, 2  }, /* DDR1_DQ1[7:0] */
+		},
+		[2] = {
+			{ 2, 3, 0, 1,  7, 6, 5, 4, }, /* DDR2_DQ0[7:0] */
+			{ 12,  14,  15,  13,  10,  9,  8,  11  }, /* DDR2_DQ1[7:0] */
+		},
+		[3] = {
+			{ 15, 12, 13, 14, 8, 9, 10,  11, }, /* DDR3_DQ0[7:0] */
+			{ 7,  6,  4,  5,  2,  0,  3,  1  }, /* DDR3_DQ1[7:0] */
+		},
+		[4] = {
+			{ 6,  5,  4,  7,  0,  3,  2,  1, }, /* DDR4_DQ0[7:0] */
+			{ 15, 14,  13, 12, 11,  8, 9, 10 }, /* DDR4_DQ1[7:0] */
+		},
+		[5] = {
+			{ 11,  9,  10,  8,  12,  14,  13,  15, }, /* DDR5_DQ0[7:0] */
+			{ 1, 0, 2, 3, 6, 7,  5,  4 }, /* DDR5_DQ1[7:0] */
+		},
+		[6] = {
+			{ 2, 3, 0, 1, 5,  4, 6, 7, }, /* DDR6_DQ0[7:0] */
+			{ 13,  14,  15,  12,  11,  10,  8,  9  }, /* DDR6_DQ1[7:0] */
+		},
+		[7] = {
+			{ 14, 13, 15,  12, 9, 8, 10, 11, }, /* DDR7_DQ0[7:0] */
+			{ 4,  5,  1,  2,  6,  0,  3,  7  }, /* DDR7_DQ1[7:0] */
+		},
+	},
+
+	/* DQS CPU<>DRAM map */
+	.dqs_map = {
+		[0] = { 0, 1 },  /* DDR0_DQS[1:0] */
+		[1] = { 1, 0 },  /* DDR1_DQS[1:0] */
+		[2] = { 0, 1 },  /* DDR2_DQS[1:0] */
+		[3] = { 1, 0 },  /* DDR3_DQS[1:0] */
+		[4] = { 0, 1 },  /* DDR4_DQS[1:0] */
+		[5] = { 1, 0 },  /* DDR5_DQS[1:0] */
+		[6] = { 0, 1 },  /* DDR6_DQS[1:0] */
+		[7] = { 1, 0 },  /* DDR7_DQS[1:0] */
+	},
+
+	.ect = 1, /* Enable Early Command Training */
+};
+
+const struct lpddr4x_cfg *variant_memory_params(void)
+{
+	return &voxel_memcfg;
+}