Merge pull request #187 from coreboot/main

[pull] main from coreboot:main

src/include/spi_flash.h

@@ -12,6 +12,10 @@
 #define SPI_OPCODE_WREN 0x06
 #define SPI_OPCODE_FAST_READ 0x0b
 
+/* SPI RPMC field lengths in bytes */
+#define SPI_RPMC_TAG_LEN		12
+#define SPI_RPMC_SIG_LEN		32
+
 struct spi_flash;
 
 /*

src/mainboard/starlabs/byte_adl/variants/mk_ii/devicetree.cb

@@ -1,6 +1,5 @@
 chip soc/intel/alderlake
 	# FSP UPDs
-	register "enable_c6dram"		= "true"
 	register "eist_enable"			= "true"
 	register "cnvi_bt_audio_offload"	= "true"
 	register "cnvi_bt_core"			= "true"
@@ -75,7 +74,7 @@ chip soc/intel/alderlake
 						device ref usb2_port2 on end
 					end
 					chip drivers/usb/acpi
-						register "desc"		= ""Back Top USB Type-C""
+						register "desc"		= ""Back Top USB Type-A""
 						register "type"		= "UPC_TYPE_USB3_A"
 						device ref usb3_port3 on end
 					end
@@ -85,7 +84,7 @@ chip soc/intel/alderlake
 						device ref usb2_port3 on end
 					end
 					chip drivers/usb/acpi
-						register "desc"		= ""Back Bottom USB Type-C""
+						register "desc"		= ""Back Bottom USB Type-A""
 						register "type"		= "UPC_TYPE_USB3_A"
 						device ref usb3_port4 on end
 					end
@@ -95,7 +94,7 @@ chip soc/intel/alderlake
 						device ref usb2_port6 on end
 					end
 					chip drivers/usb/acpi
-						register "desc"		= ""Front Left USB Type-C""
+						register "desc"		= ""Front Left USB Type-A""
 						register "type"		= "UPC_TYPE_USB3_A"
 						device ref usb3_port2 on end
 					end
@@ -105,7 +104,7 @@ chip soc/intel/alderlake
 						device ref usb2_port7 on end
 					end
 					chip drivers/usb/acpi
-						register "desc"		= ""Front Right USB Type-C""
+						register "desc"		= ""Front Right USB Type-A""
 						register "type"		= "UPC_TYPE_USB3_A"
 						device ref usb3_port1 on end
 					end

src/mainboard/starlabs/starbook/cmos.default

@@ -15,6 +15,8 @@ webcam=Enable
 microphone=Enable
 legacy_8254_timer=Disable
 pci_hot_plug=Disable
+fingerprint_reader=Enable
+card_reader=Enable
 # EC
 kbl_timeout=30 seconds
 fn_ctrl_swap=Disable

src/mainboard/starlabs/starbook/cmos.layout

@@ -32,6 +32,8 @@ entries
 520	1	e	1	microphone
 528	1	e	1	legacy_8254_timer
 536	1	e	1	pci_hot_plug
+542	1	e	1	fingerprint_reader
+550	1	e	1	card_reader
 
 # coreboot config options: EC
 600	3	e	4	kbl_timeout

src/mainboard/starlabs/starbook/variants/adl/devicetree.cb

@@ -1,7 +1,6 @@
 chip soc/intel/alderlake
 	# FSP UPDs
 	register "eist_enable"			= "true"
-	register "enable_c6dram"		= "1"
 	register "sagv"				= "SaGv_Enabled"
 
 	# Serial I/O

src/mainboard/starlabs/starbook/variants/adl/devtree.c

@@ -54,4 +54,12 @@ void devtree_update(void)
 	/* Enable/Disable Webcam based on CMOS settings */
 	if (get_uint_option("webcam", 1) == 0)
 		cfg->usb2_ports[CONFIG_CCD_PORT].enable = 0;
+
+	/* Enable/Disable Fingerprint Reader based on CMOS Settings */
+	if (get_uint_option("fingerprint_reader", 1) == 0)
+		cfg->usb2_ports[5].enable = 0;
+
+	/* Enable/Disable Card Reader based on CMOS Settings */
+	if (get_uint_option("card_reader", 1) == 0)
+		cfg->usb2_ports[3].enable = 0;
 }

src/mainboard/starlabs/starbook/variants/cml/devicetree.cb

