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, 19 deletions

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 9169ffdbab08..2da01340c84c 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -466,25 +466,6 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .machine_check_early    = __machine_check_early_realmode_p8,
                 .platform               = "power8",
         },
-        {       /* Power9 DD1*/
-                .pvr_mask               = 0xffffff00,
-                .pvr_value              = 0x004e0100,
-                .cpu_name               = "POWER9 (raw)",
-                .cpu_features           = CPU_FTRS_POWER9_DD1,
-                .cpu_user_features      = COMMON_USER_POWER9,
-                .cpu_user_features2     = COMMON_USER2_POWER9,
-                .mmu_features           = MMU_FTRS_POWER9,
-                .icache_bsize           = 128,
-                .dcache_bsize           = 128,
-                .num_pmcs               = 6,
-                .pmc_type               = PPC_PMC_IBM,
-                .oprofile_cpu_type      = "ppc64/power9",
-                .oprofile_type          = PPC_OPROFILE_INVALID,
-                .cpu_setup              = __setup_cpu_power9,
-                .cpu_restore            = __restore_cpu_power9,
-                .machine_check_early    = __machine_check_early_realmode_p9,
-                .platform               = "power9",
-        },
         {       /* Power9 DD2.0 */
                 .pvr_mask               = 0xffffefff,
                 .pvr_value              = 0x004e0200,