Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Pull powerpc updates from Benjamin Herrenschmidt:
 "Some highlights in addition to the usual batch of fixes:

   - 64TB address space support for 64-bit processes by Aneesh Kumar

   - Gavin Shan did a major cleanup & re-organization of our EEH support
     code (IBM fancy PCI error handling & recovery infrastructure) which
     paves the way for supporting different platform backends, along
     with some rework of the PCIe code for the PowerNV platform in order
     to remove home made resource allocations and instead use the
     generic code (which is possible after some small improvements to it
     done by Gavin).

   - Uprobes support by Ananth N Mavinakayanahalli

   - A pile of embedded updates from Freescale folks, including new SoC
     and board supports, more KVM stuff including preparing for 64-bit
     BookE KVM support, ePAPR 1.1 updates, etc..."

Fixup trivial conflicts in drivers/scsi/ipr.c

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (146 commits)
  powerpc/iommu: Fix multiple issues with IOMMU pools code
  powerpc: Fix VMX fix for memcpy case
  driver/mtd:IFC NAND:Initialise internal SRAM before any write
  powerpc/fsl-pci: use 'Header Type' to identify PCIE mode
  powerpc/eeh: Don't release eeh_mutex in eeh_phb_pe_get
  powerpc: Remove tlb batching hack for nighthawk
  powerpc: Set paca->data_offset = 0 for boot cpu
  powerpc/perf: Sample only if SIAR-Valid bit is set in P7+
  powerpc/fsl-pci: fix warning when CONFIG_SWIOTLB is disabled
  powerpc/mpc85xx: Update interrupt handling for IFC controller
  powerpc/85xx: Enable USB support in p1023rds_defconfig
  powerpc/smp: Do not disable IPI interrupts during suspend
  powerpc/eeh: Fix crash on converting OF node to edev
  powerpc/eeh: Lock module while handling EEH event
  powerpc/kprobe: Don't emulate store when kprobe stwu r1
  powerpc/kprobe: Complete kprobe and migrate exception frame
  powerpc/kprobe: Introduce a new thread flag
  powerpc: Remove unused __get_user64() and __put_user64()
  powerpc/eeh: Global mutex to protect PE tree
  powerpc/eeh: Remove EEH PE for normal PCI hotplug
  ...

4 files changed, 22 insertions, 19 deletions

diff --git a/arch/powerpc/kvm/book3s_32_mmu_host.c b/arch/powerpc/kvm/book3s_32_mmu_host.c
index 837f13e7b6bf..00aa61268e0d 100644
--- a/arch/powerpc/kvm/book3s_32_mmu_host.c
+++ b/arch/powerpc/kvm/book3s_32_mmu_host.c
@@ -141,7 +141,7 @@ extern char etext[];
 int kvmppc_mmu_map_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *orig_pte)
 {
         pfn_t hpaddr;
-        u64 va;
+        u64 vpn;
         u64 vsid;
         struct kvmppc_sid_map *map;
         volatile u32 *pteg;
@@ -173,7 +173,7 @@ int kvmppc_mmu_map_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *orig_pte)
         BUG_ON(!map);
 
         vsid = map->host_vsid;
-        va = (vsid << SID_SHIFT) | (eaddr & ~ESID_MASK);
+        vpn = (vsid << (SID_SHIFT - VPN_SHIFT)) | ((eaddr & ~ESID_MASK) >> VPN_SHIFT)
 
 next_pteg:
         if (rr == 16) {
@@ -244,11 +244,11 @@ next_pteg:
         dprintk_mmu("KVM: %c%c Map 0x%llx: [%lx] 0x%llx (0x%llx) -> %lx\n",
                     orig_pte->may_write ? 'w' : '-',
                     orig_pte->may_execute ? 'x' : '-',
-                    orig_pte->eaddr, (ulong)pteg, va,
+                    orig_pte->eaddr, (ulong)pteg, vpn,
                     orig_pte->vpage, hpaddr);
 
         pte->slot = (ulong)&pteg[rr];
-        pte->host_va = va;
+        pte->host_vpn = vpn;
         pte->pte = *orig_pte;
         pte->pfn = hpaddr >> PAGE_SHIFT;
 
diff --git a/arch/powerpc/kvm/book3s_64_mmu_host.c b/arch/powerpc/kvm/book3s_64_mmu_host.c
index 0688b6b39585..4d72f9ebc554 100644
--- a/arch/powerpc/kvm/book3s_64_mmu_host.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_host.c
@@ -33,7 +33,7 @@
 
 void kvmppc_mmu_invalidate_pte(struct kvm_vcpu *vcpu, struct hpte_cache *pte)
 {
-        ppc_md.hpte_invalidate(pte->slot, pte->host_va,
+        ppc_md.hpte_invalidate(pte->slot, pte->host_vpn,
                                MMU_PAGE_4K, MMU_SEGSIZE_256M,
                                false);
 }
@@ -80,8 +80,9 @@ static struct kvmppc_sid_map *find_sid_vsid(struct kvm_vcpu *vcpu, u64 gvsid)
 
 int kvmppc_mmu_map_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *orig_pte)
 {
+        unsigned long vpn;
         pfn_t hpaddr;
-        ulong hash, hpteg, va;
+        ulong hash, hpteg;
         u64 vsid;
         int ret;
         int rflags = 0x192;
@@ -117,7 +118,7 @@ int kvmppc_mmu_map_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *orig_pte)
         }
 
         vsid = map->host_vsid;
