[M] Change in coreboot[main]: mb/google/nissa/var/riven: add fw_config probe for storage devices

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/83405?usp=email )

Change subject: mb/google/nissa/var/riven: add fw_config probe for storage devices
......................................................................

mb/google/nissa/var/riven: add fw_config probe for storage devices

1. Add STORAGE_UNKNOWN fw_config to enable all storage devices,
this is used for the first boot in factory.

2. Add fw_config probe to enable/disable devices in devicetree
instead of variant.c, it can avoid suspend(s0ix) fail issue.

BUG=b:328580882
TEST=On riven eMMC and UFS SKUs, boot to OS and run
`suspend_stress_test -c 10` pass.

Change-Id: I518f1a5955fb88f304663112f1e3d4c744bde183
Signed-off-by: David Wu 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/83405
Reviewed-by: Subrata Banik 
Reviewed-by: Eric Lai 
Tested-by: build bot (Jenkins) 
---
M src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb
M src/mainboard/google/brya/variants/riven/Makefile.mk
M src/mainboard/google/brya/variants/riven/fw_config.c
M src/mainboard/google/brya/variants/riven/overridetree.cb
D src/mainboard/google/brya/variants/riven/variant.c
5 files changed, 16 insertions(+), 35 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Subrata Banik: Looks good to me, approved
  Eric Lai: Looks good to me, approved

diff --git a/src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb b/src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb
index 2ab9a3d..aac4bca 100644
--- a/src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb
+++ b/src/mainboard/google/brya/variants/baseboard/nissa/devicetree.cb
@@ -11,6 +11,7 @@
    	option STORAGE_EMMC		0
    	option STORAGE_NVME		1
    	option STORAGE_UFS		2
+		option STORAGE_UNKNOWN		3
    end
 end

diff --git a/src/mainboard/google/brya/variants/riven/Makefile.mk b/src/mainboard/google/brya/variants/riven/Makefile.mk
index 86ba20d..8ae0e3b 100644
--- a/src/mainboard/google/brya/variants/riven/Makefile.mk
+++ b/src/mainboard/google/brya/variants/riven/Makefile.mk
@@ -4,5 +4,4 @@
 romstage-y += gpio.c

ramstage-$(CONFIG_FW_CONFIG) += fw_config.c
-ramstage-$(CONFIG_FW_CONFIG) += variant.c
 ramstage-y += gpio.c
diff --git a/src/mainboard/google/brya/variants/riven/fw_config.c b/src/mainboard/google/brya/variants/riven/fw_config.c
index 7967282..b22463f 100644
--- a/src/mainboard/google/brya/variants/riven/fw_config.c
+++ b/src/mainboard/google/brya/variants/riven/fw_config.c
@@ -90,9 +90,11 @@
    					ARRAY_SIZE(stylus_disable_pads));
    }

-	if (!fw_config_probe(FW_CONFIG(STORAGE, STORAGE_EMMC))) {
-		printk(BIOS_INFO, "Disable eMMC GPIO pins.\n");
-		gpio_padbased_override(padbased_table, emmc_disable_pads,
+	if (!fw_config_probe(FW_CONFIG(STORAGE, STORAGE_UNKNOWN))) {
+		if (!fw_config_probe(FW_CONFIG(STORAGE, STORAGE_EMMC))) {
+			printk(BIOS_INFO, "Disable eMMC GPIO pins.\n");
+			gpio_padbased_override(padbased_table, emmc_disable_pads,
    					ARRAY_SIZE(emmc_disable_pads));
+		}
    }
 }
diff --git a/src/mainboard/google/brya/variants/riven/overridetree.cb b/src/mainboard/google/brya/variants/riven/overridetree.cb
index 796a79c..301d72a 100644
--- a/src/mainboard/google/brya/variants/riven/overridetree.cb
+++ b/src/mainboard/google/brya/variants/riven/overridetree.cb
@@ -478,14 +478,22 @@
    		end
    	end
    	device ref pcie_rp7 off end # PCIE7 no SD card
-		device ref emmc on end
+		device ref emmc on
+			probe STORAGE STORAGE_UNKNOWN
+			probe STORAGE STORAGE_EMMC
+		end
    	device ref ish on
    		chip drivers/intel/ish
    			register "add_acpi_dma_property" = "true"
    			device generic 0 on end
    		end
+			probe STORAGE STORAGE_UNKNOWN
+			probe STORAGE STORAGE_UFS
    	end
-		device ref ufs on end
+		device ref ufs on
+			probe STORAGE STORAGE_UNKNOWN
+			probe STORAGE STORAGE_UFS
+		end
    	device ref pch_espi on
    		chip ec/google/chromeec
    			use conn0 as mux_conn[0]
diff --git a/src/mainboard/google/brya/variants/riven/variant.c b/src/mainboard/google/brya/variants/riven/variant.c
deleted file mode 100644
index 937215c..0000000
--- a/src/mainboard/google/brya/variants/riven/variant.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-
-#include <baseboard/variants.h>
-#include <console/console.h>
-#include <device/device.h>
-#include <fw_config.h>
-
-void variant_devtree_update(void)
-{
-	struct device *emmc = DEV_PTR(emmc);
-	struct device *ufs = DEV_PTR(ufs);
-	struct device *ish = DEV_PTR(ish);
-
-	if (!fw_config_is_provisioned()) {
-		printk(BIOS_INFO, "fw_config unprovisioned so enable all storage devices\n");
-		return;
-	}
-
-	if (!fw_config_probe(FW_CONFIG(STORAGE, STORAGE_EMMC))) {
-		printk(BIOS_INFO, "eMMC disabled by fw_config\n");
-		emmc->enabled = 0;
-	}
-
-	if (!fw_config_probe(FW_CONFIG(STORAGE, STORAGE_UFS))) {
-		printk(BIOS_INFO, "UFS disabled by fw_config\n");
-		ufs->enabled = 0;
-		ish->enabled = 0;
-	}
-}