]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
powerpc/mm: Fix lazy icache flush on pre-POWER5
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 29 Nov 2016 02:13:46 +0000 (13:13 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Tue, 29 Nov 2016 12:59:40 +0000 (23:59 +1100)
commitdd7b2f035ec41a409f7a7cec7aabc0ec0eacf476
tree85a1f8572cf685f2ed708b4ad61584b4a44a1846
parent10c77dba40ff58fc03587b3b60725bb7fd723183
powerpc/mm: Fix lazy icache flush on pre-POWER5

On 64-bit CPUs with no-execute support and non-snooping icache, such as
970 or POWER4, we have a software mechanism to ensure coherency of the
cache (using exec faults when needed).

This was broken due to a logic error when the code was rewritten
from assembly to C, previously the assembly code did:

  BEGIN_FTR_SECTION
         mr      r4,r30
         mr      r5,r7
         bl      hash_page_do_lazy_icache
  END_FTR_SECTION(CPU_FTR_NOEXECUTE|CPU_FTR_COHERENT_ICACHE, CPU_FTR_NOEXECUTE)

Which tests that:
   (cpu_features & (NOEXECUTE | COHERENT_ICACHE)) == NOEXECUTE

Which says that the current cpu does have NOEXECUTE, but does not have
COHERENT_ICACHE.

Fixes: 91f1da99792a ("powerpc/mm: Convert 4k hash insert to C")
Fixes: 89ff725051d1 ("powerpc/mm: Convert __hash_page_64K to C")
Fixes: a43c0eb8364c ("powerpc/mm: Convert 4k insert from asm to C")
Cc: stable@vger.kernel.org # v4.5+
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
[mpe: Change log verbosification]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/mm/hash64_4k.c
arch/powerpc/mm/hash64_64k.c