Merge branch 'linux-2.6'

13 files changed, 177 insertions, 55 deletions

diff --git a/arch/powerpc/boot/flatdevtree_env.h b/arch/powerpc/boot/flatdevtree_env.h
index ad0420da892..66e0ebb1a36 100644
--- a/arch/powerpc/boot/flatdevtree_env.h
+++ b/arch/powerpc/boot/flatdevtree_env.h
@@ -2,7 +2,7 @@
  * This file adds the header file glue so that the shared files
  * flatdevicetree.[ch] can compile and work in the powerpc bootwrapper.
  *
- * strncmp & strchr copied from <file:lib/strings.c>
+ * strncmp & strchr copied from <file:lib/string.c>
  * Copyright (C) 1991, 1992  Linus Torvalds
  *
  * Maintained by: Mark A. Greer <mgreer@mvista.com>
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index 47c3fe55242..a3c406aca66 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -278,6 +278,7 @@ int iommu_map_sg(struct iommu_table *tbl, struct scatterlist *sglist,
         unsigned long flags;
         struct scatterlist *s, *outs, *segstart;
         int outcount, incount, i;
+        unsigned int align;
         unsigned long handle;
 
         BUG_ON(direction == DMA_NONE);
@@ -309,7 +310,12 @@ int iommu_map_sg(struct iommu_table *tbl, struct scatterlist *sglist,
                 /* Allocate iommu entries for that segment */
                 vaddr = (unsigned long) sg_virt(s);
                 npages = iommu_num_pages(vaddr, slen);
-                entry = iommu_range_alloc(tbl, npages, &handle, mask >> IOMMU_PAGE_SHIFT, 0);
+                align = 0;
+                if (IOMMU_PAGE_SHIFT < PAGE_SHIFT && slen >= PAGE_SIZE &&
+                    (vaddr & ~PAGE_MASK) == 0)
+                        align = PAGE_SHIFT - IOMMU_PAGE_SHIFT;
+                entry = iommu_range_alloc(tbl, npages, &handle,
+                                          mask >> IOMMU_PAGE_SHIFT, align);
 
                 DBG("  - vaddr: %lx, size: %lx\n", vaddr, slen);
 
@@ -570,7 +576,7 @@ dma_addr_t iommu_map_single(struct iommu_table *tbl, void *vaddr,
 {
         dma_addr_t dma_handle = DMA_ERROR_CODE;
         unsigned long uaddr;
-        unsigned int npages;
+        unsigned int npages, align;
 
         BUG_ON(direction == DMA_NONE);
 
@@ -578,8 +584,13 @@ dma_addr_t iommu_map_single(struct iommu_table *tbl, void *vaddr,
         npages = iommu_num_pages(uaddr, size);
 
         if (tbl) {
+                align = 0;
+                if (IOMMU_PAGE_SHIFT < PAGE_SHIFT && size >= PAGE_SIZE &&
+                    ((unsigned long)vaddr & ~PAGE_MASK) == 0)
+                        align = PAGE_SHIFT - IOMMU_PAGE_SHIFT;
+
                 dma_handle = iommu_alloc(tbl, vaddr, npages, direction,
-                                         mask >> IOMMU_PAGE_SHIFT, 0);
+                                         mask >> IOMMU_PAGE_SHIFT, align);
                 if (dma_handle == DMA_ERROR_CODE) {
                         if (printk_ratelimit())  {
                                 printk(KERN_INFO "iommu_alloc failed, "
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 1add6efdb31..5d89a21dd0d 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -2216,6 +2216,45 @@ static void __init fixup_device_tree_efika(void)
                         prom_printf("fixup_device_tree_efika: ",
                                 "skipped entry %x - setprop error\n", i);
         }
+
+        /* Make sure ethernet mdio bus node exists */
+        node = call_prom("finddevice", 1, 1, ADDR("/builtin/mdio"));
+        if (!PHANDLE_VALID(node)) {
+                prom_printf("Adding Ethernet MDIO node\n");
+                call_prom("interpret", 1, 1,
+                        " s\" /builtin\" find-device"
+                        " new-device"
+                                " 1 encode-int s\" #address-cells\" property"
+                                " 0 encode-int s\" #size-cells\" property"
+                                " s\" mdio\" 2dup device-name device-type"
+                                " s\" mpc5200b-fec-phy\" encode-string"
+                                " s\" compatible\" property"
+                                " 0xf0003000 0x400 reg"
+                                " 0x2 encode-int"
+                                " 0x5 encode-int encode+"
+                                " 0x3 encode-int encode+"
+                                " s\" interrupts\" property"
+                        " finish-device");
+        };
+
+        /* Make sure ethernet phy device node exist */
+        node = call_prom("finddevice", 1, 1, ADDR("/builtin/mdio/ethernet-phy"));
+        if (!PHANDLE_VALID(node)) {
+                prom_printf("Adding Ethernet PHY node\n");
+                call_prom("interpret", 1, 1,
+                        " s\" /builtin/mdio\" find-device"
+                        " new-device"
+                                " s\" ethernet-phy\" device-name"
+                                " 0x10 encode-int s\" reg\" property"
+                                " my-self"
+                                " ihandle>phandle"
+                        " finish-device"
+                        " s\" /builtin/ethernet\" find-device"
+                                " encode-int"
+                                " s\" phy-handle\" property"
+                        " device-end");
+        }
+
 }
 #else
 #define fixup_device_tree_efika()
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c
index 3cf0802cd2b..47b06bad24a 100644
--- a/arch/powerpc/mm/slb.c
+++ b/arch/powerpc/mm/slb.c
@@ -295,6 +295,8 @@ void slb_initialize(void)
 
         create_shadowed_slbe(VMALLOC_START, mmu_kernel_ssize, vflags, 1);
 
+        slb_shadow_clear(2);
+
         /* We don't bolt the stack for the time being - we're in boot,
          * so the stack is in the bolted segment.  By the time it goes
          * elsewhere, we'll call _switch() which will bolt in the new
diff --git a/arch/powerpc/platforms/cell/Kconfig b/arch/powerpc/platforms/cell/Kconfig
index e1e2f6a4301..3a963b4a9be 100644
--- a/arch/powerpc/platforms/cell/Kconfig
+++ b/arch/powerpc/platforms/cell/Kconfig
@@ -88,3 +88,8 @@ config CBE_CPUFREQ_PMI
           but also at lower core voltage.
 
 endmenu
+
+config OPROFILE_CELL
+        def_bool y
+        depends on PPC_CELL_NATIVE && (OPROFILE = m || OPROFILE = y)
+
diff --git a/arch/powerpc/platforms/cell/Makefile b/arch/powerpc/platforms/cell/Makefile
index 3cd565a04d0..c89964c6fb1 100644
--- a/arch/powerpc/platforms/cell/Makefile
+++ b/arch/powerpc/platforms/cell/Makefile
@@ -19,6 +19,7 @@ spu-manage-$(CONFIG_PPC_CELLEB)		+= spu_manage.o
 spu-manage-$(CONFIG_PPC_CELL_NATIVE)    += spu_manage.o
 
 obj-$(CONFIG_SPU_BASE)                  += spu_callbacks.o spu_base.o \
+                                           spu_notify.o \
                                            spu_syscalls.o spu_fault.o \
                                            $(spu-priv1-y) \
                                            $(spu-manage-y) \
diff --git a/arch/powerpc/platforms/cell/spu_notify.c b/arch/powerpc/platforms/cell/spu_notify.c
new file mode 100644
index 00000000000..34d156959f3
--- /dev/null
+++ b/arch/powerpc/platforms/cell/spu_notify.c
@@ -0,0 +1,67 @@
+/*
+ * Move OProfile dependencies from spufs module to the kernel so it
+ * can run on non-cell PPC.
+ *
+ * Copyright (C) IBM 2005
+ *
+ * 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, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#undef DEBUG
+
+#include <linux/module.h>
+#include <asm/spu.h>
+#include "spufs/spufs.h"
+
+static BLOCKING_NOTIFIER_HEAD(spu_switch_notifier);
+
+void spu_switch_notify(struct spu *spu, struct spu_context *ctx)
+{
+        blocking_notifier_call_chain(&spu_switch_notifier,
+                                     ctx ? ctx->object_id : 0, spu);
+}
+EXPORT_SYMBOL_GPL(spu_switch_notify);
+
+int spu_switch_event_register(struct notifier_block *n)
+{
+        int ret;
+        ret = blocking_notifier_chain_register(&spu_switch_notifier, n);
+        if (!ret)
+                notify_spus_active();
+        return ret;
+}
+EXPORT_SYMBOL_GPL(spu_switch_event_register);
+
+int spu_switch_event_unregister(struct notifier_block *n)
+{
+        return blocking_notifier_chain_unregister(&spu_switch_notifier, n);
+}
+EXPORT_SYMBOL_GPL(spu_switch_event_unregister);
+
+void spu_set_profile_private_kref(struct spu_context *ctx,
+                                  struct kref *prof_info_kref,
+                                  void (* prof_info_release) (struct kref *kref))
+{
+        ctx->prof_priv_kref = prof_info_kref;
+        ctx->prof_priv_release = prof_info_release;
+}
+EXPORT_SYMBOL_GPL(spu_set_profile_private_kref);
+
+void *spu_get_profile_private_kref(struct spu_context *ctx)
+{
+        return ctx->prof_priv_kref;
+}
+EXPORT_SYMBOL_GPL(spu_get_profile_private_kref);
+
diff --git a/arch/powerpc/platforms/cell/spu_syscalls.c b/arch/powerpc/platforms/cell/spu_syscalls.c
index a9438b719fe..75530d99eda 100644
--- a/arch/powerpc/platforms/cell/spu_syscalls.c
+++ b/arch/powerpc/platforms/cell/spu_syscalls.c
@@ -145,6 +145,20 @@ int elf_coredump_extra_notes_write(struct file *file, loff_t *foffset)
         return ret;
 }
 
+void notify_spus_active(void)
+{
+        struct spufs_calls *calls;
+
+        calls = spufs_calls_get();
+        if (!calls)
+                return;
+
+        calls->notify_spus_active();
+        spufs_calls_put(calls);
+
+        return;
+}
+
 int register_spu_syscalls(struct spufs_calls *calls)
 {
         if (spufs_calls)
diff --git a/arch/powerpc/platforms/cell/spufs/context.c b/arch/powerpc/platforms/cell/spufs/context.c
index 237e152d31d..133995ed5cc 100644
--- a/arch/powerpc/platforms/cell/spufs/context.c
+++ b/arch/powerpc/platforms/cell/spufs/context.c
@@ -177,19 +177,3 @@ void spu_release_saved(struct spu_context *ctx)
         spu_release(ctx);
 }
 
-void spu_set_profile_private_kref(struct spu_context *ctx,
-                                  struct kref *prof_info_kref,
-                                  void ( * prof_info_release) (struct kref *kref))
-{
-        ctx->prof_priv_kref = prof_info_kref;
-        ctx->prof_priv_release = prof_info_release;
-}
-EXPORT_SYMBOL_GPL(spu_set_profile_private_kref);
-
-void *spu_get_profile_private_kref(struct spu_context *ctx)
-{
-        return ctx->prof_priv_kref;
-}
-EXPORT_SYMBOL_GPL(spu_get_profile_private_kref);
-
-
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index 8c8af11b35b..00d914232af 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -182,15 +182,7 @@ static int node_allowed(struct spu_context *ctx, int node)
         return rval;
 }
 
-static BLOCKING_NOTIFIER_HEAD(spu_switch_notifier);
-
-void spu_switch_notify(struct spu *spu, struct spu_context *ctx)
-{
-        blocking_notifier_call_chain(&spu_switch_notifier,
-                            ctx ? ctx->object_id : 0, spu);
-}
-
-static void notify_spus_active(void)
+void do_notify_spus_active(void)
 {
         int node;
 
@@ -217,22 +209,6 @@ static void notify_spus_active(void)
         }
 }
 
-int spu_switch_event_register(struct notifier_block * n)
-{
-        int ret;
-        ret = blocking_notifier_chain_register(&spu_switch_notifier, n);
-        if (!ret)
-                notify_spus_active();
-        return ret;
-}
-EXPORT_SYMBOL_GPL(spu_switch_event_register);
-
-int spu_switch_event_unregister(struct notifier_block * n)
-{
-        return blocking_notifier_chain_unregister(&spu_switch_notifier, n);
-}
-EXPORT_SYMBOL_GPL(spu_switch_event_unregister);
-
 /**
  * spu_bind_context - bind spu context to physical spu
  * @spu:        physical spu to bind to
diff --git a/arch/powerpc/platforms/cell/spufs/syscalls.c b/arch/powerpc/platforms/cell/spufs/syscalls.c
index 2c34f717019..43040441317 100644
--- a/arch/powerpc/platforms/cell/spufs/syscalls.c
+++ b/arch/powerpc/platforms/cell/spufs/syscalls.c
@@ -86,5 +86,6 @@ struct spufs_calls spufs_calls = {
         .spu_run = do_spu_run,
         .coredump_extra_notes_size = spufs_coredump_extra_notes_size,
         .coredump_extra_notes_write = spufs_coredump_extra_notes_write,
+        .notify_spus_active = do_notify_spus_active,
         .owner = THIS_MODULE,
 };
diff --git a/arch/powerpc/platforms/ps3/os-area.c b/arch/powerpc/platforms/ps3/os-area.c
index 766685ab26f..b9ea09d9d2f 100644
--- a/arch/powerpc/platforms/ps3/os-area.c
+++ b/arch/powerpc/platforms/ps3/os-area.c
@@ -23,6 +23,7 @@
 #include <linux/workqueue.h>
 #include <linux/fs.h>
 #include <linux/syscalls.h>
+#include <linux/ctype.h>
 
 #include <asm/lmb.h>
 
@@ -37,6 +38,8 @@ enum os_area_ldr_format {
         HEADER_LDR_FORMAT_GZIP = 1,
 };
 
+#define OS_AREA_HEADER_MAGIC_NUM "cell_ext_os_area"
+
 /**
  * struct os_area_header - os area header segment.
  * @magic_num: Always 'cell_ext_os_area'.
@@ -114,13 +117,11 @@ struct os_area_params {
         u8 _reserved_5[8];
 };
 
-enum {
-        OS_AREA_DB_MAGIC_NUM = 0x2d64622dU,
-};
+#define OS_AREA_DB_MAGIC_NUM "-db-"
 
 /**
  * struct os_area_db - Shared flash memory database.
- * @magic_num: Always '-db-' = 0x2d64622d.
+ * @magic_num: Always '-db-'.
  * @version: os_area_db format version number.
  * @index_64: byte offset of the database id index for 64 bit variables.
  * @count_64: number of usable 64 bit index entries
@@ -135,7 +136,7 @@ enum {
  */
 
 struct os_area_db {
-        u32 magic_num;
+        u8 magic_num[4];
         u16 version;
         u16 _reserved_1;
         u16 index_64;
@@ -265,12 +266,26 @@ static void __init os_area_get_property(struct device_node *node,
                         prop->name);
 }
 
+static void dump_field(char *s, const u8 *field, int size_of_field)
+{
+#if defined(DEBUG)
+        int i;
+
+        for (i = 0; i < size_of_field; i++)
+                s[i] = isprint(field[i]) ? field[i] : '.';
+        s[i] = 0;
+#endif
+}
+
 #define dump_header(_a) _dump_header(_a, __func__, __LINE__)
 static void _dump_header(const struct os_area_header *h, const char *func,
         int line)
 {
+        char str[sizeof(h->magic_num) + 1];
+
+        dump_field(str, h->magic_num, sizeof(h->magic_num));
         pr_debug("%s:%d: h.magic_num:       '%s'\n", func, line,
-                h->magic_num);
+                str);
         pr_debug("%s:%d: h.hdr_version:     %u\n", func, line,
                 h->hdr_version);
         pr_debug("%s:%d: h.db_area_offset:  %u\n", func, line,
@@ -311,7 +326,8 @@ static void _dump_params(const struct os_area_params *p, const char *func,
 
 static int verify_header(const struct os_area_header *header)
 {
-        if (memcmp(header->magic_num, "cell_ext_os_area", 16)) {
+        if (memcmp(header->magic_num, OS_AREA_HEADER_MAGIC_NUM,
+                sizeof(header->magic_num))) {
                 pr_debug("%s:%d magic_num failed\n", __func__, __LINE__);
                 return -1;
         }
@@ -331,7 +347,8 @@ static int verify_header(const struct os_area_header *header)
 
 static int db_verify(const struct os_area_db *db)
 {
-        if (db->magic_num != OS_AREA_DB_MAGIC_NUM) {
+        if (memcmp(db->magic_num, OS_AREA_DB_MAGIC_NUM,
+                sizeof(db->magic_num))) {
                 pr_debug("%s:%d magic_num failed\n", __func__, __LINE__);
                 return -1;
         }
@@ -484,8 +501,11 @@ static int db_get_rtc_diff(const struct os_area_db *db, int64_t *rtc_diff)
 static void _dump_db(const struct os_area_db *db, const char *func,
         int line)
 {
+        char str[sizeof(db->magic_num) + 1];
+
+        dump_field(str, db->magic_num, sizeof(db->magic_num));
         pr_debug("%s:%d: db.magic_num:      '%s'\n", func, line,
-                (const char*)&db->magic_num);
+                str);
         pr_debug("%s:%d: db.version:         %u\n", func, line,
                 db->version);
         pr_debug("%s:%d: db.index_64:        %u\n", func, line,
@@ -516,7 +536,7 @@ static void os_area_db_init(struct os_area_db *db)
 
         memset(db, 0, sizeof(struct os_area_db));
 
-        db->magic_num = OS_AREA_DB_MAGIC_NUM;
+        memcpy(db->magic_num, OS_AREA_DB_MAGIC_NUM, sizeof(db->magic_num));
         db->version = 1;
         db->index_64 = HEADER_SIZE;
         db->count_64 = VALUES_64_COUNT;
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index fc48b96c81b..412e6b42986 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -29,6 +29,7 @@
 #include <asm/vdso_datapage.h>
 #include <asm/pSeries_reconfig.h>
 #include "xics.h"
+#include "plpar_wrappers.h"
 
 /* This version can't take the spinlock, because it never returns */
 static struct rtas_args rtas_stop_self_args = {
@@ -58,6 +59,7 @@ static void pseries_mach_cpu_die(void)
         local_irq_disable();
         idle_task_exit();
         xics_teardown_cpu(0);
+        unregister_slb_shadow(hard_smp_processor_id(), __pa(get_slb_shadow()));
         rtas_stop_self();
         /* Should never get here... */
         BUG();