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

Pull powerpc updates from Ben Herrenschmidt:
 "So here's my next branch for powerpc.  A bit late as I was on vacation
  last week.  It's mostly the same stuff that was in next already, I
  just added two patches today which are the wiring up of lockref for
  powerpc, which for some reason fell through the cracks last time and
  is trivial.

  The highlights are, in addition to a bunch of bug fixes:

   - Reworked Machine Check handling on kernels running without a
     hypervisor (or acting as a hypervisor).  Provides hooks to handle
     some errors in real mode such as TLB errors, handle SLB errors,
     etc...

   - Support for retrieving memory error information from the service
     processor on IBM servers running without a hypervisor and routing
     them to the memory poison infrastructure.

   - _PAGE_NUMA support on server processors

   - 32-bit BookE relocatable kernel support

   - FSL e6500 hardware tablewalk support

   - A bunch of new/revived board support

   - FSL e6500 deeper idle states and altivec powerdown support

  You'll notice a generic mm change here, it has been acked by the
  relevant authorities and is a pre-req for our _PAGE_NUMA support"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (121 commits)
  powerpc: Implement arch_spin_is_locked() using arch_spin_value_unlocked()
  powerpc: Add support for the optimised lockref implementation
  powerpc/powernv: Call OPAL sync before kexec'ing
  powerpc/eeh: Escalate error on non-existing PE
  powerpc/eeh: Handle multiple EEH errors
  powerpc: Fix transactional FP/VMX/VSX unavailable handlers
  powerpc: Don't corrupt transactional state when using FP/VMX in kernel
  powerpc: Reclaim two unused thread_info flag bits
  powerpc: Fix races with irq_work
  Move precessing of MCE queued event out from syscall exit path.
  pseries/cpuidle: Remove redundant call to ppc64_runlatch_off() in cpu idle routines
  powerpc: Make add_system_ram_resources() __init
  powerpc: add SATA_MV to ppc64_defconfig
  powerpc/powernv: Increase candidate fw image size
  powerpc: Add debug checks to catch invalid cpu-to-node mappings
  powerpc: Fix the setup of CPU-to-Node mappings during CPU online
  powerpc/iommu: Don't detach device without IOMMU group
  powerpc/eeh: Hotplug improvement
  powerpc/eeh: Call opal_pci_reinit() on powernv for restoring config space
  powerpc/eeh: Add restore_config operation
  ...

5 files changed, 25 insertions, 21 deletions

diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c
index 9ef32b3df91f..590214ba736c 100644
--- a/drivers/macintosh/windfarm_lm75_sensor.c
+++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -133,7 +133,7 @@ static int wf_lm75_probe(struct i2c_client *client,
         lm->inited = 0;
         lm->ds1775 = ds1775;
         lm->i2c = client;
-        lm->sens.name = (char *)name; /* XXX fix constness in structure */
+        lm->sens.name = name;
         lm->sens.ops = &wf_lm75_ops;
         i2c_set_clientdata(client, lm);
 
diff --git a/drivers/macintosh/windfarm_max6690_sensor.c b/drivers/macintosh/windfarm_max6690_sensor.c
index 945a25b2f31e..87e439b10318 100644
--- a/drivers/macintosh/windfarm_max6690_sensor.c
+++ b/drivers/macintosh/windfarm_max6690_sensor.c
@@ -95,7 +95,7 @@ static int wf_max6690_probe(struct i2c_client *client,
         }
 
         max->i2c = client;
-        max->sens.name = (char *)name; /* XXX fix constness in structure */
+        max->sens.name = name;
         max->sens.ops = &wf_max6690_ops;
         i2c_set_clientdata(client, max);
 
diff --git a/drivers/net/ethernet/ibm/ibmveth.c b/drivers/net/ethernet/ibm/ibmveth.c
index cde0fd941f0c..4be971590461 100644
--- a/drivers/net/ethernet/ibm/ibmveth.c
+++ b/drivers/net/ethernet/ibm/ibmveth.c
@@ -1275,18 +1275,21 @@ static unsigned long ibmveth_get_desired_dma(struct vio_dev *vdev)
 {
         struct net_device *netdev = dev_get_drvdata(&vdev->dev);
         struct ibmveth_adapter *adapter;
+        struct iommu_table *tbl;
         unsigned long ret;
         int i;
         int rxqentries = 1;
 
+        tbl = get_iommu_table_base(&vdev->dev);
+
         /* netdev inits at probe time along with the structures we need below*/
         if (netdev == NULL)
-                return IOMMU_PAGE_ALIGN(IBMVETH_IO_ENTITLEMENT_DEFAULT);
+                return IOMMU_PAGE_ALIGN(IBMVETH_IO_ENTITLEMENT_DEFAULT, tbl);
 
         adapter = netdev_priv(netdev);
 
         ret = IBMVETH_BUFF_LIST_SIZE + IBMVETH_FILT_LIST_SIZE;
-        ret += IOMMU_PAGE_ALIGN(netdev->mtu);
+        ret += IOMMU_PAGE_ALIGN(netdev->mtu, tbl);
 
         for (i = 0; i < IBMVETH_NUM_BUFF_POOLS; i++) {
                 /* add the size of the active receive buffers */
@@ -1294,11 +1297,12 @@ static unsigned long ibmveth_get_desired_dma(struct vio_dev *vdev)
                         ret +=
                             adapter->rx_buff_pool[i].size *
                             IOMMU_PAGE_ALIGN(adapter->rx_buff_pool[i].
-                                    buff_size);
+                                             buff_size, tbl);
                 rxqentries += adapter->rx_buff_pool[i].size;
         }
         /* add the size of the receive queue entries */
-        ret += IOMMU_PAGE_ALIGN(rxqentries * sizeof(struct ibmveth_rx_q_entry));
+        ret += IOMMU_PAGE_ALIGN(
+                rxqentries * sizeof(struct ibmveth_rx_q_entry), tbl);
 
         return ret;
 }
