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

Commit 724afaea authored by Julien Grall's avatar Julien Grall Committed by David Vrabel
Browse files

arm/xen: Remove helpers which are PV specific 



ARM guests are always HVM. The current implementation is assuming a 1:1
mapping which is only true for DOM0 and may not be at all in the future.

Furthermore, all the helpers but arbitrary_virt_to_machine are used in
x86 specific code (or only compiled for).

The helper arbitrary_virt_to_machine is only used in PV specific code.
Therefore we should never call the function.

Add a BUG() in this helper and drop all the others.

Signed-off-by: default avatarJulien Grall <julien.grall@citrix.com>
Acked-by: default avatarStefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
parent 3375d828

arch/arm/include/asm/xen/page.h

+2 −14
Original line number Diff line number Diff line
@@ -54,26 +54,14 @@ static inline unsigned long mfn_to_pfn(unsigned long mfn) 


#define mfn_to_local_pfn(mfn) mfn_to_pfn(mfn)



static inline xmaddr_t phys_to_machine(xpaddr_t phys)

{

	unsigned offset = phys.paddr & ~PAGE_MASK;

	return XMADDR(PFN_PHYS(pfn_to_mfn(PFN_DOWN(phys.paddr))) | offset);

}



static inline xpaddr_t machine_to_phys(xmaddr_t machine)

{

	unsigned offset = machine.maddr & ~PAGE_MASK;

	return XPADDR(PFN_PHYS(mfn_to_pfn(PFN_DOWN(machine.maddr))) | offset);

}

/* VIRT <-> MACHINE conversion */

#define virt_to_machine(v)	(phys_to_machine(XPADDR(__pa(v))))

#define virt_to_mfn(v)		(pfn_to_mfn(virt_to_pfn(v)))

#define mfn_to_virt(m)		(__va(mfn_to_pfn(m) << PAGE_SHIFT))



/* Only used in PV code. But ARM guests are always HVM. */

static inline xmaddr_t arbitrary_virt_to_machine(void *vaddr)

{

	/* TODO: assuming it is mapped in the kernel 1:1 */

	return virt_to_machine(vaddr);

	BUG();

}



/* TODO: this shouldn't be here but it is because the frontend drivers