B850 support part5

configs/config.msi_ms7e56

@@ -1,30 +1,37 @@
+CONFIG_LOCALVERSION="v0.9.0-rc1"
+CONFIG_OPTION_BACKEND_NONE=y
 CONFIG_VENDOR_MSI=y
+CONFIG_MAINBOARD_VERSION="1.0"
 CONFIG_ONBOARD_VGA_IS_PRIMARY=y
 CONFIG_VGA_BIOS=y
-CONFIG_PCIEXP_ASPM=y
-CONFIG_PCIEXP_L1_SUB_STATE=y
-CONFIG_PCIEXP_CLK_PM=y
+CONFIG_CONSOLE_CBMEM_BUFFER_SIZE=0x2000000
 CONFIG_EDK2_BOOT_TIMEOUT=3
 CONFIG_PCIEXP_DEFAULT_MAX_RESIZABLE_BAR_BITS=39
 CONFIG_VGA_BIOS_FILE="Phoenix_generic_vbios.bin"
 CONFIG_EDK2_BOOT_MANAGER_ESCAPE=y
 CONFIG_EDK2_FOLLOW_BGRT_SPEC=y
 CONFIG_BOARD_MSI_PRO_B850_P=y
+CONFIG_TPM_MEASURED_BOOT=y
 CONFIG_EDK2_BOOTSPLASH_FILE="3rdparty/dasharo-blobs/dasharo/bootsplash.bmp"
 CONFIG_PCIEXP_COMMON_CLOCK=y
 CONFIG_ALWAYS_ALLOW_ABOVE_4G_ALLOCATION=y
 CONFIG_SOC_AMD_COMMON_BLOCK_APOB_NV_DISABLE=y
-# CONFIG_ON_DEVICE_ROM_LOAD is not set
-CONFIG_YABEL_PCI_ACCESS_OTHER_DEVICES=y
-CONFIG_YABEL_DIRECTHW=y
+CONFIG_NO_GFX_INIT=y
 CONFIG_PCIEXP_SUPPORT_RESIZABLE_BARS=y
-CONFIG_DEFAULT_CONSOLE_LOGLEVEL_8=y
+CONFIG_DRIVERS_EFI_VARIABLE_STORE=y
+CONFIG_DRIVERS_EFI_FW_INFO=y
+CONFIG_DRIVERS_EFI_MAIN_FW_VERSION=0x00090001
+CONFIG_DRIVERS_EFI_MAIN_FW_LSV=0x00090001
+CONFIG_DRIVERS_EFI_UPDATE_CAPSULES=y
+CONFIG_TPM2=y
+# CONFIG_TPM_HASH_SHA1 is not set
+CONFIG_DEFAULT_CONSOLE_LOGLEVEL_0=y
 CONFIG_PAYLOAD_EDK2=y
-CONFIG_EDK2_TAG_OR_REV="origin/cbmem_pci_rb_info"
-CONFIG_EDK2_DEBUG=y
+CONFIG_EDK2_TAG_OR_REV="origin/dasharo"
+CONFIG_EDK2_CBMEM_LOGGING=y
 CONFIG_EDK2_LOAD_OPTION_ROMS=y
 # CONFIG_EDK2_PS2_SUPPORT is not set
-CONFIG_EDK2_CUSTOM_BUILD_PARAMS="--pcd gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask=0x07"
+CONFIG_EDK2_SERIAL_SUPPORT=y
 CONFIG_EDK2_ENABLE_IPXE=y
 CONFIG_IPXE_ADD_SCRIPT=y
 CONFIG_IPXE_SCRIPT="3rdparty/dasharo-blobs/dasharo/dasharo.ipxe"
@@ -42,17 +49,18 @@ CONFIG_EDK2_DASHARO_NETWORK_CONFIG=y
 CONFIG_EDK2_DASHARO_CHIPSET_CONFIG=y
 CONFIG_EDK2_DASHARO_POWER_CONFIG=y
 CONFIG_EDK2_DASHARO_PCI_CONFIG=y
-CONFIG_EDK2_DASHARO_NETWORK_BOOT_DEFAULT_ENABLE=y
 CONFIG_EDK2_DASHARO_SERIAL_REDIRECTION_DEFAULT_ENABLE=y
 CONFIG_EDK2_BOOT_MENU_KEY=0x0015
 CONFIG_EDK2_SETUP_MENU_KEY=0x0008
 CONFIG_EDK2_CREATE_PREINSTALLED_BOOT_OPTIONS=y
+CONFIG_EDK2_USE_UEFIVAR_BACKED_TPM_PPI=y
 CONFIG_EDK2_ENABLE_FAST_BOOT_FEATURE=y
 CONFIG_EDK2_ENABLE_QUIET_BOOT_FEATURE=y
 # CONFIG_EDK2_GRAPHICAL_CAPSULE_PROGRESS is not set
 # CONFIG_EDK2_FUM_AUTO_IPXE_BOOT is not set
