Change in coreboot[master]: mb/google/zork: disable eMMC per FW_CONFIG for berknip

[Kevin Chiu (Code Review)]

Kevin Chiu has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/46292 )

Change subject: mb/google/zork: disable eMMC per FW_CONFIG for berknip
......................................................................

mb/google/zork: disable eMMC per FW_CONFIG for berknip

Berknip has SSD/eMMC SKU, we should turn off eMMC
if storage is NVMe SSD.

BUG=b:170592992
BRANCH=zork
TEST=1. emerge-zork coreboot
     2. Check eMMC is enabled or disabled based on the eMMC bit in
        FW_CONFIG.

Change-Id: I7aeabc98fc16bc2837c8dcdc40c3c6a80898cdc9
Signed-off-by: Kevin Chiu 
---
M src/mainboard/google/zork/variants/berknip/Makefile.inc
A src/mainboard/google/zork/variants/berknip/variant.c
2 files changed, 17 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/46292/1

diff --git a/src/mainboard/google/zork/variants/berknip/Makefile.inc b/src/mainboard/google/zork/variants/berknip/Makefile.inc
index 57e7136..51d19fe 100644
--- a/src/mainboard/google/zork/variants/berknip/Makefile.inc
+++ b/src/mainboard/google/zork/variants/berknip/Makefile.inc
@@ -3,3 +3,4 @@
 subdirs-y += ./spd

ramstage-y += gpio.c
+ramstage-y += variant.c
diff --git a/src/mainboard/google/zork/variants/berknip/variant.c b/src/mainboard/google/zork/variants/berknip/variant.c
new file mode 100644
index 0000000..092ff26
--- /dev/null
+++ b/src/mainboard/google/zork/variants/berknip/variant.c
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include <baseboard/variants.h>
+
+void variant_devtree_update(void)
+{
+	struct soc_amd_picasso_config *cfg;
+
+	cfg = config_of_soc();
+
+	/*
+	 * Enable eMMC if eMMC bit is set in FW_CONFIG or device is unprovisioned.
+	 */
+	if (!(variant_has_emmc() || boot_is_factory_unprovisioned()))
+		cfg->emmc_config.timing = SD_EMMC_DISABLE;
+}

[Kevin Chiu (Code Review)]

Kevin Chiu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46292 )

Change subject: mb/google/zork: disable eMMC per FW_CONFIG for berknip
......................................................................

Patch Set 1:

Hi reviewers,
could you please help review this one?
thank you!

[Martin Roth (Code Review)]

Martin Roth has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46292 )

Change subject: mb/google/zork: disable eMMC per FW_CONFIG for berknip
......................................................................

Patch Set 1: Code-Review+2

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46292 )

Change subject: mb/google/zork: disable eMMC per FW_CONFIG for berknip
......................................................................

Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/46292/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/46292/1//COMMIT_MSG@10 
PS1, Line 10: if storage is NVMe SSD.
Please wrap lines after 75 characters.

[Rob Barnes (Code Review)]

Rob Barnes has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46292 )

Change subject: mb/google/zork: disable eMMC per FW_CONFIG for berknip
......................................................................

Patch Set 1: Code-Review+2

[Kevin Chiu (Code Review)]

Hello build bot (Jenkins), Martin Roth, Furquan Shaikh, Patrick Georgi, Bhanu Prakash Maiya, Rob Barnes, Eric Peers, Aaron Durbin,

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

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

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

Change subject: mb/google/zork: disable eMMC per FW_CONFIG for berknip
......................................................................

mb/google/zork: disable eMMC per FW_CONFIG for berknip

Berknip has SSD/eMMC SKU, we should turn off eMMC　if storage is NVMe SSD.

BUG=b:170592992
BRANCH=zork
TEST=1. emerge-zork coreboot
     2. Check eMMC is enabled or disabled based on the eMMC bit in
        FW_CONFIG.

Change-Id: I7aeabc98fc16bc2837c8dcdc40c3c6a80898cdc9
Signed-off-by: Kevin Chiu 
---
M src/mainboard/google/zork/variants/berknip/Makefile.inc
A src/mainboard/google/zork/variants/berknip/variant.c
2 files changed, 17 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/92/46292/2

[Kevin Chiu (Code Review)]

Kevin Chiu has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/46292 )

Change subject: mb/google/zork: disable eMMC per FW_CONFIG for berknip
......................................................................

Patch Set 2:

(1 comment)

https://review.coreboot.org/c/coreboot/+/46292/1//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/c/coreboot/+/46292/1//COMMIT_MSG@10 
PS1, Line 10: if storage is NVMe SSD.
> Please wrap lines after 75 characters.

Done

[Aaron Durbin (Code Review)]

Aaron Durbin has submitted this change. ( https://review.coreboot.org/c/coreboot/+/46292 )

Change subject: mb/google/zork: disable eMMC per FW_CONFIG for berknip
......................................................................

mb/google/zork: disable eMMC per FW_CONFIG for berknip

Berknip has SSD/eMMC SKU, we should turn off eMMC　if storage is NVMe SSD.

BUG=b:170592992
BRANCH=zork
TEST=1. emerge-zork coreboot
     2. Check eMMC is enabled or disabled based on the eMMC bit in
        FW_CONFIG.

Change-Id: I7aeabc98fc16bc2837c8dcdc40c3c6a80898cdc9
Signed-off-by: Kevin Chiu 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/46292
Tested-by: build bot (Jenkins) 
Reviewed-by: Martin Roth 
Reviewed-by: Rob Barnes 
---
M src/mainboard/google/zork/variants/berknip/Makefile.inc
A src/mainboard/google/zork/variants/berknip/variant.c
2 files changed, 17 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Martin Roth: Looks good to me, approved
  Rob Barnes: Looks good to me, approved

diff --git a/src/mainboard/google/zork/variants/berknip/Makefile.inc b/src/mainboard/google/zork/variants/berknip/Makefile.inc
index 57e7136..51d19fe 100644
--- a/src/mainboard/google/zork/variants/berknip/Makefile.inc
+++ b/src/mainboard/google/zork/variants/berknip/Makefile.inc
@@ -3,3 +3,4 @@
 subdirs-y += ./spd

ramstage-y += gpio.c
+ramstage-y += variant.c
diff --git a/src/mainboard/google/zork/variants/berknip/variant.c b/src/mainboard/google/zork/variants/berknip/variant.c
new file mode 100644
index 0000000..092ff26
--- /dev/null
+++ b/src/mainboard/google/zork/variants/berknip/variant.c
@@ -0,0 +1,16 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include <baseboard/variants.h>
+
+void variant_devtree_update(void)
+{
+	struct soc_amd_picasso_config *cfg;
+
+	cfg = config_of_soc();
+
+	/*
+	 * Enable eMMC if eMMC bit is set in FW_CONFIG or device is unprovisioned.
+	 */
+	if (!(variant_has_emmc() || boot_is_factory_unprovisioned()))
+		cfg->emmc_config.timing = SD_EMMC_DISABLE;
+}