diff --git a/drivers/tty/Kconfig b/drivers/tty/Kconfig
index 978db344bda0..b24aa010f68c 100644
--- a/drivers/tty/Kconfig
+++ b/drivers/tty/Kconfig
@@ -366,7 +366,7 @@ config TRACE_SINK
           "Trace data router for MIPI P1149.7 cJTAG standard".
 
 config PPC_EPAPR_HV_BYTECHAN
-        tristate "ePAPR hypervisor byte channel driver"
+        bool "ePAPR hypervisor byte channel driver"
         depends on PPC
         select EPAPR_PARAVIRT
         help
diff --git a/drivers/vfio/vfio_iommu_spapr_tce.c b/drivers/vfio/vfio_iommu_spapr_tce.c
index bdae7a04af75..a84788ba662c 100644
--- a/drivers/vfio/vfio_iommu_spapr_tce.c
+++ b/drivers/vfio/vfio_iommu_spapr_tce.c
@@ -81,7 +81,7 @@ static int tce_iommu_enable(struct tce_container *container)
          * enforcing the limit based on the max that the guest can map.
          */
         down_write(&current->mm->mmap_sem);
-        npages = (tbl->it_size << IOMMU_PAGE_SHIFT) >> PAGE_SHIFT;
+        npages = (tbl->it_size << IOMMU_PAGE_SHIFT_4K) >> PAGE_SHIFT;
         locked = current->mm->locked_vm + npages;
         lock_limit = rlimit(RLIMIT_MEMLOCK) >> PAGE_SHIFT;
         if (locked > lock_limit && !capable(CAP_IPC_LOCK)) {
@@ -110,7 +110,7 @@ static void tce_iommu_disable(struct tce_container *container)
 
         down_write(&current->mm->mmap_sem);
         current->mm->locked_vm -= (container->tbl->it_size <<
-                        IOMMU_PAGE_SHIFT) >> PAGE_SHIFT;
+                        IOMMU_PAGE_SHIFT_4K) >> PAGE_SHIFT;
         up_write(&current->mm->mmap_sem);
 }
 
@@ -174,8 +174,8 @@ static long tce_iommu_ioctl(void *iommu_data,
                 if (info.argsz < minsz)
                         return -EINVAL;
 
-                info.dma32_window_start = tbl->it_offset << IOMMU_PAGE_SHIFT;
-                info.dma32_window_size = tbl->it_size << IOMMU_PAGE_SHIFT;
+                info.dma32_window_start = tbl->it_offset << IOMMU_PAGE_SHIFT_4K;
+                info.dma32_window_size = tbl->it_size << IOMMU_PAGE_SHIFT_4K;
                 info.flags = 0;
 
                 if (copy_to_user((void __user *)arg, &info, minsz))
@@ -205,8 +205,8 @@ static long tce_iommu_ioctl(void *iommu_data,
                                 VFIO_DMA_MAP_FLAG_WRITE))
                         return -EINVAL;
 
-                if ((param.size & ~IOMMU_PAGE_MASK) ||
-                                (param.vaddr & ~IOMMU_PAGE_MASK))
+                if ((param.size & ~IOMMU_PAGE_MASK_4K) ||
+                                (param.vaddr & ~IOMMU_PAGE_MASK_4K))
                         return -EINVAL;
 
                 /* iova is checked by the IOMMU API */
@@ -220,17 +220,17 @@ static long tce_iommu_ioctl(void *iommu_data,
                 if (ret)
                         return ret;
 
-                for (i = 0; i < (param.size >> IOMMU_PAGE_SHIFT); ++i) {
+                for (i = 0; i < (param.size >> IOMMU_PAGE_SHIFT_4K); ++i) {
                         ret = iommu_put_tce_user_mode(tbl,
-                                        (param.iova >> IOMMU_PAGE_SHIFT) + i,
+                                        (param.iova >> IOMMU_PAGE_SHIFT_4K) + i,
                                         tce);
                         if (ret)
                                 break;
-                        tce += IOMMU_PAGE_SIZE;
+                        tce += IOMMU_PAGE_SIZE_4K;
                 }
                 if (ret)
                         iommu_clear_tces_and_put_pages(tbl,
-                                        param.iova >> IOMMU_PAGE_SHIFT, i);
+                                        param.iova >> IOMMU_PAGE_SHIFT_4K, i);
 
                 iommu_flush_tce(tbl);
 
@@ -256,17 +256,17 @@ static long tce_iommu_ioctl(void *iommu_data,
                 if (param.flags)
                         return -EINVAL;
 
-                if (param.size & ~IOMMU_PAGE_MASK)
+                if (param.size & ~IOMMU_PAGE_MASK_4K)
                         return -EINVAL;
 
                 ret = iommu_tce_clear_param_check(tbl, param.iova, 0,
-                                param.size >> IOMMU_PAGE_SHIFT);
+                                param.size >> IOMMU_PAGE_SHIFT_4K);
                 if (ret)
                         return ret;
 
                 ret = iommu_clear_tces_and_put_pages(tbl,
-                                param.iova >> IOMMU_PAGE_SHIFT,
-                                param.size >> IOMMU_PAGE_SHIFT);
+                                param.iova >> IOMMU_PAGE_SHIFT_4K,
+                                param.size >> IOMMU_PAGE_SHIFT_4K);
                 iommu_flush_tce(tbl);
 
                 return ret;