Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

9 files changed, 192 insertions, 58 deletions

diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index c14d7d8d96c8..5cc3279559a4 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -2,13 +2,18 @@ config PPC_CELL
         bool
         default n
 
-config PPC_CELL_NATIVE
+config PPC_CELL_COMMON
         bool
         select PPC_CELL
         select PPC_DCR_MMIO
-        select PPC_OF_PLATFORM_PCI
         select PPC_INDIRECT_IO
         select PPC_NATIVE
+        select PPC_RTAS
+
+config PPC_CELL_NATIVE
+        bool
+        select PPC_CELL_COMMON
+        select PPC_OF_PLATFORM_PCI
         select MPIC
         select IBM_NEW_EMAC_EMAC4
         select IBM_NEW_EMAC_RGMII
@@ -20,7 +25,6 @@ config PPC_IBM_CELL_BLADE
         bool "IBM Cell Blade"
         depends on PPC_MULTIPLATFORM && PPC64
         select PPC_CELL_NATIVE
-        select PPC_RTAS
         select MMIO_NVRAM
         select PPC_UDBG_16550
         select UDBG_RTAS_CONSOLE
@@ -28,16 +32,17 @@ config PPC_IBM_CELL_BLADE
 config PPC_CELLEB
         bool "Toshiba's Cell Reference Set 'Celleb' Architecture"
         depends on PPC_MULTIPLATFORM && PPC64
-        select PPC_CELL
         select PPC_CELL_NATIVE
-        select PPC_RTAS
-        select PPC_INDIRECT_IO
-        select PPC_OF_PLATFORM_PCI
         select HAS_TXX9_SERIAL
         select PPC_UDBG_BEAT
         select USB_OHCI_BIG_ENDIAN_MMIO
         select USB_EHCI_BIG_ENDIAN_MMIO
 
+config PPC_CELL_QPACE
+        bool "IBM Cell - QPACE"
+        depends on PPC_MULTIPLATFORM && PPC64
+        select PPC_CELL_COMMON
+
 menu "Cell Broadband Engine options"
         depends on PPC_CELL
 
@@ -102,7 +107,7 @@ config PPC_IBM_CELL_POWERBUTTON
 config CBE_THERM
         tristate "CBE thermal support"
         default m
-        depends on CBE_RAS
+        depends on CBE_RAS && SPU_BASE
 
 config CBE_CPUFREQ
         tristate "CBE frequency scaling"
@@ -136,5 +141,5 @@ endmenu
 
 config OPROFILE_CELL
         def_bool y
-        depends on PPC_CELL_NATIVE && (OPROFILE = m || OPROFILE = y)
+        depends on PPC_CELL_NATIVE && (OPROFILE = m || OPROFILE = y) && SPU_BASE
 
diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index 7fd830872c43..43eccb270301 100644
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -1,7 +1,7 @@
-obj-$(CONFIG_PPC_CELL_NATIVE)           += interrupt.o iommu.o setup.o \
-                                           cbe_regs.o spider-pic.o \
-                                           pervasive.o pmu.o io-workarounds.o \
-                                           spider-pci.o
+obj-$(CONFIG_PPC_CELL_COMMON)           += cbe_regs.o interrupt.o pervasive.o
+
+obj-$(CONFIG_PPC_CELL_NATIVE)           += iommu.o setup.o spider-pic.o \
+                                           pmu.o io-workarounds.o spider-pci.o
 obj-$(CONFIG_CBE_RAS)                   += ras.o
 
 obj-$(CONFIG_CBE_THERM)                 += cbe_thermal.o
@@ -14,13 +14,12 @@ obj-$(CONFIG_PPC_IBM_CELL_POWERBUTTON)	+= cbe_powerbutton.o
 
 ifeq ($(CONFIG_SMP),y)
 obj-$(CONFIG_PPC_CELL_NATIVE)           += smp.o
+obj-$(CONFIG_PPC_CELL_QPACE)            += smp.o
 endif
 
 # needed only when building loadable spufs.ko
-spu-priv1-$(CONFIG_PPC_CELL_NATIVE)     += spu_priv1_mmio.o
-
-spu-manage-$(CONFIG_PPC_CELLEB)         += spu_manage.o
-spu-manage-$(CONFIG_PPC_CELL_NATIVE)    += spu_manage.o
+spu-priv1-$(CONFIG_PPC_CELL_COMMON)     += spu_priv1_mmio.o
+spu-manage-$(CONFIG_PPC_CELL_COMMON)    += spu_manage.o
 
 obj-$(CONFIG_SPU_BASE)                  += spu_callbacks.o spu_base.o \
                                            spu_notify.o \
