Commit cd171170 authored by Sebastian Hesselbarth's avatar Sebastian Hesselbarth Committed by Russell King

ARM: 8041/1: pj4: fix cpu_is_pj4 check

Commit fdb487f5
  ("ARM: 8015/1: Add cpu_is_pj4 to distinguish PJ4 because it
    has some differences with V7")
introduced a cpuid check for Marvell PJ4 processors to fix a
regression caused by adding PJ4 based Marvell Dove into
multi_v7.

Unfortunately, this check is too narrow to catch PJ4 used on
Dove itself and breaks iWMMXt support.

This patch therefore relaxes the cpuid mask to match both PJ4
and PJ4B. Also, rework the given comment about PJ4/PJ4B
modifications to be a little bit more specific about the
differences.
Signed-off-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: default avatarKevin Hilman <khilman@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e89f443b
...@@ -222,22 +222,22 @@ static inline int cpu_is_xsc3(void) ...@@ -222,22 +222,22 @@ static inline int cpu_is_xsc3(void)
#endif #endif
/* /*
* Marvell's PJ4 core is based on V7 version. It has some modification * Marvell's PJ4 and PJ4B cores are based on V7 version,
* for coprocessor setting. For this reason, we need a way to distinguish * but require a specical sequence for enabling coprocessors.
* it. * For this reason, we need a way to distinguish them.
*/ */
#ifndef CONFIG_CPU_PJ4 #if defined(CONFIG_CPU_PJ4) || defined(CONFIG_CPU_PJ4B)
#define cpu_is_pj4() 0
#else
static inline int cpu_is_pj4(void) static inline int cpu_is_pj4(void)
{ {
unsigned int id; unsigned int id;
id = read_cpuid_id(); id = read_cpuid_id();
if ((id & 0xfffffff0) == 0x562f5840) if ((id & 0xff0fff00) == 0x560f5800)
return 1; return 1;
return 0; return 0;
} }
#else
#define cpu_is_pj4() 0
#endif #endif
#endif #endif
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