mirror of
https://github.com/xen-project/xen.git
synced 2026-10-28 02:01:24 +01:00
hvmloader: Set up highmem resouce appropriately if there is no RAM above 4G
hvmloader will read hvm_info->high_mem_pgend to calculate where to start the highmem PCI region. However, if the guest does not have any memory in the high region, this is set to zero, which will cause hvmloader to use the "0" for the base of the highmem region, rather than 1 << 32. Check to see whether hvm_info->high_mem_pgend is set; if so, do the normal calculation; otherwise, use 1<<32. v4: - Handle case where hfm_info->high_mem_pgend is non-zero but doesn't point into high memory, throwing a warning. Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> CC: Ian Campbell <ian.campbell@citrix.com> CC: Ian Jackson <ian.jackson@citrix.com> CC: Stefano Stabellini <stefano.stabellini@citrix.com> CC: Hanweidong <hanweidong@huawei.com> CC: Keir Fraser <keir@xen.org>
This commit is contained in:
1 parent
91993aee68
commit
42d075411b
1 file changed
+12
-1
@@ -246,7 +246,18 @@ void pci_setup(void)
|
||||
hvm_info->high_mem_pgend += nr_pages;
|
||||
}
|
||||
|
||||
high_mem_resource.base = ((uint64_t)hvm_info->high_mem_pgend) << PAGE_SHIFT;
|
||||
high_mem_resource.base = ((uint64_t)hvm_info->high_mem_pgend) << PAGE_SHIFT;
|
||||
if ( high_mem_resource.base < 1ull << 32 )
|
||||
{
|
||||
if ( hvm_info->high_mem_pgend != 0 )
|
||||
printf("WARNING: hvm_info->high_mem_pgend %x"
|
||||
" does not point into high memory!",
|
||||
hvm_info->high_mem_pgend);
|
||||
high_mem_resource.base = 1ull << 32;
|
||||
}
|
||||
printf("%sRAM in high memory; setting high_mem resource base to "PRIllx"\n",
|
||||
hvm_info->high_mem_pgend?"":"No ",
|
||||
PRIllx_arg(high_mem_resource.base));
|
||||
high_mem_resource.max = 1ull << cpu_phys_addr();
|
||||
mem_resource.base = pci_mem_start;
|
||||
mem_resource.max = pci_mem_end;
|
||||
|
||||