@@ -31,6 +30,8 @@ obj-$(CONFIG_SPU_BASE)			+= spu_callbacks.o spu_base.o \
 
 obj-$(CONFIG_PCI_MSI)                   += axon_msi.o
 
+# qpace setup
+obj-$(CONFIG_PPC_CELL_QPACE)            += qpace_setup.o
 
 # celleb stuff
 ifeq ($(CONFIG_PPC_CELLEB),y)
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index 442cf36aa172..0ce45c2b42f8 100644
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -413,6 +413,9 @@ static int axon_msi_probe(struct of_device *device,
                         MSIC_CTRL_IRQ_ENABLE | MSIC_CTRL_ENABLE |
                         MSIC_CTRL_FIFO_SIZE);
 
+        msic->read_offset = dcr_read(msic->dcr_host, MSIC_WRITE_OFFSET_REG)
+                                & MSIC_FIFO_SIZE_MASK;
+
         device->dev.platform_data = msic;
 
         ppc_md.setup_msi_irqs = axon_msi_setup_msi_irqs;
diff --git a/arch/powerpc/platforms/cell/celleb_setup.c b/arch/powerpc/platforms/cell/celleb_setup.c
index b11cb30decb2..07c234f6b2b6 100644
--- a/arch/powerpc/platforms/cell/celleb_setup.c
+++ b/arch/powerpc/platforms/cell/celleb_setup.c
@@ -45,7 +45,6 @@
 #include <asm/mmu.h>
 #include <asm/processor.h>
 #include <asm/io.h>
-#include <asm/kexec.h>
 #include <asm/prom.h>
 #include <asm/machdep.h>
 #include <asm/cputable.h>
@@ -226,9 +225,6 @@ define_machine(celleb_beat) {
         .pci_setup_phb          = celleb_setup_phb,
 #ifdef CONFIG_KEXEC
         .kexec_cpu_down         = beat_kexec_cpu_down,
-        .machine_kexec          = default_machine_kexec,
-        .machine_kexec_prepare  = default_machine_kexec_prepare,
-        .machine_crash_shutdown = default_machine_crash_shutdown,
 #endif
 };
 
@@ -248,9 +244,4 @@ define_machine(celleb_native) {
         .pci_probe_mode         = celleb_pci_probe_mode,
         .pci_setup_phb          = celleb_setup_phb,
         .init_IRQ               = celleb_init_IRQ_native,
-#ifdef CONFIG_KEXEC
-        .machine_kexec          = default_machine_kexec,
-        .machine_kexec_prepare  = default_machine_kexec_prepare,
-        .machine_crash_shutdown = default_machine_crash_shutdown,
-#endif
 };
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index 3168272ab0d7..86db4dd170a0 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -1053,10 +1053,7 @@ static int __init cell_iommu_fixed_mapping_init(void)
         }
 
         /* We must have dma-ranges properties for fixed mapping to work */
