From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mx.groups.io with SMTP id smtpd.web11.44212.1624262981342466441 for ; Mon, 21 Jun 2021 01:09:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@9elements.com header.s=google header.b=QsJb9o+x; spf=pass (domain: 9elements.com, ip: 209.85.128.49, mailfrom: patrick.rudolph@9elements.com) Received: by mail-wm1-f49.google.com with SMTP id p10-20020a05600c430ab02901df57d735f7so1026669wme.3 for ; Mon, 21 Jun 2021 01:09:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=9elements.com; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jiyVsLbGgkIo/nEymhBNjMa9Al377eaDFFCbIYDWCrg=; b=QsJb9o+xVtLlKrWiZZPrQ846duP9uAXUXQIR9zr/xXDGoEGG5Wnh0ddputBWEBN6dV xR5XfXWGFcRIelPwvDiHR8pX63RTAZO6i/T0llhh7wmVa2DoLrP+dyN7kazuQ5euCL7D 0GKAdtYaHu+JGadpZy5h7393OF1K+aRoed890Apw2+awfOJUwscIey0uWAdYwG7G1C9F R5h3EeccAzXKNgPirzo7fU+8Z33J+fQz1ZrOUg0pL9e3nVAWF6H3DczJ3eLXEO20fo6c Od5IE0cBWYZjK/eOdLJ8tmSCim98VXafrzG6CWDWRs1FaRmy+mCu9ucNS53qNLqahKL4 QPpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=jiyVsLbGgkIo/nEymhBNjMa9Al377eaDFFCbIYDWCrg=; b=iUe1FnAMRN3d7AXwDi3V5EhJGghqtidX09VFz8zZkfYz1TNym7ZByOus4YQshoqhSY rvHWr/VlSXg35TO9bhRdmybdlKfxiDAApdzfmJL8hM4nyG75Lu07+OXDk82I6MzAd3CF zWxtgyV8qsrdrggS4VcSAJ6/doT7VpSnISAtescpSPyPEchxcePqUvxBTavTjbyLsZjx 9Et6jBeIBhJ837tRPzM7hLRUutNyghFddRQw8f7IuWYeyD/uqbD/9N6vDkmhz3W7LJaK 0pUmz8S8lB8Z5NysKb+BdyKfme1t/GguX9kbX0oJ4uzu6pQzkyFYYQUfYvq029M8TrFi z6gQ== X-Gm-Message-State: AOAM5316ZAfuyUUO+5slIMu56davx7ltfPSoWimZ3ByjDwtGTXigiPQp +wAFuTN8o8JUZUxVmnxWpUYwkzz8IMoTtcDj X-Google-Smtp-Source: ABdhPJxEd5c2LsUUeg2HdrMG0GpVeb1Ky3ZgFDTcKzsLSx2spg7pfwkSWSAlV4MeMgS6ozVvv4QVYA== X-Received: by 2002:a05:600c:3b11:: with SMTP id m17mr26057371wms.150.1624262979785; Mon, 21 Jun 2021 01:09:39 -0700 (PDT) Return-Path: Received: from rudolphp-notebook.9e.network (b2b-78-94-0-50.unitymedia.biz. [78.94.0.50]) by smtp.gmail.com with ESMTPSA id v8sm17809250wrc.29.2021.06.21.01.09.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Jun 2021 01:09:39 -0700 (PDT) From: "Patrick Rudolph" To: devel@edk2.groups.io Cc: maurice.ma@intel.com, guo.dong@intel.com, benjamin.you@intel.com Subject: [PATCH v3] UefiPayloadPkg/UefiPayloadEntry: Improve bootloader memrange parsing Date: Mon, 21 Jun 2021 10:09:37 +0200 Message-Id: <20210621080937.76468-1-patrick.rudolph@9elements.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Currently several DXE crash due to invalid memory resource settings. The PciHostBridgeDxe which expects the MMCONF and PCI Aperature to be EfiMemoryMappedIO, but currently those regions are (partly) mapped as EfiReservedMemoryType. coreboot and slimbootloader provide an e820 compatible memory map, which doesn't work well with EDK2 as the e820 spec is missing MMIO regions. In e820 'reserved' could either mean "DRAM used by boot firmware" or "MMIO in use and not detectable by OS". Guess Top of lower usable DRAM (TOLUD) by walking the bootloader provided memory ranges. Memory types of RAM, ACPI and ACPI NVS below 4 GiB are used to increment TOLUD and reserved memory ranges touching TOLUD at the base are also assumed to be reserved DRAM, which increment TOLUD. Then mark everything reserved below TOLUD as EfiReservedMemoryType and everything reserved above TOLUD as EfiMemoryMappedIO. This fixes assertions seen in PciHostBridgeDxe. Signed-off-by: Patrick Rudolph --- .../UefiPayloadEntry/UefiPayloadEntry.c | 190 +++++++++++++++++- .../UefiPayloadEntry/UefiPayloadEntry.h | 10 + 2 files changed, 197 insertions(+), 3 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c b/UefiPaylo= adPkg/UefiPayloadEntry/UefiPayloadEntry.c index 805f5448d9..04c58f776c 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c +++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c @@ -7,10 +7,159 @@ =0D #include "UefiPayloadEntry.h"=0D =0D +STATIC UINT32 mTopOfLowerUsableDram =3D 0;=0D +=0D /**=0D Callback function to build resource descriptor HOB=0D =0D This function build a HOB based on the memory map entry info.=0D + It creates only EFI_RESOURCE_MEMORY_MAPPED_IO and EFI_RESOURCE_MEMORY_R= ESERVED=0D + resources.=0D +=0D + @param MemoryMapEntry Memory map entry info got from bootloader= .=0D + @param Params A pointer to ACPI_BOARD_INFO.=0D +=0D + @retval EFI_SUCCESS Successfully build a HOB.=0D + @retval EFI_INVALID_PARAMETER Invalid parameter provided.=0D +**/=0D +EFI_STATUS=0D +MemInfoCallbackMmio (=0D + IN MEMROY_MAP_ENTRY *MemoryMapEntry,=0D + IN VOID *Params=0D + )=0D +{=0D + EFI_PHYSICAL_ADDRESS Base;=0D + EFI_RESOURCE_TYPE Type;=0D + UINT64 Size;=0D + EFI_RESOURCE_ATTRIBUTE_TYPE Attribue;=0D + ACPI_BOARD_INFO *AcpiBoardInfo;=0D +=0D + AcpiBoardInfo =3D (ACPI_BOARD_INFO *)Params;=0D + if (AcpiBoardInfo =3D=3D NULL) {=0D + return EFI_INVALID_PARAMETER;=0D + }=0D +=0D + //=0D + // Skip types already handled in MemInfoCallback=0D + //=0D + if (MemoryMapEntry->Type =3D=3D E820_RAM || MemoryMapEntry->Type =3D=3D = E820_ACPI) {=0D + return EFI_SUCCESS;=0D + }=0D +=0D + if (MemoryMapEntry->Base =3D=3D AcpiBoardInfo->PcieBaseAddress) {=0D + //=0D + // MMCONF is always MMIO=0D + //=0D + Type =3D EFI_RESOURCE_MEMORY_MAPPED_IO;=0D + } else if (MemoryMapEntry->Base < mTopOfLowerUsableDram) {=0D + //=0D + // It's in DRAM and thus must be reserved=0D + //=0D + Type =3D EFI_RESOURCE_MEMORY_RESERVED;=0D + } else if ((MemoryMapEntry->Base < 0x100000000ULL) && (MemoryMapEntry->B= ase >=3D mTopOfLowerUsableDram)) {=0D + //=0D + // It's not in DRAM, must be MMIO=0D + //=0D + Type =3D EFI_RESOURCE_MEMORY_MAPPED_IO;=0D + } else {=0D + Type =3D EFI_RESOURCE_MEMORY_RESERVED;=0D + }=0D +=0D + Base =3D MemoryMapEntry->Base;=0D + Size =3D MemoryMapEntry->Size;=0D +=0D + Attribue =3D EFI_RESOURCE_ATTRIBUTE_PRESENT |=0D + EFI_RESOURCE_ATTRIBUTE_INITIALIZED |=0D + EFI_RESOURCE_ATTRIBUTE_TESTED |=0D + EFI_RESOURCE_ATTRIBUTE_UNCACHEABLE |=0D + EFI_RESOURCE_ATTRIBUTE_WRITE_COMBINEABLE |=0D + EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |=0D + EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE;=0D +=0D + BuildResourceDescriptorHob (Type, Attribue, (EFI_PHYSICAL_ADDRESS)Base, = Size);=0D + DEBUG ((DEBUG_INFO , "buildhob: base =3D 0x%lx, size =3D 0x%lx, type =3D= 0x%x\n", Base, Size, Type));=0D +=0D + if (MemoryMapEntry->Type =3D=3D E820_UNUSABLE ||=0D + MemoryMapEntry->Type =3D=3D E820_DISABLED) {=0D + BuildMemoryAllocationHob (Base, Size, EfiUnusableMemory);=0D + } else if (MemoryMapEntry->Type =3D=3D E820_PMEM) {=0D + BuildMemoryAllocationHob (Base, Size, EfiPersistentMemory);=0D + }=0D +=0D + return EFI_SUCCESS;=0D +}=0D +=0D +=0D +/**=0D + Callback function to find TOLUD (Top of Lower Usable DRAM)=0D +=0D + Estimate where TOLUD (Top of Lower Usable DRAM) resides. The exact posi= tion=0D + would require platform specific code.=0D +=0D + @param MemoryMapEntry Memory map entry info got from bootloader= .=0D + @param Params Not used for now.=0D +=0D + @retval EFI_SUCCESS Successfully updated mTopOfLowerUsableDra= m.=0D +**/=0D +EFI_STATUS=0D +FindToludCallback (=0D + IN MEMROY_MAP_ENTRY *MemoryMapEntry,=0D + IN VOID *Params=0D + )=0D +{=0D + //=0D + // This code assumes that the memory map on this x86 machine below 4GiB = is continous=0D + // until TOLUD. In addition it assumes that the bootloader provided memo= ry tables have=0D + // no "holes" and thus the first memory range not covered by e820 marks = the end of=0D + // usable DRAM. In addition it's assumed that every reserved memory regi= on touching=0D + // usable RAM is also covering DRAM, everything else that is marked rese= rved thus must be=0D + // MMIO not detectable by bootloader/OS=0D + //=0D +=0D + //=0D + // Skip memory types not RAM or reserved=0D + //=0D + if ((MemoryMapEntry->Type =3D=3D E820_UNUSABLE) || (MemoryMapEntry->Type= =3D=3D E820_DISABLED) ||=0D + (MemoryMapEntry->Type =3D=3D E820_PMEM)) {=0D + return EFI_SUCCESS;=0D + }=0D +=0D + //=0D + // Skip resources above 4GiB=0D + //=0D + if ((MemoryMapEntry->Base + MemoryMapEntry->Size) > 0x100000000ULL) {=0D + return EFI_SUCCESS;=0D + }=0D +=0D + if ((MemoryMapEntry->Type =3D=3D E820_RAM) || (MemoryMapEntry->Type =3D= =3D E820_ACPI) ||=0D + (MemoryMapEntry->Type =3D=3D E820_NVS)) {=0D + //=0D + // It's usable DRAM. Update TOLUD.=0D + //=0D + if (mTopOfLowerUsableDram < (MemoryMapEntry->Base + MemoryMapEntry->Si= ze)) {=0D + mTopOfLowerUsableDram =3D (UINT32)(MemoryMapEntry->Base + MemoryMapE= ntry->Size);=0D + }=0D + } else {=0D + //=0D + // It might be 'reserved DRAM' or 'MMIO'.=0D + //=0D + // If it touches usable DRAM at Base assume it's DRAM as well,=0D + // as it could be bootloader installed tables, TSEG, GTT, ...=0D + //=0D + if (mTopOfLowerUsableDram =3D=3D MemoryMapEntry->Base) {=0D + mTopOfLowerUsableDram =3D (UINT32)(MemoryMapEntry->Base + MemoryMapE= ntry->Size);=0D + }=0D + }=0D +=0D + return EFI_SUCCESS;=0D +}=0D +=0D +=0D +/**=0D + Callback function to build resource descriptor HOB=0D +=0D + This function build a HOB based on the memory map entry info.=0D + Only add EFI_RESOURCE_SYSTEM_MEMORY.=0D =0D @param MemoryMapEntry Memory map entry info got from bootloader= .=0D @param Params Not used for now.=0D @@ -28,7 +177,16 @@ MemInfoCallback ( UINT64 Size;=0D EFI_RESOURCE_ATTRIBUTE_TYPE Attribue;=0D =0D - Type =3D (MemoryMapEntry->Type =3D=3D 1) ? EFI_RESOURCE_SYSTEM_MEMORY= : EFI_RESOURCE_MEMORY_RESERVED;=0D + //=0D + // Skip everything not known to be usable DRAM.=0D + // It will be added later.=0D + //=0D + if ((MemoryMapEntry->Type !=3D E820_RAM) && (MemoryMapEntry->Type !=3D E= 820_ACPI) &&=0D + (MemoryMapEntry->Type !=3D E820_NVS)) {=0D + return RETURN_SUCCESS;=0D + }=0D +=0D + Type =3D EFI_RESOURCE_SYSTEM_MEMORY;=0D Base =3D MemoryMapEntry->Base;=0D Size =3D MemoryMapEntry->Size;=0D =0D @@ -40,7 +198,7 @@ MemInfoCallback ( EFI_RESOURCE_ATTRIBUTE_WRITE_THROUGH_CACHEABLE |=0D EFI_RESOURCE_ATTRIBUTE_WRITE_BACK_CACHEABLE;=0D =0D - if (Base >=3D BASE_4GB ) {=0D + if (Base >=3D BASE_4GB) {=0D // Remove tested attribute to avoid DXE core to dispatch driver to mem= ory above 4GB=0D Attribue &=3D ~EFI_RESOURCE_ATTRIBUTE_TESTED;=0D }=0D @@ -48,6 +206,12 @@ MemInfoCallback ( BuildResourceDescriptorHob (Type, Attribue, (EFI_PHYSICAL_ADDRESS)Base, = Size);=0D DEBUG ((DEBUG_INFO , "buildhob: base =3D 0x%lx, size =3D 0x%lx, type =3D= 0x%x\n", Base, Size, Type));=0D =0D + if (MemoryMapEntry->Type =3D=3D E820_ACPI) {=0D + BuildMemoryAllocationHob (Base, Size, EfiACPIReclaimMemory);=0D + } else if (MemoryMapEntry->Type =3D=3D E820_NVS) {=0D + BuildMemoryAllocationHob (Base, Size, EfiACPIMemoryNVS);=0D + }=0D +=0D return RETURN_SUCCESS;=0D }=0D =0D @@ -236,8 +400,19 @@ BuildHobFromBl ( EFI_PEI_GRAPHICS_DEVICE_INFO_HOB *NewGfxDeviceInfo;=0D =0D //=0D - // Parse memory info and build memory HOBs=0D + // First find TOLUD=0D + //=0D + DEBUG ((DEBUG_INFO , "Guessing Top of Lower Usable DRAM:\n"));=0D + Status =3D ParseMemoryInfo (FindToludCallback, NULL);=0D + if (EFI_ERROR(Status)) {=0D + return Status;=0D + }=0D + DEBUG ((DEBUG_INFO , "Assuming TOLUD =3D 0x%x\n", mTopOfLowerUsableDram)= );=0D +=0D + //=0D + // Parse memory info and build memory HOBs for Usable RAM=0D //=0D + DEBUG ((DEBUG_INFO , "Building ResourceDescriptorHobs for usable memory:= \n"));=0D Status =3D ParseMemoryInfo (MemInfoCallback, NULL);=0D if (EFI_ERROR(Status)) {=0D return Status;=0D @@ -289,6 +464,15 @@ BuildHobFromBl ( DEBUG ((DEBUG_INFO, "Create acpi board info guid hob\n"));=0D }=0D =0D + //=0D + // Parse memory info and build memory HOBs for reserved DRAM and MMIO=0D + //=0D + DEBUG ((DEBUG_INFO , "Building ResourceDescriptorHobs for reserved memor= y:\n"));=0D + Status =3D ParseMemoryInfo (MemInfoCallbackMmio, &AcpiBoardInfo);=0D + if (EFI_ERROR(Status)) {=0D + return Status;=0D + }=0D +=0D //=0D // Parse platform specific information.=0D //=0D diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h b/UefiPaylo= adPkg/UefiPayloadEntry/UefiPayloadEntry.h index 2c84d6ed53..4fd50e47cd 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h +++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h @@ -38,6 +38,16 @@ #define GET_OCCUPIED_SIZE(ActualSize, Alignment) \=0D ((ActualSize) + (((Alignment) - ((ActualSize) & ((Alignment) - 1))) & ((= Alignment) - 1)))=0D =0D +=0D +#define E820_RAM 1=0D +#define E820_RESERVED 2=0D +#define E820_ACPI 3=0D +#define E820_NVS 4=0D +#define E820_UNUSABLE 5=0D +#define E820_DISABLED 6=0D +#define E820_PMEM 7=0D +#define E820_UNDEFINED 8=0D +=0D /**=0D Auto-generated function that calls the library constructors for all of t= he module's=0D dependent libraries.=0D --=20 2.30.2