Merge tag 'firmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM platform specific firmware interfaces from Olof Johansson:
 "Two platforms, bcm and exynos have their own firmware interfaces using
  the "secure monitor call", this adds support for those.

  We had originally planned to have a third set of patches in here,
  which would extend support for the existing generic "psci" call that
  is used on multiple platforms as well as Xen and KVM guests, but that
  ended up getting dropped because the patches were not ready in time."

* tag 'firmware-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: bcm: mark bcm_kona_smc_init as __init
  ARM: bcm281xx: Add DT support for SMC handler
  ARM: bcm281xx: Add L2 cache enable code
  ARM: EXYNOS: Add secure firmware support to secondary CPU bring-up
  ARM: EXYNOS: Add IO mapping for non-secure SYSRAM.
  ARM: EXYNOS: Add support for Exynos secure firmware
  ARM: EXYNOS: Add support for secure monitor calls
  ARM: Add interface for registering and calling firmware-specific operations

1 files changed, 27 insertions, 5 deletions

diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
index 95e04bd5813f..a0e8ff7758a4 100644
--- a/arch/arm/mach-exynos/platsmp.c
+++ b/arch/arm/mach-exynos/platsmp.c
@@ -24,6 +24,7 @@
 #include <asm/cacheflush.h>
 #include <asm/smp_plat.h>
 #include <asm/smp_scu.h>
+#include <asm/firmware.h>
 
 #include <mach/hardware.h>
 #include <mach/regs-clock.h>
@@ -137,10 +138,21 @@ static int __cpuinit exynos_boot_secondary(unsigned int cpu, struct task_struct
 
         timeout = jiffies + (1 * HZ);
         while (time_before(jiffies, timeout)) {
+                unsigned long boot_addr;
+
                 smp_rmb();
 
-                __raw_writel(virt_to_phys(exynos4_secondary_startup),
-                                                        cpu_boot_reg(phys_cpu));
+                boot_addr = virt_to_phys(exynos4_secondary_startup);
+
+                /*
+                 * Try to set boot address using firmware first
+                 * and fall back to boot register if it fails.
+                 */
+                if (call_firmware_op(set_cpu_boot_addr, phys_cpu, boot_addr))
+                        __raw_writel(boot_addr, cpu_boot_reg(phys_cpu));
+
+                call_firmware_op(cpu_boot, phys_cpu);
+
                 arch_send_wakeup_ipi_mask(cpumask_of(cpu));
 
                 if (pen_release == -1)
@@ -196,10 +208,20 @@ static void __init exynos_smp_prepare_cpus(unsigned int max_cpus)
          * system-wide flags register. The boot monitor waits
          * until it receives a soft interrupt, and then the
          * secondary CPU branches to this address.
+         *
+         * Try using firmware operation first and fall back to
+         * boot register if it fails.
          */
-        for (i = 1; i < max_cpus; ++i)
-                __raw_writel(virt_to_phys(exynos4_secondary_startup),
-                                        cpu_boot_reg(cpu_logical_map(i)));
+        for (i = 1; i < max_cpus; ++i) {
+                unsigned long phys_cpu;
+                unsigned long boot_addr;
+
+                phys_cpu = cpu_logical_map(i);
+                boot_addr = virt_to_phys(exynos4_secondary_startup);
+
+                if (call_firmware_op(set_cpu_boot_addr, phys_cpu, boot_addr))
+                        __raw_writel(boot_addr, cpu_boot_reg(phys_cpu));
+        }
 }
 
 struct smp_operations exynos_smp_ops __initdata = {