+CONFIG_EDK2_CAPSULE_DOES_NOT_SURVIVE_RESET=y
+CONFIG_EDK2_SHOW_CAPSULE_REPORT=y
 CONFIG_DISPLAY_MTRRS=y
 CONFIG_OPENSIL_DEBUG_PREFIX=y
 CONFIG_OPENSIL_DEBUG_APOB=y
-# CONFIG_OPENSIL_DEBUG_FCH is not set
 # CONFIG_OPENSIL_DEBUG_XUSL_CMN is not set

payloads/external/Makefile.mk

@@ -305,8 +305,11 @@ $(obj)/UEFIPAYLOAD.fd: $(DOTCONFIG) $(IPXE_EFI)
 		CONFIG_EDK2_FW_VERSION=L"$(CONFIG_LOCALVERSION)" \
 		CONFIG_EDK2_FW_VENDOR=L"$(CONFIG_BIOS_VENDOR)" \
 		CONFIG_EDK2_FW_RELEASE_DATE=L"$(call get_build_value,COREBOOT_DMI_DATE)" \
-		CONFIG_EDK2_FW_REVISION=$(shell printf 0x"%04x%04x" $(DASHARO_MAJOR_VERSION) $(DASHARO_MINOR_VERSION))
-
+		CONFIG_EDK2_FW_REVISION=$(shell printf 0x"%04x%04x" $(DASHARO_MAJOR_VERSION) $(DASHARO_MINOR_VERSION)) \
+		CONFIG_EDK2_AMD_GOP_DRIVER=$(CONFIG_EDK2_AMD_GOP_DRIVER) \
+		CONFIG_EDK2_VGA_BIOS_VENDOR_ID=0x$(word 1,$(subst $(comma),$(spc),$(call strip_quotes,$(CONFIG_VGA_BIOS_ID)))) \
+		CONFIG_EDK2_VGA_BIOS_DEVICE_ID=0x$(word 2,$(subst $(comma),$(spc),$(call strip_quotes,$(CONFIG_VGA_BIOS_ID)))) \
+		CONFIG_VGA_BIOS_FILE=$(CONFIG_VGA_BIOS_FILE)
 
 $(obj)/ShimmedUniversalPayload.elf: $(DOTCONFIG)
 	$(MAKE) -C payloads/external/edk2 UniversalPayload \

payloads/external/edk2/Kconfig

@@ -291,9 +291,17 @@ config EDK2_GOP_DRIVER
 	help
 	  Select this option to have edk2 use an external GOP driver for display init.
 
+config EDK2_AMD_GOP_DRIVER
+	bool "Add an AMD GOP driver to the Tianocore build"
+	depends on VGA_BIOS && NO_GFX_INIT && !EDK2_REPO_OFFICIAL && !EDK2_DISABLE_OPTION_ROMS
+	default y if VGA_BIOS && NO_GFX_INIT && EDK2_REPO_MRCHROMEBOX
+	help
+	  Select this option to have edk2 use an external GOP driver for AMD display init.
+
 config EDK2_GOP_FILE
 	string "GOP driver file"
-	depends on EDK2_GOP_DRIVER
+	depends on EDK2_GOP_DRIVER || EDK2_AMD_GOP_DRIVER
+	default "AmdGopDriver.efi" if EDK2_AMD_GOP_DRIVER
 	default "IntelGopDriver.efi"
 	help
 	  The name of the GOP driver file passed to edk2.

payloads/external/edk2/Makefile

@@ -462,6 +462,12 @@ endif
 ifneq ($(CONFIG_EDK2_FUM_AUTO_IPXE_BOOT),y)
 BUILD_STR += --pcd gDasharoSystemFeaturesTokenSpaceGuid.PcdFumAutoIpxeBoot=FALSE
 endif
+# USE_AMD_PLATFORM_GOP = FALSE
+ifeq ($(CONFIG_EDK2_AMD_GOP_DRIVER),y)
+BUILD_STR += -D USE_AMD_PLATFORM_GOP=TRUE
+BUILD_STR += --pcd gDasharoPayloadPkgTokenSpaceGuid.AmdVbiosOptionRomVendorId=$(CONFIG_EDK2_VGA_BIOS_VENDOR_ID)
+BUILD_STR += --pcd gDasharoPayloadPkgTokenSpaceGuid.AmdVbiosOptionRomDeviceId=$(CONFIG_EDK2_VGA_BIOS_DEVICE_ID)
+endif
 
 BUILD_STR += --pcd gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString=$(CONFIG_EDK2_FW_VERSION)
 BUILD_STR += --pcd gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVendor=$(CONFIG_EDK2_FW_VENDOR)
