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

Commit 0063d61c authored by Mauricio Faria de Oliveira's avatar Mauricio Faria de Oliveira Committed by Michael Ellerman
Browse files

powerpc/rfi-flush: Differentiate enabled and patched flush types 



Currently the rfi-flush messages print 'Using <type> flush' for all
enabled_flush_types, but that is not necessarily true -- as now the
fallback flush is always enabled on pseries, but the fixup function
overwrites its nop/branch slot with other flush types, if available.

So, replace the 'Using <type> flush' messages with '<type> flush is
available'.

Also, print the patched flush types in the fixup function, so users
can know what is (not) being used (e.g., the slower, fallback flush,
or no flush type at all if flush is disabled via the debugfs switch).

Suggested-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarMauricio Faria de Oliveira <mauricfo@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 84749a58

arch/powerpc/kernel/setup_64.c

+3 −3
Original line number Diff line number Diff line
@@ -884,15 +884,15 @@ static void init_fallback_flush(void) 
void setup_rfi_flush(enum l1d_flush_type types, bool enable)

{

	if (types & L1D_FLUSH_FALLBACK) {

		pr_info("rfi-flush: Using fallback displacement flush\n");

		pr_info("rfi-flush: fallback displacement flush available\n");

		init_fallback_flush();

	}



	if (types & L1D_FLUSH_ORI)

		pr_info("rfi-flush: Using ori type flush\n");

		pr_info("rfi-flush: ori type flush available\n");



	if (types & L1D_FLUSH_MTTRIG)

		pr_info("rfi-flush: Using mttrig type flush\n");

		pr_info("rfi-flush: mttrig type flush available\n");



	enabled_flush_types = types;

arch/powerpc/lib/feature-fixups.c

+8 −1
Original line number Diff line number Diff line
@@ -153,7 +153,14 @@ void do_rfi_flush_fixups(enum l1d_flush_type types) 
		patch_instruction(dest + 2, instrs[2]);

	}



	printk(KERN_DEBUG "rfi-flush: patched %d locations\n", i);

	printk(KERN_DEBUG "rfi-flush: patched %d locations (%s flush)\n", i,

		(types == L1D_FLUSH_NONE)       ? "no" :

		(types == L1D_FLUSH_FALLBACK)   ? "fallback displacement" :

		(types &  L1D_FLUSH_ORI)        ? (types & L1D_FLUSH_MTTRIG)

							? "ori+mttrig type"

							: "ori type" :

		(types &  L1D_FLUSH_MTTRIG)     ? "mttrig type"

						: "unknown");

}

#endif /* CONFIG_PPC_BOOK3S_64 */