@@ -1,7 +1,6 @@
 chip soc/intel/cannonlake
 	# FSP UPDs
 	register "eist_enable"			= "true"
-	register "enable_c6dram"		= "1"
 	register "SaGv"				= "SaGv_Enabled"
 
 	# Graphics

src/mainboard/starlabs/starbook/variants/cml/devtree.c

@@ -42,4 +42,8 @@ void devtree_update(void)
 
 	/* Enable/Disable Webcam based on CMOS settings */
 	cfg->usb2_ports[CONFIG_CCD_PORT].enable = get_uint_option("webcam", 1);
+
+	/* Enable/Disable Card Reader based on CMOS Settings */
+	if (get_uint_option("card_reader", 1) == 0)
+		cfg->usb2_ports[3].enable = 0;
 }

src/mainboard/starlabs/starbook/variants/kbl/devtree.c

@@ -42,4 +42,8 @@ void devtree_update(void)
 
 	/* Enable/Disable Webcam based on CMOS settings */
 	cfg->usb2_ports[CONFIG_CCD_PORT].enable = get_uint_option("webcam", 1);
+
+	/* Enable/Disable Card Reader based on CMOS Settings */
+	if (get_uint_option("card_reader", 1) == 0)
+		cfg->usb2_ports[6].enable = 0;
 }

src/mainboard/starlabs/starbook/variants/rpl/devicetree.cb

@@ -3,7 +3,6 @@ chip soc/intel/alderlake
 	register "disable_dynamic_tccold_handshake"	= "true"
 	register "eist_enable"				= "true"
 	register "enable_c1e"				= "true"
-	register "enable_c6dram"			= "true"
 	register "sagv"					= "SaGv_Enabled"
 
 	# Serial I/O

src/mainboard/starlabs/starbook/variants/rpl/devtree.c

@@ -58,6 +58,14 @@ void devtree_update(void)
 	if (get_uint_option("webcam", 1) == 0)
 		cfg->usb2_ports[CONFIG_CCD_PORT].enable = 0;
 
