Ren Kuo has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/84002?usp=email )
Change subject: mb/google/brox/var/jubilant: Enable devices on unprovisioned fw_config ......................................................................
mb/google/brox/var/jubilant: Enable devices on unprovisioned fw_config
Add the condition of unprovisioned fw_config to enable all storages and devices. It's for first boot on all storags and preliminary test in factory when fw-config is unprovisioned.
BUG=None TEST=Build jubilant firmware and boot to OS on storages when fw_config is unprovisioned and ensure all devices are enable.
Change-Id: Ia14632744c34548e2c201dfc58d82515cdd02df0 Signed-off-by: Ren Kuo ren.kuo@quanta.corp-partner.google.com --- M src/mainboard/google/brox/variants/jubilant/fw_config.c M src/mainboard/google/brox/variants/jubilant/overridetree.cb M src/mainboard/google/brox/variants/jubilant/variant.c 3 files changed, 14 insertions(+), 4 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/02/84002/1
diff --git a/src/mainboard/google/brox/variants/jubilant/fw_config.c b/src/mainboard/google/brox/variants/jubilant/fw_config.c index ec95c57..7341afe 100644 --- a/src/mainboard/google/brox/variants/jubilant/fw_config.c +++ b/src/mainboard/google/brox/variants/jubilant/fw_config.c @@ -60,7 +60,7 @@ static void fw_config_handle(void *unused) { if (!fw_config_is_provisioned()) { - printk(BIOS_WARNING, "FW_CONFIG is not provisioned. Exiting...\n"); + printk(BIOS_WARNING, "FW_CONFIG is unprovisioned. Skip disable device's pads.\n"); return; }
diff --git a/src/mainboard/google/brox/variants/jubilant/overridetree.cb b/src/mainboard/google/brox/variants/jubilant/overridetree.cb index 0613ff9..6d7c3f8 100644 --- a/src/mainboard/google/brox/variants/jubilant/overridetree.cb +++ b/src/mainboard/google/brox/variants/jubilant/overridetree.cb @@ -232,6 +232,7 @@ register "type" = "UPC_TYPE_INTERNAL" device ref usb2_port4 on probe DB_USB DB_1A_LTE + probe unprovisioned end end chip drivers/usb/acpi @@ -281,6 +282,7 @@ register "type" = "UPC_TYPE_INTERNAL" device ref usb3_port4 on probe DB_USB DB_1A_LTE + probe unprovisioned end end end @@ -295,6 +297,7 @@ }" probe STORAGE STORAGE_NVME probe STORAGE STORAGE_UNKNOWN + probe unprovisioned end device ref pcie_rp5 on register "pch_pcie_rp[PCH_RP(5)]" = "{ @@ -307,6 +310,7 @@ register "add_acpi_dma_property" = "true" device pci 00.0 on probe WIFI_BT WIFI_BT_PCIE + probe unprovisioned end end chip soc/intel/common/block/pcie/rtd3 @@ -316,6 +320,7 @@ device generic 0 on end end probe WIFI_BT WIFI_BT_PCIE + probe unprovisioned end device ref cnvi_wifi on chip drivers/wifi/generic @@ -325,6 +330,7 @@ device generic 0 on end end probe WIFI_BT WIFI_BT_CNVI + probe unprovisioned end device ref ish on chip drivers/intel/ish @@ -333,10 +339,12 @@ end probe STORAGE STORAGE_UFS probe STORAGE STORAGE_UNKNOWN + probe unprovisioned end device ref ufs on probe STORAGE STORAGE_UFS probe STORAGE STORAGE_UNKNOWN + probe unprovisioned end device ref i2c0 on chip drivers/i2c/generic @@ -438,6 +446,7 @@ register "input_analog_gain" = "1" device i2c 28 on probe DB_USB DB_1A_LTE + probe unprovisioned end end end @@ -455,6 +464,7 @@ register "enable_delay_ms" = "3" device spi 0 on probe FPMCU FPMCU_NUVOTON + probe unprovisioned end end # FPMCU end diff --git a/src/mainboard/google/brox/variants/jubilant/variant.c b/src/mainboard/google/brox/variants/jubilant/variant.c index c6b2626..4b214aa 100644 --- a/src/mainboard/google/brox/variants/jubilant/variant.c +++ b/src/mainboard/google/brox/variants/jubilant/variant.c @@ -9,7 +9,7 @@
void variant_update_soc_chip_config(struct soc_intel_alderlake_config *config) { - if (fw_config_probe(FW_CONFIG(WIFI_BT, WIFI_BT_CNVI))) { + if (fw_config_probe(FW_CONFIG(WIFI_BT, WIFI_BT_CNVI)) || (!fw_config_is_provisioned())) { printk(BIOS_INFO, "CNVi bluetooth enabled by fw_config\n"); config->cnvi_bt_core = true; config->cnvi_bt_audio_offload = true; @@ -31,8 +31,8 @@ struct device *ish = DEV_PTR(ish); struct device *nvme_rp = DEV_PTR(pcie4_0);
- if (fw_config_probe(FW_CONFIG(STORAGE, STORAGE_UNKNOWN))) { - printk(BIOS_INFO, "fw_config storage is unknown so enable all storage devices.\n"); + if (fw_config_probe(FW_CONFIG(STORAGE, STORAGE_UNKNOWN)) || (!fw_config_is_provisioned())) { + printk(BIOS_INFO, "fw_config is unprovisioned or storage is unknown so enable all storage's configs.\n"); return; }