]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
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, 17 Apr 2020 14:12:17 +0000 (16:12 +0200)
commit2fa1e5d4cd5d2cfe9a354e4b029d0069102ef276
treec533c9d3a42a04561fc81de20095592658da6a90
parent758586e30e5a384dd097833322494ce398f79991
powerpc/fsl_booke: Avoid creating duplicate tlb1 entry

commit aa4113340ae6c2811e046f08c2bc21011d20a072 upstream.

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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/powerpc/mm/nohash/tlb_low.S