Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.25

5 files changed, 71 insertions, 68 deletions

diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index d9b377070caa..58dbfeff9b4d 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -70,6 +70,7 @@ pci64-$(CONFIG_PPC64)		+= pci_dn.o isa-bridge.o
 obj-$(CONFIG_PCI)               += pci_$(CONFIG_WORD_SIZE).o $(pci64-y) \
                                    pci-common.o
 obj-$(CONFIG_PCI_MSI)           += msi.o
+obj-$(CONFIG_RAPIDIO)           += rio.o
 obj-$(CONFIG_KEXEC)             += machine_kexec.o crash.o \
                                    machine_kexec_$(CONFIG_WORD_SIZE).o
 obj-$(CONFIG_AUDIT)             += audit.o
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index 7aecb39a5a45..d9cc2c288d9e 100644
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -73,8 +73,8 @@ _ENTRY(_start);
 /* We try to not make any assumptions about how the boot loader
  * setup or used the TLBs.  We invalidate all mappings from the
  * boot loader and load a single entry in TLB1[0] to map the
- * first 16M of kernel memory.  Any boot info passed from the
- * bootloader needs to live in this first 16M.
+ * first 64M of kernel memory.  Any boot info passed from the
+ * bootloader needs to live in this first 64M.
  *
  * Requirement on bootloader:
  *  - The page we're executing in needs to reside in TLB1 and
@@ -167,7 +167,7 @@ skpinv:	addi	r6,r6,1				/* Increment */
         mtspr   SPRN_MAS0,r7
         tlbre
 
-        /* Just modify the entry ID and EPN for the temp mapping */
+        /* Just modify the entry ID, EPN and RPN for the temp mapping */
         lis     r7,0x1000       /* Set MAS0(TLBSEL) = 1 */
         rlwimi  r7,r5,16,4,15   /* Setup MAS0 = TLBSEL | ESEL(r5) */
         mtspr   SPRN_MAS0,r7
@@ -177,9 +177,12 @@ skpinv:	addi	r6,r6,1				/* Increment */
         ori     r6,r6,(MAS1_TSIZE(BOOKE_PAGESZ_4K))@l
         mtspr   SPRN_MAS1,r6
         mfspr   r6,SPRN_MAS2
-        li      r7,0            /* temp EPN = 0 */
+        lis     r7,PHYSICAL_START@h
         rlwimi  r7,r6,0,20,31
         mtspr   SPRN_MAS2,r7
+        mfspr   r6,SPRN_MAS3
+        rlwimi  r7,r6,0,20,31
+        mtspr   SPRN_MAS3,r7
         tlbwe
 
         xori    r6,r4,1
@@ -222,11 +225,11 @@ skpinv:	addi	r6,r6,1				/* Increment */
         lis     r6,0x1000               /* Set MAS0(TLBSEL) = TLB1(1), ESEL = 0 */
         mtspr   SPRN_MAS0,r6
         lis     r6,(MAS1_VALID|MAS1_IPROT)@h
-        ori     r6,r6,(MAS1_TSIZE(BOOKE_PAGESZ_16M))@l
+        ori     r6,r6,(MAS1_TSIZE(BOOKE_PAGESZ_64M))@l
         mtspr   SPRN_MAS1,r6
         li      r7,0
-        lis     r6,KERNELBASE@h
-        ori     r6,r6,KERNELBASE@l
+        lis     r6,PAGE_OFFSET@h
+        ori     r6,r6,PAGE_OFFSET@l
         rlwimi  r6,r7,0,20,31
         mtspr   SPRN_MAS2,r6
         li      r7,(MAS3_SX|MAS3_SW|MAS3_SR)
@@ -234,6 +237,9 @@ skpinv:	addi	r6,r6,1				/* Increment */
         tlbwe
 
 /* 7. Jump to KERNELBASE mapping */
