powerpc/security: make display of branch cache flush more consistent (1afe00c7) · Commits · 戴 / test

arch/powerpc/kernel/security.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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)