-        va = hpt_va(orig_pte->eaddr, vsid, MMU_SEGSIZE_256M);
+        vpn = hpt_vpn(orig_pte->eaddr, vsid, MMU_SEGSIZE_256M);
 
         if (!orig_pte->may_write)
                 rflags |= HPTE_R_PP;
@@ -129,7 +130,7 @@ int kvmppc_mmu_map_page(struct kvm_vcpu *vcpu, struct kvmppc_pte *orig_pte)
         else
                 kvmppc_mmu_flush_icache(hpaddr >> PAGE_SHIFT);
 
-        hash = hpt_hash(va, PTE_SIZE, MMU_SEGSIZE_256M);
+        hash = hpt_hash(vpn, PTE_SIZE, MMU_SEGSIZE_256M);
 
 map_again:
         hpteg = ((hash & htab_hash_mask) * HPTES_PER_GROUP);
@@ -141,7 +142,8 @@ map_again:
                         goto out;
                 }
 
-        ret = ppc_md.hpte_insert(hpteg, va, hpaddr, rflags, vflags, MMU_PAGE_4K, MMU_SEGSIZE_256M);
+        ret = ppc_md.hpte_insert(hpteg, vpn, hpaddr, rflags, vflags,
+                                 MMU_PAGE_4K, MMU_SEGSIZE_256M);
 
         if (ret < 0) {
                 /* If we couldn't map a primary PTE, try a secondary */
@@ -152,7 +154,8 @@ map_again:
         } else {
                 struct hpte_cache *pte = kvmppc_mmu_hpte_cache_next(vcpu);
 
-                trace_kvm_book3s_64_mmu_map(rflags, hpteg, va, hpaddr, orig_pte);
+                trace_kvm_book3s_64_mmu_map(rflags, hpteg,
+                                            vpn, hpaddr, orig_pte);
 
                 /* The ppc_md code may give us a secondary entry even though we
                    asked for a primary. Fix up. */
@@ -162,7 +165,7 @@ map_again:
                 }
 
                 pte->slot = hpteg + (ret & 7);
-                pte->host_va = va;
+                pte->host_vpn = vpn;
                 pte->pte = *orig_pte;
                 pte->pfn = hpaddr >> PAGE_SHIFT;
 
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index 44b72feaff7d..74a24bbb9637 100644
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -1065,7 +1065,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_206)
         mtspr   SPRN_DABRX,r6
 
         /* Restore SPRG3 */
-        ld      r3,HSTATE_SPRG3(r13)
+        ld      r3,PACA_SPRG3(r13)
         mtspr   SPRN_SPRG3,r3
 
         /*
diff --git a/arch/powerpc/kvm/trace.h b/arch/powerpc/kvm/trace.h
index 877186b7b1c3..ddb6a2149d44 100644
--- a/arch/powerpc/kvm/trace.h
+++ b/arch/powerpc/kvm/trace.h
@@ -189,7 +189,7 @@ TRACE_EVENT(kvm_book3s_mmu_map,
         TP_ARGS(pte),
 
         TP_STRUCT__entry(
-                __field(        u64,            host_va         )
+                __field(        u64,            host_vpn        )
                 __field(        u64,            pfn             )
                 __field(        ulong,          eaddr           )
                 __field(        u64,            vpage           )
@@ -198,7 +198,7 @@ TRACE_EVENT(kvm_book3s_mmu_map,
         ),
 
         TP_fast_assign(
-                __entry->host_va        = pte->host_va;
+                __entry->host_vpn       = pte->host_vpn;
                 __entry->pfn            = pte->pfn;
                 __entry->eaddr          = pte->pte.eaddr;
                 __entry->vpage          = pte->pte.vpage;
@@ -208,8 +208,8 @@ TRACE_EVENT(kvm_book3s_mmu_map,
                                           (pte->pte.may_execute ? 0x1 : 0);
         ),
 
-        TP_printk("Map: hva=%llx pfn=%llx ea=%lx vp=%llx ra=%lx [%x]",
-                  __entry->host_va, __entry->pfn, __entry->eaddr,
+        TP_printk("Map: hvpn=%llx pfn=%llx ea=%lx vp=%llx ra=%lx [%x]",
+                  __entry->host_vpn, __entry->pfn, __entry->eaddr,
                   __entry->vpage, __entry->raddr, __entry->flags)
 );
 
@@ -218,7 +218,7 @@ TRACE_EVENT(kvm_book3s_mmu_invalidate,
         TP_ARGS(pte),
 
         TP_STRUCT__entry(
-                __field(        u64,            host_va         )
+                __field(        u64,            host_vpn        )
                 __field(        u64,            pfn             )
                 __field(        ulong,          eaddr           )
                 __field(        u64,            vpage           )
@@ -227,7 +227,7 @@ TRACE_EVENT(kvm_book3s_mmu_invalidate,
         ),
 
         TP_fast_assign(
-                __entry->host_va        = pte->host_va;
+                __entry->host_vpn       = pte->host_vpn;
                 __entry->pfn            = pte->pfn;
                 __entry->eaddr          = pte->pte.eaddr;
                 __entry->vpage          = pte->pte.vpage;
@@ -238,7 +238,7 @@ TRACE_EVENT(kvm_book3s_mmu_invalidate,
         ),
 
         TP_printk("Flush: hva=%llx pfn=%llx ea=%lx vp=%llx ra=%lx [%x]",
-                  __entry->host_va, __entry->pfn, __entry->eaddr,
+                  __entry->host_vpn, __entry->pfn, __entry->eaddr,
                   __entry->vpage, __entry->raddr, __entry->flags)
 );