+	/* Enable/Disable Fingerprint Reader based on CMOS Settings */
+	if (get_uint_option("fingerprint_reader", 1) == 0)
+		cfg->usb2_ports[5].enable = 0;
+
+	/* Enable/Disable Card Reader based on CMOS Settings */
+	if (get_uint_option("card_reader", 1) == 0)
+		cfg->usb2_ports[3].enable = 0;
+
 	/* Enable/Disable Thunderbolt based on CMOS settings */
 	if (get_uint_option("thunderbolt", 1) == 0) {
 		tbt_pci_dev->enabled = 0;

src/mainboard/starlabs/starbook/variants/tgl/devicetree.cb

@@ -1,7 +1,6 @@
 chip soc/intel/tigerlake
 	# FSP UPDs
 	register "eist_enable"			= "true"
-	register "enable_c6dram"		= "1"
 	register "CnviBtCore"			= "true"
 	register "CnviBtAudioOffload"		= "1"
 	register "SaGv"				= "SaGv_Enabled"

src/mainboard/starlabs/starbook/variants/tgl/devtree.c

@@ -56,6 +56,10 @@ void devtree_update(void)
 	/* Enable/Disable Webcam based on CMOS settings */
 	cfg->usb2_ports[CONFIG_CCD_PORT].enable = get_uint_option("webcam", 1);
 
+	/* Enable/Disable Card Reader based on CMOS Settings */
+	if (get_uint_option("card_reader", 1) == 0)
+		cfg->usb2_ports[5].enable = 0;
+
 	/* Enable/Disable Thunderbolt based on CMOS settings */
 	if (get_uint_option("thunderbolt", 1) == 0) {
 		cfg->UsbTcPortEn = 0;

src/mainboard/starlabs/starlite_adl/variants/mk_v/devicetree.cb

@@ -9,7 +9,6 @@ chip soc/intel/alderlake
 	}"
 
 	# FSP Memory
-	register "enable_c6dram"		= "1"
 	register "sagv"				= "SaGv_Enabled"
 
 	# FSP Silicon
@@ -73,46 +72,53 @@ chip soc/intel/alderlake
 					chip drivers/usb/acpi
 						register "desc"		= ""Top USB Type-C""
 						register "type"		= "UPC_TYPE_C_USB2_SS_SWITCH"
+						register "group"	= "ACPI_PLD_GROUP(0, 0)"
 						device ref usb2_port1 on end
 					end
 					chip drivers/usb/acpi
 						register "desc"		= ""Top USB Type-C""
 						register "type"		= "UPC_TYPE_C_USB2_SS_SWITCH"
+						register "group"	= "ACPI_PLD_GROUP(0, 0)"
 						device ref usb3_port3 on end
 					end
 					chip drivers/usb/acpi
 						register "desc"		= ""Bottom USB Type-C""
 						register "type"		= "UPC_TYPE_C_USB2_SS_SWITCH"
+						register "group"	= "ACPI_PLD_GROUP(0, 1)"
 						device ref usb2_port2 on end
 					end
 					chip drivers/usb/acpi
 						register "desc"		= ""Bottom USB Type-C""
 						register "type"		= "UPC_TYPE_C_USB2_SS_SWITCH"
+						register "group"	= "ACPI_PLD_GROUP(0, 1)"
 						device ref usb3_port1 on end
 					end
 					chip drivers/usb/acpi
-						register "desc"		= ""Detachable Keyboard""
-						register "type"		= "UPC_TYPE_INTERNAL"
+						register "desc"		= ""USB 2.0 Hub""
+						register "type"		= "UPC_TYPE_HUB"
+						register "group"	= "ACPI_PLD_GROUP(0, 2)"
 						device ref usb2_port3 on end
 					end
 					chip drivers/usb/acpi
 						register "desc"		= ""Internal Webcam""
 						register "type"		= "UPC_TYPE_INTERNAL"
+						register "group"	= "ACPI_PLD_GROUP(0, 3)"
 						device ref usb2_port5 on end
 					end
 					chip drivers/usb/acpi
 						register "desc"		= ""Camera""
 						register "type"		= "UPC_TYPE_INTERNAL"
+						register "group"	= "ACPI_PLD_GROUP(0, 4)"
 						device ref usb2_port6 on end
 					end
 					chip drivers/usb/acpi
 						register "desc"		= ""CNVi Bluetooth""
 						register "type"		= "UPC_TYPE_INTERNAL"
 						register "reset_gpio"	= "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A13)"
+						register "group"	= "ACPI_PLD_GROUP(0, 5)"
 						device ref usb2_port10 on end
 					end
 				end
-
 			end
 		end
 		device ref shared_sram	on  end
@@ -141,8 +147,10 @@ chip soc/intel/alderlake
 				register "generic.hid"			= ""GXTP7386""
 				register "generic.cid"			= ""GXTP7386""
 				register "generic.desc"			= ""Touchscreen""
-				register "generic.irq_gpio"		= "ACPI_GPIO_IRQ_LEVEL_LOW(GPP_F18)"
+				register "generic.irq"			= "ACPI_IRQ_LEVEL_LOW(GPP_F18_IRQ)"
 				register "generic.reset_gpio"		= "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_F17)"
+				register "generic.reset_delay_ms"	= "10"
+				register "generic.has_power_resource"	= "1"
 				register "hid_desc_reg_offset"		= "0x01"
 				device i2c 5d on end
 			end

src/mainboard/starlabs/starlite_adl/variants/mk_v/gpio.c

@@ -8,26 +8,6 @@ const struct pad_config early_gpio_table[] = {
 	PAD_CFG_NF(GPP_H10, NONE, DEEP, NF2),
 	/* H11:		UART0 TXD		Debug Connector		*/
 	PAD_CFG_NF(GPP_H11, NONE, DEEP, NF2),
-
-	/* F0:		CNV BRI Data					*/
-	PAD_CFG_NF(GPP_F0, NONE, DEEP, NF1),
-	/* F1:		CNV BRI Response				*/
-	PAD_CFG_NF(GPP_F1, UP_20K, DEEP, NF1),
-	/* F2:		CNV RGI Data					*/
-	PAD_CFG_NF(GPP_F2, NONE, DEEP, NF1),
-	/* F3:		CNV RGI Response				*/
-	PAD_CFG_NF(GPP_F3, UP_20K, DEEP, NF1),
-	/* F4:		CNV RF Reset					*/
-	PAD_CFG_NF(GPP_F4, NONE, DEEP, NF1),
-	/* F5:		Not used		MODEM_CLKREQ		*/
-	PAD_CFG_NF(GPP_F5, NONE, DEEP, NF2),
-	/* F6:		CNV PA Blanking					*/
-	PAD_NC(GPP_F6, NONE),
-
-	/* A13:		BlueTooth RF Kill				*/
-	PAD_CFG_GPO(GPP_A13, 1, DEEP),
-	/* E3:		WiFi RF Kill					*/
-	PAD_CFG_GPO(GPP_E3, 1, DEEP),
 };
 
 const struct pad_config *variant_early_gpio_table(size_t *num)
@@ -82,6 +62,8 @@ const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_A11, NONE),
 	/* A12:		PCH M.2 SSD PEDET				*/
 	PAD_CFG_NF(GPP_A12, NONE, DEEP, NF1),
