When booting via EFI, the EFI memory map has information about memory
regions and their type. Improve the check for the type and attribute of
each memory region to figure out whether it is usable memory or not.
This patch brings the check on par with Linux and makes more memory
reusable as normal memory by Xen.
Reported-by: Roman Shaposhnik <ro...@zededa.com>
Signed-off-by: Stefano Stabellini <stefano.stabell...@xilinx.com>
CC: Julien Grall <jul...@xen.org>
---
xen/arch/arm/efi/efi-boot.h | 11 +++++++----
xen/include/efi/efidef.h | 1 +
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h
index d7bf934077..5d1d526d17 100644
--- a/xen/arch/arm/efi/efi-boot.h
+++ b/xen/arch/arm/efi/efi-boot.h
@@ -149,10 +149,13 @@ static EFI_STATUS __init
efi_process_memory_map_bootinfo(EFI_MEMORY_DESCRIPTOR *
for ( Index = 0; Index < (mmap_size / desc_size); Index++ )
{
- if ( desc_ptr->Type == EfiConventionalMemory ||
- (!map_bs &&
- (desc_ptr->Type == EfiBootServicesCode ||
- desc_ptr->Type == EfiBootServicesData)) )
+ if ( desc_ptr->Attribute & EFI_MEMORY_WB &&
+ (desc_ptr->Type == EfiConventionalMemory ||
+ desc_ptr->Type == EfiLoaderCode ||
+ desc_ptr->Type == EfiLoaderData ||
+ desc_ptr->Type == EfiPersistentMemory ||
+ desc_ptr->Type == EfiBootServicesCode ||
+ desc_ptr->Type == EfiBootServicesData) )
{
if ( !meminfo_add_bank(&bootinfo.mem, desc_ptr) )
{
diff --git a/xen/include/efi/efidef.h b/xen/include/efi/efidef.h
index 86a7e111bf..f46207840f 100644
--- a/xen/include/efi/efidef.h
+++ b/xen/include/efi/efidef.h
@@ -147,6 +147,7 @@ typedef enum {
EfiMemoryMappedIO,
EfiMemoryMappedIOPortSpace,
EfiPalCode,
+ EfiPersistentMemory,
EfiMaxMemoryType
} EFI_MEMORY_TYPE;
--
2.17.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
