Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9e9a5fcb authored by Ian Campbell's avatar Ian Campbell Committed by Jeremy Fitzhardinge
Browse files

xen: use host E820 map for dom0 



When running as initial domain, get the real physical memory map from
xen using the XENMEM_machine_memory_map hypercall and use it to setup
the e820 regions.

Signed-off-by: default avatarIan Campbell <ian.campbell@citrix.com>
Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 375b2a9a

arch/x86/xen/setup.c

+7 −2
Original line number Diff line number Diff line
@@ -149,6 +149,7 @@ char * __init xen_memory_setup(void) 
	unsigned long extra_pages = 0;

	unsigned long extra_limit;

	int i;

	int op;



	max_pfn = min(MAX_DOMAIN_PAGES, max_pfn);

	mem_end = PFN_PHYS(max_pfn);
@@ -156,7 +157,10 @@ char * __init xen_memory_setup(void) 
	memmap.nr_entries = E820MAX;

	set_xen_guest_handle(memmap.buffer, map);



	rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap);

	op = xen_initial_domain() ?

		XENMEM_machine_memory_map :

		XENMEM_memory_map;

	rc = HYPERVISOR_memory_op(op, &memmap);

	if (rc == -ENOSYS) {

		memmap.nr_entries = 1;

		map[0].addr = 0ULL;
@@ -235,6 +239,7 @@ char * __init xen_memory_setup(void) 
	else

		extra_pages = 0;



	if (!xen_initial_domain())

		xen_add_extra_mem(extra_pages);



	return "Xen";