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
  ...

3 files changed, 13 insertions, 14 deletions

diff --git a/drivers/net/ethernet/ibm/ehea/ehea.h b/drivers/net/ethernet/ibm/ehea/ehea.h
index b8e46cc31e53..6be7b9839f35 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea.h
+++ b/drivers/net/ethernet/ibm/ehea/ehea.h
@@ -35,7 +35,6 @@
 #include <linux/if_vlan.h>
 
 #include <asm/ibmebus.h>
-#include <asm/abs_addr.h>
 #include <asm/io.h>
 
 #define DRV_NAME        "ehea"
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_phyp.c b/drivers/net/ethernet/ibm/ehea/ehea_phyp.c
index 30f903332e92..d3a130ccdcc8 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_phyp.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_phyp.c
@@ -141,7 +141,7 @@ u64 ehea_h_query_ehea_qp(const u64 adapter_handle, const u8 qp_category,
                                        qp_category,             /* R5 */
                                        qp_handle,               /* R6 */
                                        sel_mask,                /* R7 */
-                                       virt_to_abs(cb_addr),    /* R8 */
+                                       __pa(cb_addr),           /* R8 */
                                        0, 0);
 }
 
@@ -415,7 +415,7 @@ u64 ehea_h_modify_ehea_qp(const u64 adapter_handle, const u8 cat,
                                  (u64) cat,                     /* R5 */
                                  qp_handle,                     /* R6 */
                                  sel_mask,                      /* R7 */
-                                 virt_to_abs(cb_addr),          /* R8 */
+                                 __pa(cb_addr),                 /* R8 */
                                  0, 0, 0, 0);                   /* R9-R12 */
 
         *inv_attr_id = outs[0];
@@ -528,7 +528,7 @@ u64 ehea_h_query_ehea(const u64 adapter_handle, void *cb_addr)
 {
         u64 hret, cb_logaddr;
 
-        cb_logaddr = virt_to_abs(cb_addr);
+        cb_logaddr = __pa(cb_addr);
 
         hret = ehea_plpar_hcall_norets(H_QUERY_HEA,
                                        adapter_handle,          /* R4 */
@@ -545,7 +545,7 @@ u64 ehea_h_query_ehea_port(const u64 adapter_handle, const u16 port_num,
                            void *cb_addr)
 {
         u64 port_info;
-        u64 cb_logaddr = virt_to_abs(cb_addr);
+        u64 cb_logaddr = __pa(cb_addr);
         u64 arr_index = 0;
 
         port_info = EHEA_BMASK_SET(H_MEHEAPORT_CAT, cb_cat)
@@ -567,7 +567,7 @@ u64 ehea_h_modify_ehea_port(const u64 adapter_handle, const u16 port_num,
         unsigned long outs[PLPAR_HCALL9_BUFSIZE];
         u64 port_info;
         u64 arr_index = 0;
-        u64 cb_logaddr = virt_to_abs(cb_addr);
+        u64 cb_logaddr = __pa(cb_addr);
 
         port_info = EHEA_BMASK_SET(H_MEHEAPORT_CAT, cb_cat)
                   | EHEA_BMASK_SET(H_MEHEAPORT_PN, port_num);
@@ -621,6 +621,6 @@ u64 ehea_h_error_data(const u64 adapter_handle, const u64 ressource_handle,
         return ehea_plpar_hcall_norets(H_ERROR_DATA,
                                        adapter_handle,          /* R4 */
                                        ressource_handle,        /* R5 */
-                                       virt_to_abs(rblock),     /* R6 */
+                                       __pa(rblock),            /* R6 */
                                        0, 0, 0, 0);             /* R7-R12 */
 }
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_qmr.c b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
index cb66f574dc97..27f881758d16 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_qmr.c
@@ -163,7 +163,7 @@ struct ehea_cq *ehea_create_cq(struct ehea_adapter *adapter,
                         goto out_kill_hwq;
                 }
 
-                rpage = virt_to_abs(vpage);
+                rpage = __pa(vpage);
                 hret = ehea_h_register_rpage(adapter->handle,
                                              0, EHEA_CQ_REGISTER_ORIG,
                                              cq->fw_handle, rpage, 1);
@@ -290,7 +290,7 @@ struct ehea_eq *ehea_create_eq(struct ehea_adapter *adapter,
                         goto out_kill_hwq;
                 }
 
-                rpage = virt_to_abs(vpage);
+                rpage = __pa(vpage);
 
                 hret = ehea_h_register_rpage(adapter->handle, 0,
                                              EHEA_EQ_REGISTER_ORIG,
@@ -395,7 +395,7 @@ static int ehea_qp_alloc_register(struct ehea_qp *qp, struct hw_queue *hw_queue,
                         pr_err("hw_qpageit_get_inc failed\n");
                         goto out_kill_hwq;
                 }
-                rpage = virt_to_abs(vpage);
+                rpage = __pa(vpage);
                 hret = ehea_h_register_rpage(adapter->handle,
                                              0, h_call_q_selector,
                                              qp->fw_handle, rpage, 1);
@@ -790,7 +790,7 @@ u64 ehea_map_vaddr(void *caddr)
         if (!ehea_bmap)
                 return EHEA_INVAL_ADDR;
 
-        index = virt_to_abs(caddr) >> SECTION_SIZE_BITS;
+        index = __pa(caddr) >> SECTION_SIZE_BITS;
         top = (index >> EHEA_TOP_INDEX_SHIFT) & EHEA_INDEX_MASK;
         if (!ehea_bmap->top[top])
                 return EHEA_INVAL_ADDR;
@@ -812,7 +812,7 @@ static inline void *ehea_calc_sectbase(int top, int dir, int idx)
         unsigned long ret = idx;
         ret |= dir << EHEA_DIR_INDEX_SHIFT;
         ret |= top << EHEA_TOP_INDEX_SHIFT;
-        return abs_to_virt(ret << SECTION_SIZE_BITS);
+        return __va(ret << SECTION_SIZE_BITS);
 }
 
 static u64 ehea_reg_mr_section(int top, int dir, int idx, u64 *pt,
@@ -822,7 +822,7 @@ static u64 ehea_reg_mr_section(int top, int dir, int idx, u64 *pt,
         void *pg;
         u64 j, m, hret;
         unsigned long k = 0;
-        u64 pt_abs = virt_to_abs(pt);
+        u64 pt_abs = __pa(pt);
 
         void *sectbase = ehea_calc_sectbase(top, dir, idx);
 
@@ -830,7 +830,7 @@ static u64 ehea_reg_mr_section(int top, int dir, int idx, u64 *pt,
 
                 for (m = 0; m < EHEA_MAX_RPAGE; m++) {
                         pg = sectbase + ((k++) * EHEA_PAGESIZE);
-                        pt[m] = virt_to_abs(pg);
+                        pt[m] = __pa(pg);
                 }
                 hret = ehea_h_register_rpage_mr(adapter->handle, mr->handle, 0,
                                                 0, pt_abs, EHEA_MAX_RPAGE);