-        for (np = NULL; (np = of_find_all_nodes(np));) {
-                if (of_find_property(np, "dma-ranges", NULL))
-                        break;
-        }
+        np = of_find_node_with_property(NULL, "dma-ranges");
         of_node_put(np);
 
         if (!np) {
diff --git a/arch/powerpc/platforms/cell/qpace_setup.c b/arch/powerpc/platforms/cell/qpace_setup.c
new file mode 100644
index 000000000000..be84e6a16b30
--- /dev/null
+++ b/arch/powerpc/platforms/cell/qpace_setup.c
@@ -0,0 +1,152 @@
+/*
+ *  linux/arch/powerpc/platforms/cell/qpace_setup.c
+ *
+ *  Copyright (C) 1995  Linus Torvalds
+ *  Adapted from 'alpha' version by Gary Thomas
+ *  Modified by Cort Dougan (cort@cs.nmt.edu)
+ *  Modified by PPC64 Team, IBM Corp
+ *  Modified by Cell Team, IBM Deutschland Entwicklung GmbH
+ *  Modified by Benjamin Krill <ben@codiert.org>, IBM Corp.
+ *
+ * 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/sched.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/irq.h>
+#include <linux/console.h>
+#include <linux/of_platform.h>
+
+#include <asm/mmu.h>
+#include <asm/processor.h>
+#include <asm/io.h>
+#include <asm/kexec.h>
+#include <asm/pgtable.h>
+#include <asm/prom.h>
+#include <asm/rtas.h>
+#include <asm/dma.h>
+#include <asm/machdep.h>
+#include <asm/time.h>
+#include <asm/cputable.h>
+#include <asm/irq.h>
+#include <asm/spu.h>
+#include <asm/spu_priv1.h>
+#include <asm/udbg.h>
+#include <asm/cell-regs.h>
+
+#include "interrupt.h"
+#include "pervasive.h"
+#include "ras.h"
+#include "io-workarounds.h"
+
+static void qpace_show_cpuinfo(struct seq_file *m)
+{
+        struct device_node *root;
+        const char *model = "";
+
+        root = of_find_node_by_path("/");
+        if (root)
+                model = of_get_property(root, "model", NULL);
+        seq_printf(m, "machine\t\t: CHRP %s\n", model);
+        of_node_put(root);
+}
+
+static void qpace_progress(char *s, unsigned short hex)
+{
+        printk("*** %04x : %s\n", hex, s ? s : "");
+}
+
+static int __init qpace_publish_devices(void)
+{
+        int node;
+
+        /* Publish OF platform devices for southbridge IOs */
+        of_platform_bus_probe(NULL, NULL, NULL);
+
+        /* There is no device for the MIC memory controller, thus we create
+         * a platform device for it to attach the EDAC driver to.
+         */
+        for_each_online_node(node) {
+                if (cbe_get_cpu_mic_tm_regs(cbe_node_to_cpu(node)) == NULL)
+                        continue;
+                platform_device_register_simple("cbe-mic", node, NULL, 0);
+        }
+
+        return 0;
+}
+machine_subsys_initcall(qpace, qpace_publish_devices);
+
+extern int qpace_notify(struct device *dev)
+{
+        /* set dma_ops for of_platform bus */
+        if (dev->bus && dev->bus->name
+                        && !strcmp(dev->bus->name, "of_platform"))
+                set_dma_ops(dev, &dma_direct_ops);
+
+        return 0;
+}
+
+static void __init qpace_setup_arch(void)
+{
+#ifdef CONFIG_SPU_BASE
+        spu_priv1_ops = &spu_priv1_mmio_ops;
+        spu_management_ops = &spu_management_of_ops;
+#endif
+
+        cbe_regs_init();
+
+#ifdef CONFIG_CBE_RAS
+        cbe_ras_init();
+#endif
+
+#ifdef CONFIG_SMP
+        smp_init_cell();
+#endif
+
+        /* init to some ~sane value until calibrate_delay() runs */
+        loops_per_jiffy = 50000000;
+
+        cbe_pervasive_init();
+#ifdef CONFIG_DUMMY_CONSOLE
+        conswitchp = &dummy_con;
+#endif
+
+        /* set notifier function */
+        platform_notify = &qpace_notify;
+}
+
+static int __init qpace_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (!of_flat_dt_is_compatible(root, "IBM,QPACE"))
+                return 0;
+
+        hpte_init_native();
+
+        return 1;
+}
+
+define_machine(qpace) {
+        .name                   = "QPACE",
+        .probe                  = qpace_probe,
+        .setup_arch             = qpace_setup_arch,
+        .show_cpuinfo           = qpace_show_cpuinfo,
+        .restart                = rtas_restart,
+        .power_off              = rtas_power_off,
+        .halt                   = rtas_halt,
+        .get_boot_time          = rtas_get_boot_time,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = qpace_progress,
+        .init_IRQ               = iic_init_IRQ,
+#ifdef CONFIG_KEXEC
+        .machine_kexec          = default_machine_kexec,
+        .machine_kexec_prepare  = default_machine_kexec_prepare,
+        .machine_crash_shutdown = default_machine_crash_shutdown,
+#endif
+};
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
index ab721b50fbba..59305369f6b2 100644
--- a/arch/powerpc/platforms/cell/setup.c
+++ b/arch/powerpc/platforms/cell/setup.c
@@ -35,7 +35,6 @@
 #include <asm/mmu.h>
 #include <asm/processor.h>
 #include <asm/io.h>
-#include <asm/kexec.h>
 #include <asm/pgtable.h>
 #include <asm/prom.h>
 #include <asm/rtas.h>
@@ -289,9 +288,4 @@ define_machine(cell) {
         .progress               = cell_progress,
         .init_IRQ               = cell_init_irq,
         .pci_setup_phb          = cell_setup_phb,
-#ifdef CONFIG_KEXEC
-        .machine_kexec          = default_machine_kexec,
-        .machine_kexec_prepare  = default_machine_kexec_prepare,
-        .machine_crash_shutdown = default_machine_crash_shutdown,
-#endif
 };
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index 1b26071a86ca..7106b63d401b 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -273,12 +273,10 @@ spufs_mem_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
                 return VM_FAULT_NOPAGE;
 
         if (ctx->state == SPU_STATE_SAVED) {
-                vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
-                                                        & ~_PAGE_NO_CACHE);
+                vma->vm_page_prot = pgprot_cached(vma->vm_page_prot);
                 pfn = vmalloc_to_pfn(ctx->csa.lscsa->ls + offset);
         } else {
-                vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
-                                             | _PAGE_NO_CACHE);
+                vma->vm_page_prot = pgprot_noncached_wc(vma->vm_page_prot);
                 pfn = (ctx->spu->local_store_phys + offset) >> PAGE_SHIFT;
         }
         vm_insert_pfn(vma, address, pfn);
