diff options
| author | Cedric Neveux <cedric.neveux@nxp.com> | 2017-11-14 16:42:42 +0000 |
|---|---|---|
| committer | Clement Faure <clement.faure@nxp.com> | 2020-09-09 17:18:34 +0200 |
| commit | 7726883a228d997a58108688025100142ca9ab74 (patch) | |
| tree | 9a840acf462dbe6eef93e28a25a7a29768ed969f /arch/arm/mm | |
| parent | 3a8cbd11a046eb2d6fb88e5b1d1068269d5cc3da (diff) | |
MLK-16912 PL310: unlock ways during initialization
This change affects all i.MX 6 with PL310 L2 Cache controller.
When Linux runs in Non-secure World the PL310 has already
been initialized by the ARM secure World running OP-TEE os.
However, in order to have a proper Linux Initialization all the
L2 cache ways have been locked by the secure world.
This patch unlock all the ways during pl310 initialization.
Signed-off-by: Cedric Neveux <cedric.neveux@nxp.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
(cherry picked from commit 5133fbe9aaafd24add7d92b1aa2d3474b7a13723)
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/cache-l2x0.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c index 12c26eb88afb..bc632a3ed9b5 100644 --- a/arch/arm/mm/cache-l2x0.c +++ b/arch/arm/mm/cache-l2x0.c @@ -867,6 +867,11 @@ static int __init __l2c_init(const struct l2c_init_data *data, l2x0_saved_regs.aux_ctrl = aux; data->enable(l2x0_base, data->num_lock); + } else { + pr_info("%s cache controller enabled try to unlock\n", + data->type); + + data->unlock(l2x0_base, data->num_lock); } outer_cache = fns; |