+        lis     r6,KERNELBASE@h
+        ori     r6,r6,KERNELBASE@l
+        rlwimi  r6,r7,0,20,31
         lis     r7,MSR_KERNEL@h
         ori     r7,r7,MSR_KERNEL@l
         bl      1f                      /* Find our address */
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index d394d41b61d5..980fe32895c0 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -792,9 +792,10 @@ static void __devinit __pcibios_fixup_bus(struct pci_bus *bus)
                 for (i = 0; i < PCI_BUS_NUM_RESOURCES; ++i) {
                         if ((res = bus->resource[i]) == NULL)
                                 continue;
-                        if (!res->flags || bus->self->transparent)
+                        if (!res->flags)
+                                continue;
+                        if (i >= 3 && bus->self->transparent)
                                 continue;
-
                         /* On PowerMac, Apple leaves bridge windows open over
                          * an inaccessible region of memory space (0...fffff)
                          * which is somewhat bogus, but that's what they think
@@ -806,7 +807,8 @@ static void __devinit __pcibios_fixup_bus(struct pci_bus *bus)
                          * equal to the pci_mem_offset of the host bridge and
                          * their size is smaller than 1M.
                          */
-                        if (res->start == hose->pci_mem_offset &&
+                        if (res->flags & IORESOURCE_MEM &&
+                            res->start == hose->pci_mem_offset &&
                             res->end < 0x100000) {
                                 printk(KERN_INFO
                                        "PCI: Closing bogus Apple Firmware"
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index 14e300f85ce4..88db4ffaf11c 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -94,64 +94,6 @@ fixup_cpc710_pci64(struct pci_dev* dev)
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_IBM,     PCI_DEVICE_ID_IBM_CPC710_PCI64, fixup_cpc710_pci64);
 
-
-void __init
-update_bridge_resource(struct pci_dev *dev, struct resource *res)
-{
-        u8 io_base_lo, io_limit_lo;
-        u16 mem_base, mem_limit;
-        u16 cmd;
-        resource_size_t start, end, off;
-        struct pci_controller *hose = dev->sysdata;
-
-        if (!hose) {
-                printk("update_bridge_base: no hose?\n");
-                return;
-        }
-        pci_read_config_word(dev, PCI_COMMAND, &cmd);
-        pci_write_config_word(dev, PCI_COMMAND,
-                              cmd & ~(PCI_COMMAND_IO | PCI_COMMAND_MEMORY));
-        if (res->flags & IORESOURCE_IO) {
-                off = (unsigned long) hose->io_base_virt - isa_io_base;
-                start = res->start - off;
-                end = res->end - off;
-                io_base_lo = (start >> 8) & PCI_IO_RANGE_MASK;
-                io_limit_lo = (end >> 8) & PCI_IO_RANGE_MASK;
-                if (end > 0xffff)
-                        io_base_lo |= PCI_IO_RANGE_TYPE_32;
-                else
-                        io_base_lo |= PCI_IO_RANGE_TYPE_16;
-                pci_write_config_word(dev, PCI_IO_BASE_UPPER16,
-                                start >> 16);
-                pci_write_config_word(dev, PCI_IO_LIMIT_UPPER16,
-                                end >> 16);
-                pci_write_config_byte(dev, PCI_IO_BASE, io_base_lo);
-                pci_write_config_byte(dev, PCI_IO_LIMIT, io_limit_lo);
-
-        } else if ((res->flags & (IORESOURCE_MEM | IORESOURCE_PREFETCH))
-                   == IORESOURCE_MEM) {
-                off = hose->pci_mem_offset;
-                mem_base = ((res->start - off) >> 16) & PCI_MEMORY_RANGE_MASK;
-                mem_limit = ((res->end - off) >> 16) & PCI_MEMORY_RANGE_MASK;
-                pci_write_config_word(dev, PCI_MEMORY_BASE, mem_base);
-                pci_write_config_word(dev, PCI_MEMORY_LIMIT, mem_limit);
-
-        } else if ((res->flags & (IORESOURCE_MEM | IORESOURCE_PREFETCH))
-                   == (IORESOURCE_MEM | IORESOURCE_PREFETCH)) {
-                off = hose->pci_mem_offset;
-                mem_base = ((res->start - off) >> 16) & PCI_PREF_RANGE_MASK;
-                mem_limit = ((res->end - off) >> 16) & PCI_PREF_RANGE_MASK;
-                pci_write_config_word(dev, PCI_PREF_MEMORY_BASE, mem_base);
-                pci_write_config_word(dev, PCI_PREF_MEMORY_LIMIT, mem_limit);
-
-        } else {
-                DBG(KERN_ERR "PCI: ugh, bridge %s res has flags=%lx\n",
-                    pci_name(dev), res->flags);
-        }
-        pci_write_config_word(dev, PCI_COMMAND, cmd);
-}
-
-
 #ifdef CONFIG_PPC_OF
 /*
  * Functions below are used on OpenFirmware machines.
diff --git a/arch/powerpc/kernel/rio.c b/arch/powerpc/kernel/rio.c
new file mode 100644
index 000000000000..29487fedfc76
--- /dev/null
+++ b/arch/powerpc/kernel/rio.c
@@ -0,0 +1,52 @@
+/*
+ * RapidIO PPC32 support
+ *
+ * Copyright 2005 MontaVista Software, Inc.
+ * Matt Porter <mporter@kernel.crashing.org>
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/rio.h>
+
+#include <asm/rio.h>
+
+/**
+ * platform_rio_init - Do platform specific RIO init
+ *
+ * Any platform specific initialization of RapdIO
+ * hardware is done here as well as registration
+ * of any active master ports in the system.
+ */
+void __attribute__ ((weak))
+    platform_rio_init(void)
+{
+        printk(KERN_WARNING "RIO: No platform_rio_init() present\n");
+}
+
+/**
+ * ppc_rio_init - Do PPC32 RIO init
+ *
+ * Calls platform-specific RIO init code and then calls
+ * rio_init_mports() to initialize any master ports that
+ * have been registered with the RIO subsystem.
+ */
+static int __init ppc_rio_init(void)
+{
+        printk(KERN_INFO "RIO: RapidIO init\n");
+
+        /* Platform specific initialization */
+        platform_rio_init();
+
+        /* Enumerate all registered ports */
+        rio_init_mports();
+
+        return 0;
+}
+
+subsys_initcall(ppc_rio_init);