powerpc/64s: Minor fix for MCE TLB flush for radix
authorNicholas Piggin <npiggin@gmail.com>
Sun, 16 Apr 2017 14:21:19 +0000 (00:21 +1000)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 19 Apr 2017 10:00:18 +0000 (20:00 +1000)
The TLB flush for radix first flushes TLB for radix configuration,
then flushes for hash configuration. The second flush is unnecessary
but does not affect correctness.

Fixes: 1a472c9dba6b9 ("powerpc/mm/radix: Add tlbflush routines")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/mce_power.c

index de242b4bbd20b5c019c1d19072d3ee30818b9c26..f913139bb0c2c9cdd67a20514a453e0b223c314b 100644 (file)
@@ -72,10 +72,14 @@ void __flush_tlb_power8(unsigned int action)
 
 void __flush_tlb_power9(unsigned int action)
 {
+       unsigned int num_sets;
+
        if (radix_enabled())
-               flush_tlb_206(POWER9_TLB_SETS_RADIX, action);
+               num_sets = POWER9_TLB_SETS_RADIX;
+       else
+               num_sets = POWER9_TLB_SETS_HASH;
 
-       flush_tlb_206(POWER9_TLB_SETS_HASH, action);
+       flush_tlb_206(num_sets, action);
 }