Commit 099a4809 authored by Ben Dooks's avatar Ben Dooks

ARM: smp_scu: data endian fixes

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.
Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarBen Dooks <ben.dooks@codethink.co.uk>
parent 2e874ea3
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
*/ */
unsigned int __init scu_get_core_count(void __iomem *scu_base) 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; return (ncores & 0x03) + 1;
} }
...@@ -42,19 +42,19 @@ void scu_enable(void __iomem *scu_base) ...@@ -42,19 +42,19 @@ void scu_enable(void __iomem *scu_base)
#ifdef CONFIG_ARM_ERRATA_764369 #ifdef CONFIG_ARM_ERRATA_764369
/* Cortex-A9 only */ /* Cortex-A9 only */
if ((read_cpuid_id() & 0xff0ffff0) == 0x410fc090) { if ((read_cpuid_id() & 0xff0ffff0) == 0x410fc090) {
scu_ctrl = __raw_readl(scu_base + 0x30); scu_ctrl = readl_relaxed(scu_base + 0x30);
if (!(scu_ctrl & 1)) if (!(scu_ctrl & 1))
__raw_writel(scu_ctrl | 0x1, scu_base + 0x30); writel_relaxed(scu_ctrl | 0x1, scu_base + 0x30);
} }
#endif #endif
scu_ctrl = __raw_readl(scu_base + SCU_CTRL); scu_ctrl = readl_relaxed(scu_base + SCU_CTRL);
/* already enabled? */ /* already enabled? */
if (scu_ctrl & 1) if (scu_ctrl & 1)
return; return;
scu_ctrl |= 1; 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 * 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) ...@@ -80,9 +80,9 @@ int scu_power_mode(void __iomem *scu_base, unsigned int mode)
if (mode > 3 || mode == 1 || cpu > 3) if (mode > 3 || mode == 1 || cpu > 3)
return -EINVAL; return -EINVAL;
val = __raw_readb(scu_base + SCU_CPU_STATUS + cpu) & ~0x03; val = readb_relaxed(scu_base + SCU_CPU_STATUS + cpu) & ~0x03;
val |= mode; val |= mode;
__raw_writeb(val, scu_base + SCU_CPU_STATUS + cpu); writeb_relaxed(val, scu_base + SCU_CPU_STATUS + cpu);
return 0; return 0;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment