mb/system76/rpl: darp9: Add SSD RTD3 configs

Some drives block the CPU from reaching C10 on suspend without the RTD3
config.

Fixes suspend with the following drives:

- Kingston KC3000 (SKC3000D/4096G)
- Kingston HyperX (SHPM2280P2H/240G)
- Solidigm P44 Pro (SSDPFKKW010X7)

The following drives continue to work:

- Samsung 970 Evo (MZVLB250HAHQ)
- WD Black SN770 (WDS250G3X0E)
- WD Green SN350 (WDS240G2G0C-00AJM0)
- WD Blue SN570 (WDS100T3B0C)

Change-Id: I205d78377fa2b0db8d37542cdb94ba86ded1d66e
Signed-off-by: Tim Crawford <tcrawford@system76.com>
Tested-by: Levi Portenier <levi@system76.com>

src/drivers/smmstore/ramstage.c

@@ -57,18 +57,22 @@ static void init_store(void *unused)
 
 	printk(BIOS_INFO, "SMMSTORE: Setting up SMI handler\n");
 
-	/* Issue SMI using APM to update the com buffer and to lock the SMMSTORE */
-	__asm__ __volatile__ (
-		"outb %%al, %%dx"
-		: "=a" (eax)
-		: "a" ((SMMSTORE_CMD_INIT << 8) | APM_CNT_SMMSTORE),
-		  "b" (ebx),
-		  "d" (APM_CNT)
-		: "memory");
+	for (int retries = 0; retries < 3; retries++) {
+		/* Issue SMI using APM to update the com buffer and to lock the SMMSTORE */
+		__asm__ __volatile__ (
+			"outb %%al, %%dx"
+			: "=a" (eax)
+			: "a" ((SMMSTORE_CMD_INIT << 8) | APM_CNT_SMMSTORE),
+			  "b" (ebx),
+			  "d" (APM_CNT)
+			: "memory");
 
-	if (eax != SMMSTORE_RET_SUCCESS) {
-		printk(BIOS_ERR, "SMMSTORE: Failed to install com buffer\n");
-		return;
+		if (eax == SMMSTORE_RET_SUCCESS) {
+			printk(BIOS_INFO, "SMMSTORE: Installed com buffer\n");
+			break;
+		}
+
+		printk(BIOS_ERR, "SMMSTORE: Failed to install com buffer: 0x%x\n", eax);
 	}
 }
 

src/mainboard/system76/adl/Kconfig

@@ -1,6 +1,7 @@
 config BOARD_SYSTEM76_ADL_COMMON
 	def_bool n
 	select BOARD_ROMSIZE_KB_32768
+	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
 	select DRIVERS_I2C_HID
@@ -107,6 +108,10 @@ 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

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

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

@@ -1,4 +1,6 @@
 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

@@ -1,6 +1,7 @@
 config BOARD_SYSTEM76_RPL_COMMON
 	def_bool n
 	select BOARD_ROMSIZE_KB_32768
+	select DRIVERS_GENERIC_BAYHUB_LV2
 	select DRIVERS_GENERIC_CBFS_SERIAL
 	select DRIVERS_GENERIC_CBFS_UUID
 	select DRIVERS_I2C_HID
@@ -132,6 +133,10 @@ 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

@@ -0,0 +1,3 @@
+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 5200 MT/s memory
-	register "max_dram_speed_mts" = "5200"
+	# Support 5600 MT/s memory
+	register "max_dram_speed_mts" = "5600"
 
 	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, 0x02040084,
+	0x02050029, 0x0204c203, 0x0205002b, 0x02040004,
 	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 5200 MT/s memory
-	register "max_dram_speed_mts" = "5200"
+	# Support 5600 MT/s memory
+	register "max_dram_speed_mts" = "5600"
 
 	device domain 0 on
 		subsystemid 0x1558 0x3702 inherit

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

@@ -1,4 +1,6 @@
 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,
@@ -14,6 +16,11 @@ 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)
@@ -22,6 +29,11 @@ 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/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, 0x02040084,
+	0x02050029, 0x0204c203, 0x0205002b, 0x02040004,
 	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 5200 MT/s memory
-	register "max_dram_speed_mts" = "5200"
+	# Support 5600 MT/s memory
+	register "max_dram_speed_mts" = "5600"
 
 	device domain 0 on
 		subsystemid 0x1558 0xd502 inherit

src/mainboard/system76/tgl-h/Kconfig

@@ -3,6 +3,7 @@ if BOARD_SYSTEM76_GAZE16_3050 || BOARD_SYSTEM76_GAZE16_3060 || BOARD_SYSTEM76_GA
 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

src/mainboard/system76/tgl-u/Kconfig

@@ -3,6 +3,7 @@ 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

src/soc/intel/alderlake/include/soc/gpio.h

@@ -5,8 +5,13 @@
 
 #if CONFIG(SOC_INTEL_ALDERLAKE_PCH_S)
 #include <soc/gpio_defs_pch_s.h>
+#if CONFIG(SOC_INTEL_RAPTORLAKE)
+#define CROS_GPIO_NAME		"INTC1085"
+#define CROS_GPIO_DEVICE_NAME	"INTC1085:00"
+#else
 #define CROS_GPIO_NAME		"INTC1056"
 #define CROS_GPIO_DEVICE_NAME	"INTC1056:00"
+#endif
 #elif CONFIG(SOC_INTEL_ALDERLAKE_PCH_N)
 #include <soc/gpio_defs.h>
 #define CROS_GPIO_NAME		"INTC1057"

src/soc/intel/alderlake/include/soc/iomap.h

@@ -20,8 +20,14 @@
 #define PCH_TRACE_HUB_BASE_SIZE	0x00800000
 #endif
 
+/* Hack to include SBREG in PCH_RESERVED region on ADL-S/RPL-S */
+#if CONFIG(SOC_INTEL_ALDERLAKE_PCH_S)
+#define PCH_PRESERVED_BASE_ADDRESS	0xe0000000
+#define PCH_PRESERVED_BASE_SIZE		0x1e800000
+#else
 #define PCH_PRESERVED_BASE_ADDRESS	0xfc800000
 #define PCH_PRESERVED_BASE_SIZE		0x02000000
+#endif
 
 #define UART_BASE_SIZE		0x1000