[coreboot-gerrit] [S] Change in coreboot[master]: mb/google/rex: Use FW_CONFIG for generating ACPI code for WIFI

[Felix Held (Code Review)]

Felix Held has submitted this change. ( https://review.coreboot.org/c/coreboot/+/74147 )

Change subject: mb/google/rex: Use FW_CONFIG for generating ACPI code for WIFI
......................................................................

mb/google/rex: Use FW_CONFIG for generating ACPI code for WIFI

This patch avoids creating runtime ACPI for unused WIFI solutions.
For example: if the Rex SKU is with WIFI_CNVI then you don't need
to populate ACPI code for WIFI_PCIE.

FW_CONIG can be used for making those decisions.

TEST=No ASL entries being created for WIFI_PCIE if the FW_CONIG is
set to WIFI_CNVI.

Also, helped to save the boot time on google/rex (FSP-S API) by 9ms.

Change-Id: I60e4332d8d8c360fdf425b30513ff79209979e85
Signed-off-by: Subrata Banik 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74147
Reviewed-by: YH Lin 
Tested-by: build bot (Jenkins) 
Reviewed-by: Kapil Porwal 
---
M src/mainboard/google/rex/variants/rex0/overridetree.cb
1 file changed, 35 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  YH Lin: Looks good to me, but someone else must approve
  Kapil Porwal: Looks good to me, approved

diff --git a/src/mainboard/google/rex/variants/rex0/overridetree.cb b/src/mainboard/google/rex/variants/rex0/overridetree.cb
index 44d20cb..282c3da 100644
--- a/src/mainboard/google/rex/variants/rex0/overridetree.cb
+++ b/src/mainboard/google/rex/variants/rex0/overridetree.cb
@@ -248,7 +248,9 @@
    			register "wake" = "GPE0_PME_B0"
    			register "add_acpi_dma_property" = "true"
    			register "enable_cnvi_ddr_rfim" = "true"
-				device generic 0 on end
+				device generic 0 on
+					probe WIFI WIFI_CNVI
+				end
    		end
    	end
    	device ref ipu on
@@ -500,6 +502,7 @@
    		end
    	end #I2C5
    	device ref pcie_rp5 on
+			probe WIFI WIFI_PCIE
    		# Enable WLAN Card PCIE 5 using clk 5
    		register "pcie_rp[PCH_RP(5)]" = "{
    			.clk_src = 5,
@@ -509,13 +512,17 @@
    		chip drivers/wifi/generic
    			register "wake" = "GPE0_DW2_09"
    			register "add_acpi_dma_property" = "true"
-				device pci 00.0 on end
+				device pci 00.0 on
+					probe WIFI WIFI_PCIE
+				end
    		end
    		chip soc/intel/common/block/pcie/rtd3
    			register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_E22)"
    			register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_F08)"
    			register "srcclk_pin" = "5"
-				device generic 0 on end
+				device generic 0 on
+					probe WIFI WIFI_PCIE
+				end
    		end
    	end	#PCIE5 WLAN card
    	device ref pcie_rp6 on