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

Commit 3d4ebdb2 authored by Vitaly Kuznetsov's avatar Vitaly Kuznetsov Committed by Juergen Gross
Browse files

x86/xen: create stubs for HVM-only builds in page.h 



__pfn_to_mfn() is only used from PV code (mmu_pv.c, p2m.c) and from
page.h where all functions calling it check for
xen_feature(XENFEAT_auto_translated_physmap) first so we can replace
it with any stub to make build happy.

set_foreign_p2m_mapping()/clear_foreign_p2m_mapping() are used from
grant-table.c but only if !xen_feature(XENFEAT_auto_translated_physmap).

Signed-off-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
parent c504b2f1

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

+25 −0
Original line number Diff line number Diff line
@@ -52,12 +52,30 @@ extern bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn); 
extern unsigned long __init set_phys_range_identity(unsigned long pfn_s,

						    unsigned long pfn_e);



#ifdef CONFIG_XEN_PV

extern int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops,

				   struct gnttab_map_grant_ref *kmap_ops,

				   struct page **pages, unsigned int count);

extern int clear_foreign_p2m_mapping(struct gnttab_unmap_grant_ref *unmap_ops,

				     struct gnttab_unmap_grant_ref *kunmap_ops,

				     struct page **pages, unsigned int count);

#else

static inline int

set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops,

			struct gnttab_map_grant_ref *kmap_ops,

			struct page **pages, unsigned int count)

{

	return 0;

}



static inline int

clear_foreign_p2m_mapping(struct gnttab_unmap_grant_ref *unmap_ops,

			  struct gnttab_unmap_grant_ref *kunmap_ops,

			  struct page **pages, unsigned int count)

{

	return 0;

}

#endif



/*

 * Helper functions to write or read unsigned long values to/from
@@ -73,6 +91,7 @@ static inline int xen_safe_read_ulong(unsigned long *addr, unsigned long *val) 
	return __get_user(*val, (unsigned long __user *)addr);

}



#ifdef CONFIG_XEN_PV

/*

 * When to use pfn_to_mfn(), __pfn_to_mfn() or get_phys_to_machine():

 * - pfn_to_mfn() returns either INVALID_P2M_ENTRY or the mfn. No indicator
@@ -99,6 +118,12 @@ static inline unsigned long __pfn_to_mfn(unsigned long pfn) 


	return mfn;

}

#else

static inline unsigned long __pfn_to_mfn(unsigned long pfn)

{

	return pfn;

}

#endif



static inline unsigned long pfn_to_mfn(unsigned long pfn)

{