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

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (62 commits)
  powerpc/85xx: Fix signedness bug in cache-sram
  powerpc/fsl: 85xx: document cache sram bindings
  powerpc/fsl: define binding for fsl mpic interrupt controllers
  powerpc/fsl_msi: Handle msi-available-ranges better
  drivers/serial/ucc_uart.c: Add of_node_put to avoid memory leak
  powerpc/85xx: Fix SPE float to integer conversion failure
  powerpc/85xx: Update sata controller compatible for p1022ds board
  ATA: Add FSL sata v2 controller support
  powerpc/mpc8xxx_gpio: simplify searching for 'fsl, qoriq-gpio' compatiable
  powerpc/8xx: remove obsolete mgsuvd board
  powerpc/82xx: rename and update mgcoge board support
  powerpc/83xx: rename and update kmeter1
  powerpc/85xx: Workaroudn e500 CPU erratum A005
  powerpc/fsl_pci: Add support for FSL PCIe controllers v2.x
  powerpc/85xx: Fix writing to spin table 'cpu-release-addr' on ppc64e
  powerpc/pseries: Disable MSI using new interface if possible
  powerpc: Enable GENERIC_HARDIRQS_NO_DEPRECATED.
  powerpc: core irq_data conversion.
  powerpc: sysdev/xilinx_intc irq_data conversion.
  powerpc: sysdev/uic irq_data conversion.
  ...

Fix up conflicts in arch/powerpc/sysdev/fsl_msi.c (due to getting rid of
of_platform_driver in arch/powerpc)

6 files changed, 85 insertions, 49 deletions

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index e8e915ce3d8d..c9b68d07ac4f 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -1811,11 +1811,11 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .machine_check          = machine_check_440A,
                 .platform               = "ppc440",
         },
