Commit c8a66f55 authored by Robin Murphy's avatar Robin Murphy Committed by Greg Kroah-Hartman

ARM: dts: realview: Fix PBX-A9 cache description

commit a2030372 upstream.

Clearly QEMU is very permissive in how its PL310 model may be set up,
but the real hardware turns out to be far more particular about things
actually being correct. Fix up the DT description so that the real
thing actually boots:

- The arm,data-latency and arm,tag-latency properties need 3 cells to
  be valid, otherwise we end up retaining the default 8-cycle latencies
  which leads pretty quickly to lockup.
- The arm,dirty-latency property is only relevant to L210/L220, so get
  rid of it.
- The cache geometry override also leads to lockup and/or general
  misbehaviour. Irritatingly, the manual doesn't state the actual PL310
  configuration, but based on the boardfile code and poking registers
  from the Boot Monitor, it would seem to be 8 sets of 16KB ways.

With that, we can successfully boot to enjoy the fun of mismatched FPUs...
Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Tested-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent af80b19e
...@@ -70,13 +70,12 @@ L2: l2-cache { ...@@ -70,13 +70,12 @@ L2: l2-cache {
* associativity as these may be erroneously set * associativity as these may be erroneously set
* up by boot loader(s). * up by boot loader(s).
*/ */
cache-size = <1048576>; // 1MB cache-size = <131072>; // 128KB
cache-sets = <4096>; cache-sets = <512>;
cache-line-size = <32>; cache-line-size = <32>;
arm,parity-disable; arm,parity-disable;
arm,tag-latency = <1>; arm,tag-latency = <1 1 1>;
arm,data-latency = <1 1>; arm,data-latency = <1 1 1>;
arm,dirty-latency = <1>;
}; };
scu: scu@1f000000 { scu: scu@1f000000 {
......
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