mb/system76/rpl: lemp12: Add timeouts for PCIE RPs

The FSP may fail to detect PCIe 4.0 devices in PCIe 3.0 slots on S3
resume.

Change-Id: Ib2efec2febc9f6c25b1dd8766fa08c560365325d
Signed-off-by: Tim Crawford <tcrawford@system76.com>

src/mainboard/system76/adl/Kconfig

@@ -108,10 +108,6 @@ config MAINBOARD_VERSION
 	default "oryp9" if BOARD_SYSTEM76_ORYP9
 	default "oryp10" if BOARD_SYSTEM76_ORYP10
 
-config CMOS_DEFAULT_FILE
-	default "src/mainboard/\$(MAINBOARDDIR)/cmos-csme.default" if BOARD_SYSTEM76_DARP8
-	default "src/mainboard/\$(MAINBOARDDIR)/cmos.default"
-
 config CONSOLE_POST
 	default y
 

src/mainboard/system76/adl/cmos-csme.default

@@ -1,3 +0,0 @@
-boot_option=Fallback
-debug_level=Debug
-me_state=Enable

src/mainboard/system76/adl/variants/darp8/overridetree.cb

@@ -1,6 +1,4 @@
 chip soc/intel/alderlake
-	register "s0ix_enable" = "1"
-
 	register "power_limits_config[ADL_P_282_482_28W_CORE]" = "{
 		.tdp_pl1_override = 20,
 		.tdp_pl2_override = 56,

src/mainboard/system76/rpl/Kconfig

@@ -133,10 +133,6 @@ config MAINBOARD_VERSION
 	default "oryp11" if BOARD_SYSTEM76_ORYP11
 	default "serw13" if BOARD_SYSTEM76_SERW13
 
-config CMOS_DEFAULT_FILE
-	default "src/mainboard/\$(MAINBOARDDIR)/cmos-csme.default" if BOARD_SYSTEM76_DARP9
-	default "src/mainboard/\$(MAINBOARDDIR)/cmos.default"
-
 config CONSOLE_POST
 	default y
 

src/mainboard/system76/rpl/cmos-csme.default

@@ -1,3 +0,0 @@
-boot_option=Fallback
-debug_level=Debug
-me_state=Enable

src/mainboard/system76/rpl/variants/addw3/overridetree.cb

@@ -1,6 +1,6 @@
 chip soc/intel/alderlake
-	# Support 5600 MT/s memory
+	# Support 5200 MT/s memory
-	register "max_dram_speed_mts" = "5600"
+	register "max_dram_speed_mts" = "5200"
 
 	device domain 0 on
 		subsystemid 0x1558 0xa671 inherit

src/mainboard/system76/rpl/variants/bonw15/hda_verb.c

@@ -126,7 +126,7 @@ const u32 cim_verb_data[] = {
 	0x02050028, 0x02040000, 0x02050029, 0x0204ea00,
 	0x0205002b, 0x02040047, 0x0205002c, 0x0204b423,
 	0x02050027, 0x02040010, 0x02050028, 0x02040000,
-	0x02050029, 0x0204c203, 0x0205002b, 0x02040004,
+	0x02050029, 0x0204c203, 0x0205002b, 0x02040084,
 	0x0205002c, 0x0204b423, 0x02050027, 0x02040010,
 	0x02050028, 0x02040000, 0x02050029, 0x0204c206,
 	0x0205002b, 0x02040078, 0x0205002c, 0x0204b423,

src/mainboard/system76/rpl/variants/bonw15/overridetree.cb

@@ -1,6 +1,6 @@
 chip soc/intel/alderlake
-	# Support 5600 MT/s memory
+	# Support 5200 MT/s memory
-	register "max_dram_speed_mts" = "5600"
+	register "max_dram_speed_mts" = "5200"
 
 	device domain 0 on
 		subsystemid 0x1558 0x3702 inherit

src/mainboard/system76/rpl/variants/darp9/overridetree.cb

@@ -1,6 +1,4 @@
 chip soc/intel/alderlake
-	register "s0ix_enable" = "1"
-
 	register "power_limits_config[RPL_P_682_482_282_28W_CORE]" = "{
 		.tdp_pl1_override = 20,
 		.tdp_pl2_override = 56,
@@ -16,11 +14,6 @@ chip soc/intel/alderlake
 				.clk_req = 0,
 				.flags = PCIE_RP_LTR | PCIE_RP_AER,
 			}"
-			chip soc/intel/common/block/pcie/rtd3
-				register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_F20)" # M2_SSD2_RST#
-				register "srcclk_pin" = "0" # SSD2_CLKREQ#
-				device generic 0 on end
-			end
 		end
 		device ref pcie4_1 on
 			# CPU RP#3 x4, Clock 4 (SSD1)
@@ -29,11 +22,6 @@ chip soc/intel/alderlake
 				.clk_req = 4,
 				.flags = PCIE_RP_LTR | PCIE_RP_AER,
 			}"
-			chip soc/intel/common/block/pcie/rtd3
-				register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_B16)" # M2_SSD1_RST#
-				register "srcclk_pin" = "4" # SSD1_CLKREQ#
-				device generic 0 on end
-			end
 		end
 		device ref tbt_pcie_rp0 on end
 		device ref tcss_xhci on

src/mainboard/system76/rpl/variants/lemp12/overridetree.cb

@@ -77,6 +77,7 @@ chip soc/intel/alderlake
 				.clk_src = 1,
 				.clk_req = 1,
 				.flags = PCIE_RP_LTR,
+				.pcie_rp_detect_timeout_ms = 50,
 			}"
 		end
 	end

src/mainboard/system76/rpl/variants/oryp11/hda_verb.c

@@ -126,7 +126,7 @@ const u32 cim_verb_data[] = {
 	0x02050028, 0x02040000, 0x02050029, 0x0204ea00,
 	0x0205002b, 0x02040047, 0x0205002c, 0x0204b423,
 	0x02050027, 0x02040010, 0x02050028, 0x02040000,
-	0x02050029, 0x0204c203, 0x0205002b, 0x02040004,
+	0x02050029, 0x0204c203, 0x0205002b, 0x02040084,
 	0x0205002c, 0x0204b423, 0x02050027, 0x02040010,
 	0x02050028, 0x02040000, 0x02050029, 0x0204c206,
 	0x0205002b, 0x02040078, 0x0205002c, 0x0204b423,

src/mainboard/system76/rpl/variants/serw13/overridetree.cb

@@ -1,6 +1,6 @@
 chip soc/intel/alderlake
-	# Support 5600 MT/s memory
+	# Support 5200 MT/s memory
-	register "max_dram_speed_mts" = "5600"
+	register "max_dram_speed_mts" = "5200"
 
 	device domain 0 on
 		subsystemid 0x1558 0xd502 inherit

src/mainboard/system76/tgl-u/Kconfig

@@ -3,7 +3,6 @@ if BOARD_SYSTEM76_DARP7 || BOARD_SYSTEM76_GALP5 || BOARD_SYSTEM76_LEMP10
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
 	select BOARD_ROMSIZE_KB_16384
-	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
 	select DRIVERS_GFX_NVIDIA if BOARD_SYSTEM76_GALP5