Commit a77bc691 authored by Lennert Buytenhek's avatar Lennert Buytenhek Committed by Russell King

[ARM] 3539/1: ixp23xx: fix __arch_ixp23xx_is_coherent() for A1 stepping

Patch from Lennert Buytenhek

The current __ixp23xx_arch_is_coherent() check assumes that the
lower byte of IXP23XX_PRODUCT_ID is identical to the lower byte of
processor_id, but this is not the case, and because of this we were
incorrectly enabling coherency on A1 stepping CPUs.

Stepping A1 of the ixp2350, which has a PRODUCT_ID of 0x401, has '02'
in the lower byte of processor_id, while A2, with a PRODUCT_ID of
0x402, has '04' in the lower byte of processor_id.

So, to check for >= A2, we really need to check the lower byte of
processor_id against >= 4.
Signed-off-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ba8f5bab
...@@ -49,7 +49,7 @@ static inline int __ixp23xx_arch_is_coherent(void) ...@@ -49,7 +49,7 @@ static inline int __ixp23xx_arch_is_coherent(void)
{ {
extern unsigned int processor_id; extern unsigned int processor_id;
if (((processor_id & 15) >= 2) || machine_is_roadrunner()) if (((processor_id & 15) >= 4) || machine_is_roadrunner())
return 1; return 1;
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