mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
xen/arm: during efi boot, improve the check for usable memory
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 v5.5-rc6 and makes more memory reusable as normal memory by Xen (except that Linux also reuses EFI_PERSISTENT_MEMORY, which we do not). Specifically, this patch also reuses memory marked as EfiLoaderCode/Data, and it uses both Attribute and Type for the check (Attribute needs to be EFI_MEMORY_WB). Reported-by: Roman Shaposhnik <roman@zededa.com> Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com> Acked-by: Julien Grall <julien@xen.org>
This commit is contained in:
1 parent
cac57fda01
commit
b31666c891
1 file changed
+7
-4
@@ -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 ||
|
||||
(!map_bs &&
|
||||
(desc_ptr->Type == EfiBootServicesCode ||
|
||||
desc_ptr->Type == EfiBootServicesData))) )
|
||||
{
|
||||
if ( !meminfo_add_bank(&bootinfo.mem, desc_ptr) )
|
||||
{
|
||||
|
||||