+	/* A13:		BlueTooth RF Kill				*/
+	PAD_CFG_GPO(GPP_A13, 1, DEEP),
 	/* A14:		Camera Power Enable				*/
 	PAD_NC(GPP_A14, NONE),
 	/* A15:		Camera Reset					*/
@@ -109,8 +91,7 @@ const struct pad_config gpio_table[] = {
 	/* B1:		Core Vendor ID 1				*/
 	PAD_CFG_NF(GPP_B1, NONE, DEEP, NF1),
 	/* B2:		BC PROCHOT					*/
-	// PAD_CFG_GPI_SCI(GPP_B2, NONE, PLTRST, EDGE_SINGLE, INVERT),
-	_PAD_CFG_STRUCT(GPP_B2, PAD_FUNC(NF1) | PAD_RESET(DEEP) | PAD_TRIG(OFF) | PAD_BUF(TX_RX_DISABLE) | (1 << 1), PAD_IOSSTATE(IGNORE)),
+	PAD_CFG_GPI_SCI(GPP_B2, NONE, PLTRST, EDGE_SINGLE, INVERT),
 	/* B3:		Not Connected					*/
 	PAD_NC(GPP_B3, NONE),
 	/* B4:		Not Connected					*/
@@ -260,6 +241,8 @@ const struct pad_config gpio_table[] = {
 	PAD_NC(GPP_E1, NONE),
 	/* E2:		Not Connected					*/
 	PAD_NC(GPP_E2, NONE),
+	/* E3:		WiFi RF Kill					*/
+	PAD_CFG_GPO(GPP_E3, 1, DEEP),
 	/* E4:		P Offset					*/
 	PAD_NC(GPP_E4, NONE),
 	/* E5:		P Out						*/
@@ -303,6 +286,20 @@ const struct pad_config gpio_table[] = {
 	/* E23:		Not Connected					*/
 	PAD_NC(GPP_E23, NONE),
 
+	/* F0:		CNV BRI Data					*/
+	PAD_CFG_NF(GPP_F0, NONE, DEEP, NF1),
+	/* F1:		CNV BRI Response				*/
+	PAD_CFG_NF(GPP_F1, UP_20K, DEEP, NF1),
+	/* F2:		CNV RGI Data					*/
+	PAD_CFG_NF(GPP_F2, NONE, DEEP, NF1),
+	/* F3:		CNV RGI Response				*/
+	PAD_CFG_NF(GPP_F3, UP_20K, DEEP, NF1),
+	/* F4:		CNV RF Reset					*/
+	PAD_CFG_NF(GPP_F4, NONE, DEEP, NF1),
+	/* F5:		Not used		MODEM_CLKREQ		*/
+	PAD_CFG_NF(GPP_F5, NONE, DEEP, NF2),
+	/* F6:		CNV PA Blanking					*/
+	PAD_NC(GPP_F6, NONE),
 	/* F7:		TBT LSX VCCIO		Weak Internal PD 20K
 				Low:	1.8V
 				High:	3.3V				*/
@@ -326,9 +323,9 @@ const struct pad_config gpio_table[] = {
 	/* F16:		Not Connected					*/
 	PAD_NC(GPP_F16, NONE),
 	/* F17:		Touch Panel Reset				*/
-	PAD_CFG_GPO(GPP_F17, 1, PLTRST),
+	PAD_CFG_GPO(GPP_F17, 1, DEEP),
 	/* F18:		Touch Panel Interrupt				*/
-	PAD_CFG_GPI_GPIO_DRIVER(GPP_F18, NONE, DEEP),
+	PAD_CFG_GPI_APIC(GPP_F18, NONE, PLTRST, LEVEL, INVERT),
 	/* F19:		Not Connected					*/
 	PAD_NC(GPP_F19, NONE),
 	/* F20:		Not Connected					*/