Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3b7af5c0 authored by Jeremy Kerr's avatar Jeremy Kerr Committed by Michael Ellerman
Browse files

powerpc: Fix action argument for cpufeatures-based TLB flush 



Commit 41d0c2ec ("powerpc/powernv: Fix local TLB flush for boot
and MCE on POWER9") introduced calls to __flush_tlb_power[89] from the
cpufeatures code, specifying the number of sets to flush.

However, these functions take an action argument, not a number of
sets. This means we hit the BUG() in __flush_tlb_{206,300} when using
cpufeatures-style configuration.

This change passes TLB_INVAL_SCOPE_GLOBAL instead.

Fixes: 41d0c2ec ("powerpc/powernv: Fix local TLB flush for boot and MCE on POWER9")
Cc: stable@vger.kernel.org # v4.13+
Signed-off-by: default avatarJeremy Kerr <jk@ozlabs.org>
Reviewed-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 4fc0870d

arch/powerpc/kernel/dt_cpu_ftrs.c

+2 −2
Original line number Diff line number Diff line
@@ -102,10 +102,10 @@ static void cpufeatures_flush_tlb(void) 
	case PVR_POWER8:

	case PVR_POWER8E:

	case PVR_POWER8NVL:

		__flush_tlb_power8(POWER8_TLB_SETS);

		__flush_tlb_power8(TLB_INVAL_SCOPE_GLOBAL);

		break;

	case PVR_POWER9:

		__flush_tlb_power9(POWER9_TLB_SETS_HASH);

		__flush_tlb_power9(TLB_INVAL_SCOPE_GLOBAL);

		break;

	default:

		pr_err("unknown CPU version for boot TLB flush\n");