Merge branch 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / arch / arm / mach-bcm / kona.c

diff --git a/arch/arm/mach-bcm/kona.c b/arch/arm/mach-bcm/kona.c
index 6939d9017f63369c3c34cba1921869ea7a873583..768bc2837bf5985a8c3b2810afc9d0507ab98fd2 100644 (file)
--- a/arch/arm/mach-bcm/kona.c
+++ b/arch/arm/mach-bcm/kona.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Broadcom Corporation
+ * Copyright (C) 2012-2014 Broadcom Corporation
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -11,55 +11,33 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/of_address.h>
-#include <asm/io.h>
+#include <linux/of_platform.h>
+#include <asm/hardware/cache-l2x0.h>
 
+#include "bcm_kona_smc.h"
 #include "kona.h"
 
-static void __iomem *watchdog_base;
-
-void bcm_kona_setup_restart(void)
+void __init kona_l2_cache_init(void)
 {
-       struct device_node *np_wdog;
+       int ret;
 
-       /*
-        * The assumption is that whoever calls bcm_kona_setup_restart()
-        * also needs a Kona Watchdog Timer entry in Device Tree, i.e. we
-        * report an error if the DT entry is missing.
-        */
-       np_wdog = of_find_compatible_node(NULL, NULL, "brcm,kona-wdt");
-       if (!np_wdog) {
-               pr_err("brcm,kona-wdt not found in DT, reboot disabled\n");
+       if (!IS_ENABLED(CONFIG_CACHE_L2X0))
                return;
-       }
-       watchdog_base = of_iomap(np_wdog, 0);
-       WARN(!watchdog_base, "failed to map watchdog base");
-       of_node_put(np_wdog);
-}
-
-#define SECWDOG_OFFSET                 0x00000000
-#define SECWDOG_RESERVED_MASK          0xE2000000
-#define SECWDOG_WD_LOAD_FLAG_MASK      0x10000000
-#define SECWDOG_EN_MASK                        0x08000000
-#define SECWDOG_SRSTEN_MASK            0x04000000
-#define SECWDOG_CLKS_SHIFT             20
-#define SECWDOG_LOCK_SHIFT             0
 
-void bcm_kona_restart(enum reboot_mode mode, const char *cmd)
-{
-       uint32_t val;
-
-       if (!watchdog_base)
-               panic("Watchdog not mapped. Reboot failed.\n");
+       ret = bcm_kona_smc_init();
+       if (ret) {
+               pr_info("Secure API not available (%d). Skipping L2 init.\n",
+                       ret);
+               return;
+       }
 
-       /* Enable watchdog2 with very short timeout. */
-       val = readl(watchdog_base + SECWDOG_OFFSET);
-       val &= SECWDOG_RESERVED_MASK | SECWDOG_WD_LOAD_FLAG_MASK;
-       val |= SECWDOG_EN_MASK | SECWDOG_SRSTEN_MASK |
-               (0x8 << SECWDOG_CLKS_SHIFT) |
-               (0x8 << SECWDOG_LOCK_SHIFT);
-       writel(val, watchdog_base + SECWDOG_OFFSET);
+       bcm_kona_smc(SSAPI_ENABLE_L2_CACHE, 0, 0, 0, 0);
 
-       while (1)
-               ;
+       /*
+        * The aux_val and aux_mask have no effect since L2 cache is already
+        * enabled.  Pass 0s for aux_val and 1s for aux_mask for default value.
+        */
+       ret = l2x0_of_init(0, ~0);
+       if (ret)
+               pr_err("Couldn't enable L2 cache: %d\n", ret);
 }