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

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (103 commits)
  powerpc: Fix bug in move of altivec code to vector.S
  powerpc: Add support for swiotlb on 32-bit
  powerpc/spufs: Remove unused error path
  powerpc: Fix warning when printing a resource_size_t
  powerpc/xmon: Remove unused variable in xmon.c
  powerpc/pseries: Fix warnings when printing resource_size_t
  powerpc: Shield code specific to 64-bit server processors
  powerpc: Separate PACA fields for server CPUs
  powerpc: Split exception handling out of head_64.S
  powerpc: Introduce CONFIG_PPC_BOOK3S
  powerpc: Move VMX and VSX asm code to vector.S
  powerpc: Set init_bootmem_done on NUMA platforms as well
  powerpc/mm: Fix a AB->BA deadlock scenario with nohash MMU context lock
  powerpc/mm: Fix some SMP issues with MMU context handling
  powerpc: Add PTRACE_SINGLEBLOCK support
  fbdev: Add PLB support and cleanup DCR in xilinxfb driver.
  powerpc/virtex: Add ml510 reference design device tree
  powerpc/virtex: Add Xilinx ML510 reference design support
  powerpc/virtex: refactor intc driver and add support for i8259 cascading
  powerpc/virtex: Add support for Xilinx PCI host bridge
  ...

1 files changed, 8 insertions, 7 deletions

diff --git a/arch/powerpc/sysdev/fsl_rio.c b/arch/powerpc/sysdev/fsl_rio.c
index abdb124e1e2f..39db9d1155d2 100644
--- a/arch/powerpc/sysdev/fsl_rio.c
+++ b/arch/powerpc/sysdev/fsl_rio.c
@@ -1026,8 +1026,7 @@ int fsl_rio_setup(struct of_device *dev)
                 return -EFAULT;
         }
         dev_info(&dev->dev, "Of-device full name %s\n", dev->node->full_name);
-        dev_info(&dev->dev, "Regs start 0x%08x size 0x%08x\n",  regs.start,
-                                                regs.end - regs.start + 1);
+        dev_info(&dev->dev, "Regs: %pR\n", &regs);
 
         dt_range = of_get_property(dev->node, "ranges", &rlen);
         if (!dt_range) {
@@ -1077,8 +1076,9 @@ int fsl_rio_setup(struct of_device *dev)
 
         INIT_LIST_HEAD(&port->dbells);
         port->iores.start = law_start;
-        port->iores.end = law_start + law_size;
+        port->iores.end = law_start + law_size - 1;
         port->iores.flags = IORESOURCE_MEM;
+        port->iores.name = "rio_io_win";
 
         priv->bellirq = irq_of_parse_and_map(dev->node, 2);
         priv->txirq = irq_of_parse_and_map(dev->node, 3);
@@ -1156,14 +1156,15 @@ int fsl_rio_setup(struct of_device *dev)
                 out_be32((priv->regs_win + RIO_ISR_AACR), RIO_ISR_AACR_AA);
 
         /* Configure maintenance transaction window */
-        out_be32(&priv->maint_atmu_regs->rowbar, 0x000c0000);
-        out_be32(&priv->maint_atmu_regs->rowar, 0x80077015);
+        out_be32(&priv->maint_atmu_regs->rowbar, law_start >> 12);
+        out_be32(&priv->maint_atmu_regs->rowar, 0x80077015);    /* 4M */
 
         priv->maint_win = ioremap(law_start, RIO_MAINT_WIN_SIZE);
 
         /* Configure outbound doorbell window */
-        out_be32(&priv->dbell_atmu_regs->rowbar, 0x000c0400);
-        out_be32(&priv->dbell_atmu_regs->rowar, 0x8004200b);
+        out_be32(&priv->dbell_atmu_regs->rowbar,
+                        (law_start + RIO_MAINT_WIN_SIZE) >> 12);
+        out_be32(&priv->dbell_atmu_regs->rowar, 0x8004200b);    /* 4k */
         fsl_rio_doorbell_init(port);
 
         return 0;