Merge branch 'topic/ppc-kvm' into next

Merge in some commits we're sharing with the KVM tree.

I manually propagated the change from commit d3d4ffaae439
("powerpc/powernv/ioda2: Reduce upper limit for DMA window size") into
pci-ioda-tce.c.

Conflicts:
        arch/powerpc/include/asm/cputable.h
        arch/powerpc/platforms/powernv/pci-ioda.c
        arch/powerpc/platforms/powernv/pci.h

1 files changed, 0 insertions, 30 deletions

diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 8318716e5075..5a72e980e25a 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -808,31 +808,6 @@ int hash__remove_section_mapping(unsigned long start, unsigned long end)
 }
 #endif /* CONFIG_MEMORY_HOTPLUG */
 
-static void update_hid_for_hash(void)
-{
-        unsigned long hid0;
-        unsigned long rb = 3UL << PPC_BITLSHIFT(53); /* IS = 3 */
-
-        asm volatile("ptesync": : :"memory");
-        /* prs = 0, ric = 2, rs = 0, r = 1 is = 3 */
-        asm volatile(PPC_TLBIE_5(%0, %4, %3, %2, %1)
-                     : : "r"(rb), "i"(0), "i"(0), "i"(2), "r"(0) : "memory");
-        asm volatile("eieio; tlbsync; ptesync; isync; slbia": : :"memory");
-        trace_tlbie(0, 0, rb, 0, 2, 0, 0);
-
-        /*
-         * now switch the HID
-         */
-        hid0  = mfspr(SPRN_HID0);
-        hid0 &= ~HID0_POWER9_RADIX;
-        mtspr(SPRN_HID0, hid0);
-        asm volatile("isync": : :"memory");
-
-        /* Wait for it to happen */
-        while ((mfspr(SPRN_HID0) & HID0_POWER9_RADIX))
-                cpu_relax();
-}
-
 static void __init hash_init_partition_table(phys_addr_t hash_table,
                                              unsigned long htab_size)
 {
@@ -845,8 +820,6 @@ static void __init hash_init_partition_table(phys_addr_t hash_table,
         htab_size =  __ilog2(htab_size) - 18;
         mmu_partition_table_set_entry(0, hash_table | htab_size, 0);
         pr_info("Partition table %p\n", partition_tb);
-        if (cpu_has_feature(CPU_FTR_POWER9_DD1))
-                update_hid_for_hash();
 }
 
 static void __init htab_initialize(void)
@@ -1077,9 +1050,6 @@ void hash__early_init_mmu_secondary(void)
         /* Initialize hash table for that CPU */
         if (!firmware_has_feature(FW_FEATURE_LPAR)) {
 
-                if (cpu_has_feature(CPU_FTR_POWER9_DD1))
-                        update_hid_for_hash();
-
                 if (!cpu_has_feature(CPU_FTR_ARCH_300))
                         mtspr(SPRN_SDR1, _SDR1);
                 else