powerpc/fsl_booke: Avoid creating duplicate tlb1 entry
authorLaurentiu Tudor <laurentiu.tudor@nxp.com>
Thu, 23 Jan 2020 11:19:25 +0000 (11:19 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 24 Apr 2020 05:59:01 +0000 (07:59 +0200)
commitf3c266a931df9ad84ea0a735d7bb6e8cf7c80cdc
tree60f6a1932457d061e5ae9383cd93b184713a4219
parent62cd9aa3acae84461b94bb01b0bc06460fc7f085
powerpc/fsl_booke: Avoid creating duplicate tlb1 entry

[ Upstream commit aa4113340ae6c2811e046f08c2bc21011d20a072 ]

In the current implementation, the call to loadcam_multi() is wrapped
between switch_to_as1() and restore_to_as0() calls so, when it tries
to create its own temporary AS=1 TLB1 entry, it ends up duplicating
the existing one created by switch_to_as1(). Add a check to skip
creating the temporary entry if already running in AS=1.

Fixes: d9e1831a4202 ("powerpc/85xx: Load all early TLB entries at once")
Cc: stable@vger.kernel.org # v4.4+
Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Acked-by: Scott Wood <oss@buserror.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200123111914.2565-1-laurentiu.tudor@nxp.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/powerpc/mm/tlb_nohash_low.S