diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2014-08-04 18:31:44 -0700 |
|---|---|---|
| committer | Kumar Gala <galak@codeaurora.org> | 2015-01-19 11:53:31 -0600 |
| commit | 30cbb0c01bc98a2372966b8c5ac0ce1421cd933c (patch) | |
| tree | 487d86524ba1f4cb9a5f41613cd6013dc3cfc9b0 /arch/arm/mach-qcom | |
| parent | f76c6916570d8d24a622f2107ef747531148046e (diff) | |
| download | linux-stable-30cbb0c01bc98a2372966b8c5ac0ce1421cd933c.tar.gz linux-stable-30cbb0c01bc98a2372966b8c5ac0ce1421cd933c.tar.bz2 linux-stable-30cbb0c01bc98a2372966b8c5ac0ce1421cd933c.zip | |
ARM: qcom: scm: Get cacheline size from CTR
Instead of hardcoding the cacheline size as 32, get the cacheline size from
the CTR register.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Kumar Gala <galak@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-qcom')
| -rw-r--r-- | arch/arm/mach-qcom/scm.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-qcom/scm.c b/arch/arm/mach-qcom/scm.c index 820c72165e19..c08786ebf116 100644 --- a/arch/arm/mach-qcom/scm.c +++ b/arch/arm/mach-qcom/scm.c @@ -27,9 +27,6 @@ #include "scm.h" -/* Cache line size for msm8x60 */ -#define CACHELINESIZE 32 - #define SCM_ENOMEM -5 #define SCM_EOPNOTSUPP -4 #define SCM_EINVAL_ADDR -3 @@ -214,13 +211,18 @@ static int __scm_call(const struct scm_command *cmd) static void scm_inv_range(unsigned long start, unsigned long end) { - start = round_down(start, CACHELINESIZE); - end = round_up(end, CACHELINESIZE); + u32 cacheline_size, ctr; + + asm volatile("mrc p15, 0, %0, c0, c0, 1" : "=r" (ctr)); + cacheline_size = 4 << ((ctr >> 16) & 0xf); + + start = round_down(start, cacheline_size); + end = round_up(end, cacheline_size); outer_inv_range(start, end); while (start < end) { asm ("mcr p15, 0, %0, c7, c6, 1" : : "r" (start) : "memory"); - start += CACHELINESIZE; + start += cacheline_size; } dsb(); isb(); |