xen: remove tests for pvh mode in pure pv paths

Remove the last tests for XENFEAT_auto_translated_physmap in pure
PV-domain specific paths. PVH V1 is gone and the feature will always
be "false" in PV guests.

Signed-off-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>

diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h
index 8417ef7..497f7d2 100644 (file)
--- a/arch/x86/include/asm/xen/page.h
+++ b/arch/x86/include/asm/xen/page.h
@@ -158,9 +158,6 @@ static inline unsigned long mfn_to_pfn_no_overrides(unsigned long mfn)
        unsigned long pfn;
        int ret;
 
-       if (xen_feature(XENFEAT_auto_translated_physmap))
-               return mfn;
-
        if (unlikely(mfn >= machine_to_phys_nr))
                return ~0;
 

diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c
index 276da63..6083ba4 100644 (file)
--- a/arch/x86/xen/p2m.c
+++ b/arch/x86/xen/p2m.c
@@ -212,8 +212,7 @@ void __ref xen_build_mfn_list_list(void)
        unsigned int level, topidx, mididx;
        unsigned long *mid_mfn_p;
 
-       if (xen_feature(XENFEAT_auto_translated_physmap) ||
-           xen_start_info->flags & SIF_VIRT_P2M_4TOOLS)
+       if (xen_start_info->flags & SIF_VIRT_P2M_4TOOLS)
                return;
 
        /* Pre-initialize p2m_top_mfn to be completely missing */
@@ -269,9 +268,6 @@ void __ref xen_build_mfn_list_list(void)
 
 void xen_setup_mfn_list_list(void)
 {
-       if (xen_feature(XENFEAT_auto_translated_physmap))
-               return;
-
        BUG_ON(HYPERVISOR_shared_info == &xen_dummy_shared_info);
 
        if (xen_start_info->flags & SIF_VIRT_P2M_4TOOLS)
@@ -291,9 +287,6 @@ void __init xen_build_dynamic_phys_to_machine(void)
 {
        unsigned long pfn;
 
-        if (xen_feature(XENFEAT_auto_translated_physmap))
-               return;
-
        xen_p2m_addr = (unsigned long *)xen_start_info->mfn_list;
        xen_p2m_size = ALIGN(xen_start_info->nr_pages, P2M_PER_PAGE);
 
@@ -540,9 +533,6 @@ int xen_alloc_p2m_entry(unsigned long pfn)
        unsigned long addr = (unsigned long)(xen_p2m_addr + pfn);
        unsigned long p2m_pfn;
 
-       if (xen_feature(XENFEAT_auto_translated_physmap))
-               return 0;
-
        ptep = lookup_address(addr, &level);
        BUG_ON(!ptep || level != PG_LEVEL_4K);
        pte_pg = (pte_t *)((unsigned long)ptep & ~(PAGE_SIZE - 1));
@@ -640,9 +630,6 @@ unsigned long __init set_phys_range_identity(unsigned long pfn_s,
        if (unlikely(pfn_s >= xen_p2m_size))
                return 0;
 
-       if (unlikely(xen_feature(XENFEAT_auto_translated_physmap)))
-               return pfn_e - pfn_s;
-
        if (pfn_s > pfn_e)
                return 0;
 
@@ -660,10 +647,6 @@ bool __set_phys_to_machine(unsigned long pfn, unsigned long mfn)
        pte_t *ptep;
        unsigned int level;
 
-       /* don't track P2M changes in autotranslate guests */
-       if (unlikely(xen_feature(XENFEAT_auto_translated_physmap)))
-               return true;
-
        if (unlikely(pfn >= xen_p2m_size)) {
                BUG_ON(mfn != INVALID_P2M_ENTRY);
                return true;
@@ -711,9 +694,6 @@ int set_foreign_p2m_mapping(struct gnttab_map_grant_ref *map_ops,
        int i, ret = 0;
        pte_t *pte;
 
-       if (xen_feature(XENFEAT_auto_translated_physmap))
-               return 0;
-
        if (kmap_ops) {
                ret = HYPERVISOR_grant_table_op(GNTTABOP_map_grant_ref,
                                                kmap_ops, count);
@@ -756,9 +736,6 @@ int clear_foreign_p2m_mapping(struct gnttab_unmap_grant_ref *unmap_ops,
 {
        int i, ret = 0;
 
-       if (xen_feature(XENFEAT_auto_translated_physmap))
-               return 0;
-
        for (i = 0; i < count; i++) {
                unsigned long mfn = __pfn_to_mfn(page_to_pfn(pages[i]));
                unsigned long pfn = page_to_pfn(pages[i]);

diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index c810463..ac55c02 100644 (file)
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -340,8 +340,6 @@ static void __init xen_do_set_identity_and_remap_chunk(
 
        WARN_ON(size == 0);
 
-       BUG_ON(xen_feature(XENFEAT_auto_translated_physmap));
-
        mfn_save = virt_to_mfn(buf);
 
        for (ident_pfn_iter = start_pfn, remap_pfn_iter = remap_pfn;
@@ -1024,8 +1022,7 @@ void __init xen_pvmmu_arch_setup(void)
 void __init xen_arch_setup(void)
 {
        xen_panic_handler_init();
-       if (!xen_feature(XENFEAT_auto_translated_physmap))
-               xen_pvmmu_arch_setup();
+       xen_pvmmu_arch_setup();
 
 #ifdef CONFIG_ACPI
        if (!(xen_start_info->flags & SIF_INITDOMAIN)) {