@@ -338,8 +336,7 @@ static int spufs_mem_mmap(struct file *file, struct vm_area_struct *vma)
                 return -EINVAL;
 
         vma->vm_flags |= VM_IO | VM_PFNMAP;
-        vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
-                                     | _PAGE_NO_CACHE);
+        vma->vm_page_prot = pgprot_noncached_wc(vma->vm_page_prot);
 
         vma->vm_ops = &spufs_mem_mmap_vmops;
         return 0;
@@ -452,8 +449,7 @@ static int spufs_cntl_mmap(struct file *file, struct vm_area_struct *vma)
                 return -EINVAL;
 
         vma->vm_flags |= VM_IO | VM_PFNMAP;
-        vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
-                                     | _PAGE_NO_CACHE | _PAGE_GUARDED);
+        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 
         vma->vm_ops = &spufs_cntl_mmap_vmops;
         return 0;
@@ -1155,8 +1151,7 @@ static int spufs_signal1_mmap(struct file *file, struct vm_area_struct *vma)
                 return -EINVAL;
 
         vma->vm_flags |= VM_IO | VM_PFNMAP;
-        vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
-                                     | _PAGE_NO_CACHE | _PAGE_GUARDED);
+        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 
         vma->vm_ops = &spufs_signal1_mmap_vmops;
         return 0;
@@ -1292,8 +1287,7 @@ static int spufs_signal2_mmap(struct file *file, struct vm_area_struct *vma)
                 return -EINVAL;
 
         vma->vm_flags |= VM_IO | VM_PFNMAP;
-        vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
-                                     | _PAGE_NO_CACHE | _PAGE_GUARDED);
+        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 
         vma->vm_ops = &spufs_signal2_mmap_vmops;
         return 0;
@@ -1414,8 +1408,7 @@ static int spufs_mss_mmap(struct file *file, struct vm_area_struct *vma)
                 return -EINVAL;
 
         vma->vm_flags |= VM_IO | VM_PFNMAP;
-        vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
-                                     | _PAGE_NO_CACHE | _PAGE_GUARDED);
+        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 
         vma->vm_ops = &spufs_mss_mmap_vmops;
         return 0;
@@ -1476,8 +1469,7 @@ static int spufs_psmap_mmap(struct file *file, struct vm_area_struct *vma)
                 return -EINVAL;
 
         vma->vm_flags |= VM_IO | VM_PFNMAP;
-        vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
-                                     | _PAGE_NO_CACHE | _PAGE_GUARDED);
+        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 
         vma->vm_ops = &spufs_psmap_mmap_vmops;
         return 0;
@@ -1536,8 +1528,7 @@ static int spufs_mfc_mmap(struct file *file, struct vm_area_struct *vma)
                 return -EINVAL;
 
         vma->vm_flags |= VM_IO | VM_PFNMAP;
-        vma->vm_page_prot = __pgprot(pgprot_val(vma->vm_page_prot)
-                                     | _PAGE_NO_CACHE | _PAGE_GUARDED);
+        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 
         vma->vm_ops = &spufs_mfc_mmap_vmops;
         return 0;
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index cb85d237e492..6296bfd9cb0b 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -95,8 +95,8 @@ spufs_new_inode(struct super_block *sb, int mode)
                 goto out;
 
         inode->i_mode = mode;
-        inode->i_uid = current->fsuid;
-        inode->i_gid = current->fsgid;
+        inode->i_uid = current_fsuid();
+        inode->i_gid = current_fsgid();
         inode->i_blocks = 0;
         inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
 out:
@@ -323,7 +323,7 @@ static int spufs_context_open(struct dentry *dentry, struct vfsmount *mnt)
                 goto out;
         }
 
-        filp = dentry_open(dentry, mnt, O_RDONLY);
+        filp = dentry_open(dentry, mnt, O_RDONLY, current_cred());
         if (IS_ERR(filp)) {
                 put_unused_fd(ret);
                 ret = PTR_ERR(filp);
@@ -562,7 +562,7 @@ static int spufs_gang_open(struct dentry *dentry, struct vfsmount *mnt)
                 goto out;
         }
 
-        filp = dentry_open(dentry, mnt, O_RDONLY);
+        filp = dentry_open(dentry, mnt, O_RDONLY, current_cred());
         if (IS_ERR(filp)) {
                 put_unused_fd(ret);
                 ret = PTR_ERR(filp);