linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: ben.dooks@codethink.co.uk (Ben Dooks)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 07/14] ARM: smp_scu: data endian fixes
Date: Wed, 24 Jul 2013 11:27:55 +0100	[thread overview]
Message-ID: <1374661682-9349-8-git-send-email-ben.dooks@codethink.co.uk> (raw)
In-Reply-To: <1374661682-9349-1-git-send-email-ben.dooks@codethink.co.uk>

The smp_scu driver needs to use the relaxed readl/write accessors
to avoid any issues with the endian mode the processor core is in.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
---
 arch/arm/kernel/smp_scu.c |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/arm/kernel/smp_scu.c b/arch/arm/kernel/smp_scu.c
index 5bc1a63..1aafa0d 100644
--- a/arch/arm/kernel/smp_scu.c
+++ b/arch/arm/kernel/smp_scu.c
@@ -28,7 +28,7 @@
  */
 unsigned int __init scu_get_core_count(void __iomem *scu_base)
 {
-	unsigned int ncores = __raw_readl(scu_base + SCU_CONFIG);
+	unsigned int ncores = readl_relaxed(scu_base + SCU_CONFIG);
 	return (ncores & 0x03) + 1;
 }
 
@@ -42,19 +42,19 @@ void scu_enable(void __iomem *scu_base)
 #ifdef CONFIG_ARM_ERRATA_764369
 	/* Cortex-A9 only */
 	if ((read_cpuid_id() & 0xff0ffff0) == 0x410fc090) {
-		scu_ctrl = __raw_readl(scu_base + 0x30);
+		scu_ctrl = readl_relaxed(scu_base + 0x30);
 		if (!(scu_ctrl & 1))
-			__raw_writel(scu_ctrl | 0x1, scu_base + 0x30);
+			writel_relaxed(scu_ctrl | 0x1, scu_base + 0x30);
 	}
 #endif
 
-	scu_ctrl = __raw_readl(scu_base + SCU_CTRL);
+	scu_ctrl = readl_relaxed(scu_base + SCU_CTRL);
 	/* already enabled? */
 	if (scu_ctrl & 1)
 		return;
 
 	scu_ctrl |= 1;
-	__raw_writel(scu_ctrl, scu_base + SCU_CTRL);
+	writel_relaxed(scu_ctrl, scu_base + SCU_CTRL);
 
 	/*
 	 * Ensure that the data accessed by CPU0 before the SCU was
@@ -80,9 +80,9 @@ int scu_power_mode(void __iomem *scu_base, unsigned int mode)
 	if (mode > 3 || mode == 1 || cpu > 3)
 		return -EINVAL;
 
-	val = __raw_readb(scu_base + SCU_CPU_STATUS + cpu) & ~0x03;
+	val = readb_relaxed(scu_base + SCU_CPU_STATUS + cpu) & ~0x03;
 	val |= mode;
-	__raw_writeb(val, scu_base + SCU_CPU_STATUS + cpu);
+	writeb_relaxed(val, scu_base + SCU_CPU_STATUS + cpu);
 
 	return 0;
 }
-- 
1.7.10.4

  parent reply	other threads:[~2013-07-24 10:27 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-24 10:27 [repost] ARM big-endian support Ben Dooks
2013-07-24 10:27 ` [PATCH 01/14] ARM: fix ARCH_IXP4xx usage of ARCH_SUPPORTS_BIG_ENDIAN Ben Dooks
2013-07-24 10:27 ` [PATCH 02/14] ARM: asm: Add ARM_BE8() assembly helper Ben Dooks
2013-07-24 14:28   ` Will Deacon
2013-07-24 14:38     ` Ben Dooks
2013-07-24 14:48     ` Ben Dooks
2013-07-24 10:27 ` [PATCH 03/14] ARM: fixup_pv_table bug when CPU_ENDIAN_BE8 Ben Dooks
2013-07-24 14:33   ` Will Deacon
2013-07-24 15:24     ` Ben Dooks
2013-07-25 10:14       ` Will Deacon
2013-07-25 10:21         ` Ben Dooks
2013-07-25 10:30           ` Will Deacon
2013-07-25 10:25         ` Russell King - ARM Linux
2013-07-25 10:34           ` Ben Dooks
2013-07-25 10:40           ` Will Deacon
2013-07-24 10:27 ` [PATCH 04/14] ARM: set BE8 if LE in head code Ben Dooks
2013-07-24 14:41   ` Will Deacon
2013-07-24 15:55     ` Ben Dooks
2013-07-24 10:27 ` [PATCH 05/14] ARM: pl01x debug code endian fix Ben Dooks
2013-07-24 14:44   ` Will Deacon
2013-07-24 10:27 ` [PATCH 06/14] ARM: twd: data " Ben Dooks
2013-07-24 14:49   ` Will Deacon
2013-07-24 15:00     ` Ben Dooks
2013-07-24 15:06     ` Ben Dooks
2013-07-24 16:29       ` Will Deacon
2013-07-24 10:27 ` Ben Dooks [this message]
2013-07-24 15:05   ` [PATCH 07/14] ARM: smp_scu: data endian fixes Will Deacon
2013-07-24 10:27 ` [PATCH 08/14] highbank: enable big-endian Ben Dooks
2013-07-24 10:27 ` [PATCH 09/14] mvebu: support running big-endian Ben Dooks
2013-07-24 10:27 ` [PATCH 10/14] vexpress: add big endian support Ben Dooks
2013-07-24 10:27 ` [PATCH 11/14] ARM: alignment: correctly decode instructions in BE8 mode Ben Dooks
2013-07-24 15:28   ` Will Deacon
2013-07-25  9:44   ` Will Deacon
2013-07-24 10:28 ` [PATCH 12/14] ARM: traps: use <asm/opcodes.h> to get correct instruction order Ben Dooks
2013-07-24 16:20   ` Will Deacon
2013-07-24 10:28 ` [PATCH 13/14] ARM: module: correctly relocate instructions in BE8 Ben Dooks
2013-07-25  9:54   ` Will Deacon
2013-07-24 10:28 ` [PATCH 14/14] ARM: set --be8 when linking modules Ben Dooks
2013-07-24 16:25   ` Will Deacon
2013-07-24 23:41   ` Nicolas Pitre
2013-07-24 16:05 ` [repost] ARM big-endian support Ben Dooks
2013-07-29 13:26   ` Thomas Petazzoni
2013-07-31 20:05     ` Ben Dooks
2013-08-01  6:21       ` Thomas Petazzoni
2013-08-03 16:49         ` Ben Dooks
2013-08-05  8:01           ` Thomas Petazzoni

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=1374661682-9349-8-git-send-email-ben.dooks@codethink.co.uk \
    --to=ben.dooks@codethink.co.uk \
    --cc=linux-arm-kernel@lists.infradead.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).