powerpc/security: make display of branch cache flush more consistent

Make the count-cache and link-stack messages look the same

Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200609070610.846703-4-npiggin@gmail.com

diff --git a/arch/powerpc/kernel/security.c b/arch/powerpc/kernel/security.c
index 28f4cb0..659ef6a 100644 (file)
--- a/arch/powerpc/kernel/security.c
+++ b/arch/powerpc/kernel/security.c
@@ -430,7 +430,7 @@ device_initcall(stf_barrier_debugfs_init);
 static void no_count_cache_flush(void)
 {
        count_cache_flush_type = BRANCH_CACHE_FLUSH_NONE;
-       pr_info("count-cache-flush: software flush disabled.\n");
+       pr_info("count-cache-flush: flush disabled.\n");
 }
 
 static void toggle_branch_cache_flush(bool enable)
@@ -446,7 +446,7 @@ static void toggle_branch_cache_flush(bool enable)
                patch_instruction_site(&patch__call_kvm_flush_link_stack,
                                       ppc_inst(PPC_INST_NOP));
 #endif
-               pr_info("link-stack-flush: software flush disabled.\n");
+               pr_info("link-stack-flush: flush disabled.\n");
                link_stack_flush_type = BRANCH_CACHE_FLUSH_NONE;
                no_count_cache_flush();
                return;
@@ -475,13 +475,13 @@ static void toggle_branch_cache_flush(bool enable)
 
        if (!security_ftr_enabled(SEC_FTR_BCCTR_FLUSH_ASSIST)) {
                count_cache_flush_type = BRANCH_CACHE_FLUSH_SW;
-               pr_info("count-cache-flush: full software flush sequence enabled.\n");
+               pr_info("count-cache-flush: software flush enabled.\n");
                return;
        }
 
        patch_instruction_site(&patch__flush_count_cache_return, ppc_inst(PPC_INST_BLR));
        count_cache_flush_type = BRANCH_CACHE_FLUSH_HW;
-       pr_info("count-cache-flush: hardware assisted flush sequence enabled\n");
+       pr_info("count-cache-flush: hardware flush enabled.\n");
 }
 
 void setup_count_cache_flush(void)