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

[Kevin Chiu (Code Review)]

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

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

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

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

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

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

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/45755/1

diff --git a/src/mainboard/google/zork/variants/morphius/Makefile.inc b/src/mainboard/google/zork/variants/morphius/Makefile.inc
index 57e7136..51d19fe 100644
--- a/src/mainboard/google/zork/variants/morphius/Makefile.inc
+++ b/src/mainboard/google/zork/variants/morphius/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/morphius/variant.c b/src/mainboard/google/zork/variants/morphius/variant.c
new file mode 100644
index 0000000..65ac2ab
--- /dev/null
+++ b/src/mainboard/google/zork/variants/morphius/variant.c
@@ -0,0 +1,22 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#include <baseboard/variants.h>
+#include <device/device.h>
+#include <soc/pci_devs.h>
+#include <ec/google/chromeec/ec.h>
+#include <console/console.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())) {
+		printk(BIOS_INFO, "variant_devtree_update: turn off emmc\n");
+		cfg->emmc_config.timing = SD_EMMC_DISABLE;
+	}
+}

[build bot (Jenkins) (Code Review)]

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45755 )

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

Patch Set 1:

(1 comment)

https://review.coreboot.org/c/coreboot/+/45755/1/src/mainboard/google/zork/v... 
File src/mainboard/google/zork/variants/morphius/variant.c:

https://review.coreboot.org/c/coreboot/+/45755/1/src/mainboard/google/zork/v... 
PS1, Line 19: 		printk(BIOS_INFO, "variant_devtree_update: turn off emmc\n");
Prefer using '"%s...", __func__' to using 'variant_devtree_update', this function's name, in a string

[Kevin Chiu (Code Review)]

Hello Patrick Georgi, Martin Roth,

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

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

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

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

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

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

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

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

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/45755/2

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45755 )

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

Patch Set 2:

(2 comments)

https://review.coreboot.org/c/coreboot/+/45755/2/src/mainboard/google/zork/v... 
File src/mainboard/google/zork/variants/morphius/variant.c:

https://review.coreboot.org/c/coreboot/+/45755/2/src/mainboard/google/zork/v... 
PS2, Line 4: #include <device/device.h>
           : #include <soc/pci_devs.h>
Probably not neded?

https://review.coreboot.org/c/coreboot/+/45755/2/src/mainboard/google/zork/v... 
PS2, Line 6: #include <ec/google/chromeec/ec.h>
Not needed.

[Kevin Chiu (Code Review)]

Hello build bot (Jenkins), Furquan Shaikh, Patrick Georgi, Martin Roth, Bhanu Prakash Maiya, Keith Tzeng, Aaron Durbin,

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

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

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

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

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

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

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

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

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/45755/3

[Kevin Chiu (Code Review)]

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

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

Patch Set 3:

(2 comments)

https://review.coreboot.org/c/coreboot/+/45755/2/src/mainboard/google/zork/v... 
File src/mainboard/google/zork/variants/morphius/variant.c:

https://review.coreboot.org/c/coreboot/+/45755/2/src/mainboard/google/zork/v... 
PS2, Line 4: #include <device/device.h>
           : #include <soc/pci_devs.h>
> Probably not neded?

Done

https://review.coreboot.org/c/coreboot/+/45755/2/src/mainboard/google/zork/v... 
PS2, Line 6: #include <ec/google/chromeec/ec.h>
> Not needed.

Done

[Furquan Shaikh (Code Review)]

Furquan Shaikh has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45755 )

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

Patch Set 3: Code-Review+2

[Keith Tzeng (Code Review)]

Keith Tzeng has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45755 )

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

Patch Set 3:

Could we land this?

[Kangheui Won (Code Review)]

Kangheui Won has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/45755 )

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

Patch Set 3: Code-Review+1

[Furquan Shaikh (Code Review)]

Furquan Shaikh has submitted this change. ( https://review.coreboot.org/c/coreboot/+/45755 )

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

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

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

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

Change-Id: I67d5d77ce3d827ae89b82529de59925f67eaf894
Signed-off-by: Kevin Chiu 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/45755
Tested-by: build bot (Jenkins) 
Reviewed-by: Furquan Shaikh 
Reviewed-by: Kangheui Won 
---
M src/mainboard/google/zork/variants/morphius/Makefile.inc
A src/mainboard/google/zork/variants/morphius/variant.c
2 files changed, 17 insertions(+), 0 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Furquan Shaikh: Looks good to me, approved
  Kangheui Won: Looks good to me, but someone else must approve

diff --git a/src/mainboard/google/zork/variants/morphius/Makefile.inc b/src/mainboard/google/zork/variants/morphius/Makefile.inc
index 57e7136..51d19fe 100644
--- a/src/mainboard/google/zork/variants/morphius/Makefile.inc
+++ b/src/mainboard/google/zork/variants/morphius/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/morphius/variant.c b/src/mainboard/google/zork/variants/morphius/variant.c
new file mode 100644
index 0000000..092ff26
--- /dev/null
+++ b/src/mainboard/google/zork/variants/morphius/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;
+}