@@ -560,6 +566,11 @@ gop_driver: $(EDK2_PATH)
 		cp $(top)/$(CONFIG_EDK2_GOP_FILE) $(EDK2_PATH)/$(PAYLOAD_NAME)/IntelGopDriver.efi; \
 		cp $(top)/$(CONFIG_INTEL_GMA_VBT_FILE) $(EDK2_PATH)/$(PAYLOAD_NAME)/vbt.bin; \
 	fi; \
+	if [ -n "$(CONFIG_EDK2_AMD_GOP_DRIVER)" ]; then \
+		echo "Using GOP driver $(CONFIG_EDK2_GOP_FILE)"; \
+		cp $(top)/$(CONFIG_EDK2_GOP_FILE) $(EDK2_PATH)/$(PAYLOAD_NAME)/AmdGopDriver.efi; \
+		cp $(top)/$(CONFIG_VGA_BIOS_FILE) $(EDK2_PATH)/$(PAYLOAD_NAME)/Vbios.bin; \
+	fi; \
 
 lan_rom: $(EDK2_PATH)
 	case "$(CONFIG_EDK2_LAN_ROM_DRIVER)" in \

src/acpi/acpi.c

@@ -704,8 +704,10 @@ void acpi_create_vfct(const struct device *device,
 	current = acpi_fill_vfct_func(device, vfct, current);
 
 	/* If no BIOS image, return with header->length == 0. */
-	if (!vfct->VBIOSImageOffset)
+	if (!vfct->VBIOSImageOffset) {
+		header->length = 0;
 		return;
+	}
 
 	/* (Re)calculate length and checksum. */
 	header->length = current - (unsigned long)vfct;

src/acpi/acpigen_pci_root_resource_producer.c

@@ -122,7 +122,8 @@ void pci_domain_fill_ssdt(const struct device *domain)
 	if (domain->downstream->bridge_ctrl & PCI_BRIDGE_CTL_VGA) {
 		printk(BIOS_DEBUG, "%s _CRS: adding VGA resource\n", acpi_device_name(domain));
 		acpigen_resource_producer_io(VGA_IO_BASE, VGA_IO_LIMIT);
-		acpigen_resource_producer_mmio(VGA_MMIO_BASE, VGA_MMIO_LIMIT,
+		/* Report VGA MMIO + extra 128K for VGA OptionROM in legacy C segment */
+		acpigen_resource_producer_mmio(VGA_MMIO_BASE, VGA_MMIO_LIMIT + 0x20000,
 			MEM_RSRC_FLAG_MEM_READ_WRITE | MEM_RSRC_FLAG_MEM_ATTR_CACHE);
 	}
 

src/drivers/amd/promontory21/Kconfig

@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+config DRIVERS_AMD_PROMONTORY21
+	bool
+	help
+	  Enable AMD Promontory21 chip driver.

src/drivers/amd/promontory21/Makefile.mk

@@ -0,0 +1,3 @@
+## SPDX-License-Identifier: GPL-2.0-only
+
+ramstage-$(CONFIG_DRIVERS_AMD_PROMONTORY21) += chip.c

src/drivers/amd/promontory21/acpi/prom21_gpio.asl

@@ -0,0 +1,198 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+Scope (\_SB)
+{
+	Name (TGPI, 0x0F)
+	Device (PTIO)
+	{
+		Name (_HID, "AMDIF031")
+		Name (_CID, "AMDIF031")
+		Name (_UID, 0)
+		Method (_CRS, 0, NotSerialized)
+		{
+			Name (RBUF, ResourceTemplate ()
+			{
+				Memory32Fixed (ReadWrite,
+					0xFEC40000,
+					0x00001000,
+					)
+			})
+			Return (RBUF)
+		}
+
+		Method (_STA, 0, NotSerialized)
+		{
+			Return (0x0F)
+		}
+	}
+
+	Device (ASMT)
+	{
+		Name (_HID, "ASMT0001")
+		Name (_CID, "ASMT0001")
+		Name (_UID, 0)
+		Method (_CRS, 0, NotSerialized)
+		{
+			Name (RBUF, ResourceTemplate ()
+			{
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x0000
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x0001
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x0002
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x0003
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x0004
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x0005
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x0006
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x0007
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x0008
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x0009
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x000A
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x000B
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x000C
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x000D
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x000E
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x000F
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x0010
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x0011
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x0012
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x0013
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x0014
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x0015
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x0016
+					}
+				GpioIo (Exclusive, PullUp, 0x0000, 0x0000, IoRestrictionNone,
+					"\\_SB.PTIO", 0x00, ResourceConsumer, ,
+					RawDataBuffer (0x01) { 0x01 })
+					{
+						0x0017
+					}
+			})
+			Return (RBUF)
+		}
+
+		Method (_STA, 0, NotSerialized)
+		{
+			If ((TGPI == One))
+			{
+				Return (0x0F)
+			}
+			Else
+			{
+				Return (Zero)
+			}
+		}
+	}
+}