From: gregory.clement@free-electrons•com (Gregory CLEMENT)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 1/5] ARM: smp_scu: Used defined value instead of literal constant
Date: Fri, 27 Jun 2014 00:55:47 +0200 [thread overview]
Message-ID: <53ACA4F3.2070206@free-electrons.com> (raw)
In-Reply-To: <1403822608-31158-2-git-send-email-gregory.clement@free-electrons.com>
On 27/06/2014 00:43, Gregory CLEMENT wrote:
> The first bit of the SCU control register is actually the enable
> it. So let's name it instead of using literal constant.
>
> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons•com>
> ---
> arch/arm/kernel/smp_scu.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/arch/arm/kernel/smp_scu.c b/arch/arm/kernel/smp_scu.c
> index 1aafa0d785eb..cfea41b41ad0 100644
> --- a/arch/arm/kernel/smp_scu.c
> +++ b/arch/arm/kernel/smp_scu.c
> @@ -17,6 +17,7 @@
> #include <asm/cputype.h>
>
> #define SCU_CTRL 0x00
> +#define SCU_CTRL_ENABLE BIT(1)
As Ezequiel rightly pointed it to me, this line is obviously wrong!
it should be
+#define SCU_CTRL_ENABLE BIT(0)
> #define SCU_CONFIG 0x04
> #define SCU_CPU_STATUS 0x08
> #define SCU_INVALIDATE 0x0c
> @@ -43,17 +44,18 @@ void scu_enable(void __iomem *scu_base)
> /* Cortex-A9 only */
> if ((read_cpuid_id() & 0xff0ffff0) == 0x410fc090) {
> scu_ctrl = readl_relaxed(scu_base + 0x30);
> - if (!(scu_ctrl & 1))
> - writel_relaxed(scu_ctrl | 0x1, scu_base + 0x30);
> + if (!(scu_ctrl & SCU_CTRL_ENABLE))
> + writel_relaxed(scu_ctrl | SCU_CTRL_ENABLE,
> + scu_base + 0x30);
> }
> #endif
>
> scu_ctrl = readl_relaxed(scu_base + SCU_CTRL);
> /* already enabled? */
> - if (scu_ctrl & 1)
> + if (scu_ctrl & SCU_CTRL_ENABLE)
> return;
>
> - scu_ctrl |= 1;
> + scu_ctrl |= SCU_CTRL_ENABLE;
> writel_relaxed(scu_ctrl, scu_base + SCU_CTRL);
>
> /*
>
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
next prev parent reply other threads:[~2014-06-26 22:55 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-26 22:43 [PATCH 0/5] ARM: Centralize the access to the SCU register Gregory CLEMENT
2014-06-26 22:43 ` [PATCH 1/5] ARM: smp_scu: Used defined value instead of literal constant Gregory CLEMENT
2014-06-26 22:55 ` Gregory CLEMENT [this message]
2014-06-27 12:08 ` Jason Cooper
2014-06-26 22:43 ` [PATCH 2/5] ARM: smp_scu: Add the enable speculative linefills operation Gregory CLEMENT
2014-06-28 15:02 ` Thomas Petazzoni
2014-06-30 12:21 ` Gregory CLEMENT
2014-06-26 22:43 ` [PATCH 3/5] ARM: smp_scu: Add the enable standby operation Gregory CLEMENT
2014-06-26 22:43 ` [PATCH 4/5] ARM: mvebu: Enable SCU Speculative linefills to L2 for Armada 375/38x Gregory CLEMENT
2014-06-28 15:04 ` Thomas Petazzoni
2014-06-26 22:43 ` [PATCH 5/5] ARM: imx6q: Use the new function scu_standby_enable() Gregory CLEMENT
2014-06-26 22:56 ` [PATCH 0/5] ARM: Centralize the access to the SCU register Rob Herring
2014-06-26 23:01 ` Gregory CLEMENT
2014-07-01 7:42 ` Shawn Guo
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=53ACA4F3.2070206@free-electrons.com \
--to=gregory.clement@free-electrons$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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