-        { /* 476 core */
-                .pvr_mask               = 0xffff0000,
-                .pvr_value              = 0x11a50000,
+        { /* 476 DD2 core */
+                .pvr_mask               = 0xffffffff,
+                .pvr_value              = 0x11a52080,
                 .cpu_name               = "476",
-                .cpu_features           = CPU_FTRS_47X,
+                .cpu_features           = CPU_FTRS_47X | CPU_FTR_476_DD2,
                 .cpu_user_features      = COMMON_USER_BOOKE |
                         PPC_FEATURE_HAS_FPU,
                 .mmu_features           = MMU_FTR_TYPE_47x |
@@ -1839,6 +1839,20 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .machine_check          = machine_check_47x,
                 .platform               = "ppc470",
         },
+        { /* 476 others */
+                .pvr_mask               = 0xffff0000,
+                .pvr_value              = 0x11a50000,
+                .cpu_name               = "476",
+                .cpu_features           = CPU_FTRS_47X,
+                .cpu_user_features      = COMMON_USER_BOOKE |
+                        PPC_FEATURE_HAS_FPU,
+                .mmu_features           = MMU_FTR_TYPE_47x |
+                        MMU_FTR_USE_TLBIVAX_BCAST | MMU_FTR_LOCK_BCAST_INVAL,
+                .icache_bsize           = 32,
+                .dcache_bsize           = 128,
+                .machine_check          = machine_check_47x,
+                .platform               = "ppc470",
+        },
         {       /* default match */
                 .pvr_mask               = 0x00000000,
                 .pvr_value              = 0x00000000,
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index ce557f6f00fc..0a5570338b96 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -237,6 +237,7 @@ int show_interrupts(struct seq_file *p, void *v)
         int i = *(loff_t *) v, j, prec;
         struct irqaction *action;
         struct irq_desc *desc;
+        struct irq_chip *chip;
 
         if (i > nr_irqs)
                 return 0;
@@ -270,8 +271,9 @@ int show_interrupts(struct seq_file *p, void *v)
         for_each_online_cpu(j)
                 seq_printf(p, "%10u ", kstat_irqs_cpu(i, j));
 
-        if (desc->chip)
-                seq_printf(p, "  %-16s", desc->chip->name);
+        chip = get_irq_desc_chip(desc);
+        if (chip)
+                seq_printf(p, "  %-16s", chip->name);
         else
                 seq_printf(p, "  %-16s", "None");
         seq_printf(p, " %-8s", (desc->status & IRQ_LEVEL) ? "Level" : "Edge");
@@ -313,6 +315,8 @@ void fixup_irqs(const struct cpumask *map)
         alloc_cpumask_var(&mask, GFP_KERNEL);
 
         for_each_irq(irq) {
+                struct irq_chip *chip;
+
                 desc = irq_to_desc(irq);
                 if (!desc)
                         continue;
@@ -320,13 +324,15 @@ void fixup_irqs(const struct cpumask *map)
                 if (desc->status & IRQ_PER_CPU)
                         continue;
 
-                cpumask_and(mask, desc->affinity, map);
+                chip = get_irq_desc_chip(desc);
+
+                cpumask_and(mask, desc->irq_data.affinity, map);
                 if (cpumask_any(mask) >= nr_cpu_ids) {
                         printk("Breaking affinity for irq %i\n", irq);
                         cpumask_copy(mask, map);
                 }
-                if (desc->chip->set_affinity)
-                        desc->chip->set_affinity(irq, mask);
+                if (chip->irq_set_affinity)
+                        chip->irq_set_affinity(&desc->irq_data, mask, true);
                 else if (desc->action && !(warned++))
                         printk("Cannot set affinity for irq %i\n", irq);
         }
@@ -678,16 +684,15 @@ void irq_set_virq_count(unsigned int count)
 static int irq_setup_virq(struct irq_host *host, unsigned int virq,
                             irq_hw_number_t hwirq)
 {
-        struct irq_desc *desc;
+        int res;
 
-        desc = irq_to_desc_alloc_node(virq, 0);
-        if (!desc) {
+        res = irq_alloc_desc_at(virq, 0);
+        if (res != virq) {
                 pr_debug("irq: -> allocating desc failed\n");
                 goto error;
         }
 
-        /* Clear IRQ_NOREQUEST flag */
-        desc->status &= ~IRQ_NOREQUEST;
+        irq_clear_status_flags(virq, IRQ_NOREQUEST);
 
         /* map it */
         smp_wmb();
@@ -696,11 +701,13 @@ static int irq_setup_virq(struct irq_host *host, unsigned int virq,
 
         if (host->ops->map(host, virq, hwirq)) {
                 pr_debug("irq: -> mapping failed, freeing\n");
-                goto error;
+                goto errdesc;
         }
 
         return 0;
 
+errdesc:
+        irq_free_descs(virq, 1);
 error:
         irq_free_virt(virq, 1);
         return -1;
@@ -879,9 +886,9 @@ void irq_dispose_mapping(unsigned int virq)
         smp_mb();
         irq_map[virq].hwirq = host->inval_irq;
 
-        /* Set some flags */
-        irq_to_desc(virq)->status |= IRQ_NOREQUEST;
+        irq_set_status_flags(virq, IRQ_NOREQUEST);
 
+        irq_free_descs(virq, 1);
         /* Free it */
         irq_free_virt(virq, 1);
 }
@@ -1074,21 +1081,6 @@ void irq_free_virt(unsigned int virq, unsigned int count)
 
 int arch_early_irq_init(void)
 {
-        struct irq_desc *desc;
-        int i;
-
-        for (i = 0; i < NR_IRQS; i++) {
-                desc = irq_to_desc(i);
-                if (desc)
-                        desc->status |= IRQ_NOREQUEST;
-        }
-
-        return 0;
-}
-
-int arch_init_chip_data(struct irq_desc *desc, int node)
-{
-        desc->status |= IRQ_NOREQUEST;
         return 0;
 }
 
@@ -1159,11 +1151,14 @@ static int virq_debug_show(struct seq_file *m, void *private)
                 raw_spin_lock_irqsave(&desc->lock, flags);
 
                 if (desc->action && desc->action->handler) {
+                        struct irq_chip *chip;
+
                         seq_printf(m, "%5d  ", i);
                         seq_printf(m, "0x%05lx  ", virq_to_hw(i));
 
-                        if (desc->chip && desc->chip->name)
-                                p = desc->chip->name;
+                        chip = get_irq_desc_chip(desc);
+                        if (chip && chip->name)
+                                p = chip->name;
                         else
                                 p = none;
                         seq_printf(m, "%-15s  ", p);
diff --git a/arch/powerpc/kernel/machine_kexec.c b/arch/powerpc/kernel/machine_kexec.c
index a5f8672eeff3..bd1e1ff17b2d 100644
--- a/arch/powerpc/kernel/machine_kexec.c
+++ b/arch/powerpc/kernel/machine_kexec.c
@@ -26,20 +26,23 @@ void machine_kexec_mask_interrupts(void) {
 
         for_each_irq(i) {
                 struct irq_desc *desc = irq_to_desc(i);
+                struct irq_chip *chip;
 
-                if (!desc || !desc->chip)
+                if (!desc)
                         continue;
 
-                if (desc->chip->eoi &&
-                    desc->status & IRQ_INPROGRESS)
-                        desc->chip->eoi(i);
+                chip = get_irq_desc_chip(desc);
+                if (!chip)
+                        continue;
+
+                if (chip->irq_eoi && desc->status & IRQ_INPROGRESS)
+                        chip->irq_eoi(&desc->irq_data);
 
-                if (desc->chip->mask)
-                        desc->chip->mask(i);
+                if (chip->irq_mask)
+                        chip->irq_mask(&desc->irq_data);
 
-                if (desc->chip->disable &&
-                    !(desc->status & IRQ_DISABLED))
-                        desc->chip->disable(i);
+                if (chip->irq_disable && !(desc->status & IRQ_DISABLED))
+                        chip->irq_disable(&desc->irq_data);
         }
 }
 
diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c
index bb12b3248f13..bec1e930ed73 100644
--- a/arch/powerpc/kernel/nvram_64.c
+++ b/arch/powerpc/kernel/nvram_64.c
@@ -237,22 +237,45 @@ static unsigned char __init nvram_checksum(struct nvram_header *p)
         return c_sum;
 }
 
+/*
+ * Per the criteria passed via nvram_remove_partition(), should this
+ * partition be removed?  1=remove, 0=keep
+ */
+static int nvram_can_remove_partition(struct nvram_partition *part,
+                const char *name, int sig, const char *exceptions[])
+{
+        if (part->header.signature != sig)
+                return 0;
+        if (name) {
+                if (strncmp(name, part->header.name, 12))
+                        return 0;
+        } else if (exceptions) {
+                const char **except;
+                for (except = exceptions; *except; except++) {
+                        if (!strncmp(*except, part->header.name, 12))
+                                return 0;
+                }
+        }
+        return 1;
+}
+
 /**
  * nvram_remove_partition - Remove one or more partitions in nvram
  * @name: name of the partition to remove, or NULL for a
  *        signature only match
  * @sig: signature of the partition(s) to remove
+ * @exceptions: When removing all partitions with a matching signature,
+ *        leave these alone.
  */
 
-int __init nvram_remove_partition(const char *name, int sig)
+int __init nvram_remove_partition(const char *name, int sig,
+                                                const char *exceptions[])
 {
         struct nvram_partition *part, *prev, *tmp;
         int rc;
 
         list_for_each_entry(part, &nvram_partitions, partition) {
-                if (part->header.signature != sig)
-                        continue;
-                if (name && strncmp(name, part->header.name, 12))
+                if (!nvram_can_remove_partition(part, name, sig, exceptions))
                         continue;
 
                 /* Make partition a free partition */
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 7185f0da7dc3..05b7139d6a27 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -97,7 +97,7 @@ static void __init move_device_tree(void)
         start = __pa(initial_boot_params);
         size = be32_to_cpu(initial_boot_params->totalsize);
 
-        if ((memory_limit && (start + size) > memory_limit) ||
+        if ((memory_limit && (start + size) > PHYSICAL_START + memory_limit) ||
                         overlaps_crashkernel(start, size)) {
                 p = __va(memblock_alloc(size, PAGE_SIZE));
                 memcpy(p, initial_boot_params, size);
diff --git a/arch/powerpc/kernel/rtasd.c b/arch/powerpc/kernel/rtasd.c
index 049dbecb5dbc..7980ec0e1e1a 100644
--- a/arch/powerpc/kernel/rtasd.c
+++ b/arch/powerpc/kernel/rtasd.c
@@ -412,7 +412,8 @@ static void rtas_event_scan(struct work_struct *w)
 
         get_online_cpus();
 
-        cpu = cpumask_next(smp_processor_id(), cpu_online_mask);
+        /* raw_ OK because just using CPU as starting point. */
+        cpu = cpumask_next(raw_smp_processor_id(), cpu_online_mask);
         if (cpu >= nr_cpu_ids) {
                 cpu = cpumask_first(cpu_online_mask);