From: Markus Mayer <markus.mayer@linaro.org>
To: Matt Porter <matt.porter@linaro.org>,
Christian Daudt <bcm@fixthebug.org>
Cc: ARM Kernel List <linux-arm-kernel@lists.infradead.org>,
"Linux Kernel Mailing List" <linux-kernel@vger.kernel.org>
Subject: [PATCH 1/4] ARM: bcm281xx: Move kona_l2_cache_init() so it can be shared
Date: Tue, 25 Feb 2014 14:17:43 -0800 [thread overview]
Message-ID: <1393366666-28625-2-git-send-email-markus.mayer@linaro.org> (raw)
In-Reply-To: <1393366666-28625-1-git-send-email-markus.mayer@linaro.org>
In preparation for future SoCs, move kona_l2_cache_init() from board
specific board_bcm281xx.c to shared kona.c, so multiple SoC families
can make use of it. Also change the return type to "void", since we
never look at the return code anyway.
Signed-off-by: Markus Mayer <markus.mayer@linaro.org>
---
arch/arm/mach-bcm/board_bcm281xx.c | 26 +-------------------------
arch/arm/mach-bcm/kona.c | 30 +++++++++++++++++++++++++++++-
arch/arm/mach-bcm/kona.h | 3 ++-
3 files changed, 32 insertions(+), 27 deletions(-)
diff --git a/arch/arm/mach-bcm/board_bcm281xx.c b/arch/arm/mach-bcm/board_bcm281xx.c
index cb3dc36..4874f56 100644
--- a/arch/arm/mach-bcm/board_bcm281xx.c
+++ b/arch/arm/mach-bcm/board_bcm281xx.c
@@ -12,37 +12,13 @@
*/
#include <linux/of_platform.h>
-#include <linux/init.h>
-#include <linux/device.h>
-#include <linux/platform_device.h>
+#include <linux/of_address.h>
#include <linux/clocksource.h>
#include <asm/mach/arch.h>
-#include <asm/mach/time.h>
-#include <asm/hardware/cache-l2x0.h>
-#include "bcm_kona_smc.h"
#include "kona.h"
-static int __init kona_l2_cache_init(void)
-{
- if (!IS_ENABLED(CONFIG_CACHE_L2X0))
- return 0;
-
- if (bcm_kona_smc_init() < 0) {
- pr_info("Kona secure API not available. Skipping L2 init\n");
- return 0;
- }
-
- bcm_kona_smc(SSAPI_ENABLE_L2_CACHE, 0, 0, 0, 0);
-
- /*
- * 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.
- */
- return l2x0_of_init(0, ~0);
-}
-
static void bcm_board_setup_restart(void)
{
struct device_node *np;
diff --git a/arch/arm/mach-bcm/kona.c b/arch/arm/mach-bcm/kona.c
index 6939d90..2f1db29 100644
--- 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
@@ -12,10 +12,38 @@
*/
#include <linux/of_address.h>
+#include <linux/of_platform.h>
+#include <asm/hardware/cache-l2x0.h>
#include <asm/io.h>
+#include "bcm_kona_smc.h"
#include "kona.h"
+void __init kona_l2_cache_init(void)
+{
+ int ret;
+
+ if (!IS_ENABLED(CONFIG_CACHE_L2X0))
+ return;
+
+ ret = bcm_kona_smc_init();
+ if (ret) {
+ pr_info("Secure API not available (%d). Skipping L2 init.\n",
+ ret);
+ return;
+ }
+
+ bcm_kona_smc(SSAPI_ENABLE_L2_CACHE, 0, 0, 0, 0);
+
+ /*
+ * 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);
+}
+
static void __iomem *watchdog_base;
void bcm_kona_setup_restart(void)
diff --git a/arch/arm/mach-bcm/kona.h b/arch/arm/mach-bcm/kona.h
index 291eca3..f42aef8 100644
--- a/arch/arm/mach-bcm/kona.h
+++ b/arch/arm/mach-bcm/kona.h
@@ -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
@@ -13,5 +13,6 @@
#include <linux/reboot.h>
+void __init kona_l2_cache_init(void);
void bcm_kona_setup_restart(void);
void bcm_kona_restart(enum reboot_mode mode, const char *cmd);
--
1.7.9.5
next prev parent reply other threads:[~2014-02-25 22:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-02-25 22:17 [PATCH 0/4] ARM: bcm281xx: Consolidate code Markus Mayer
2014-02-25 22:17 ` Markus Mayer [this message]
2014-02-25 22:17 ` [PATCH 2/4] ARM: bcm281xx: Consolidate reboot code Markus Mayer
2014-02-25 22:17 ` [PATCH 3/4] ARM: bcm281xx: Re-order hearder files Markus Mayer
2014-02-25 22:17 ` [PATCH 4/4] ARM: bcm281xx: Rename board_init() function Markus Mayer
2014-03-06 8:55 ` [PATCH 0/4] ARM: bcm281xx: Consolidate code Matt Porter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1393366666-28625-2-git-send-email-markus.mayer@linaro.org \
--to=markus.mayer@linaro.org \
--cc=bcm@fixthebug.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matt.porter@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).