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

Commit 7db0fff6 authored by Michael Neuling's avatar Michael Neuling Committed by Greg Kroah-Hartman
Browse files

powerpc/pseries: Query hypervisor for RFI flush settings 



commit 8989d56878a7735dfdb234707a2fee6faf631085 upstream.

A new hypervisor call is available which tells the guest settings
related to the RFI flush. Use it to query the appropriate flush
instruction(s), and whether the flush is required.

Signed-off-by: default avatarMichael Neuling <mikey@neuling.org>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0ef9f828

arch/powerpc/platforms/pseries/setup.c

+35 −0
Original line number Diff line number Diff line
@@ -450,6 +450,39 @@ static void __init find_and_init_phbs(void) 
	of_pci_check_probe_only();

}



static void pseries_setup_rfi_flush(void)

{

	struct h_cpu_char_result result;

	enum l1d_flush_type types;

	bool enable;

	long rc;



	/* Enable by default */

	enable = true;



	rc = plpar_get_cpu_characteristics(&result);

	if (rc == H_SUCCESS) {

		types = L1D_FLUSH_NONE;



		if (result.character & H_CPU_CHAR_L1D_FLUSH_TRIG2)

			types |= L1D_FLUSH_MTTRIG;

		if (result.character & H_CPU_CHAR_L1D_FLUSH_ORI30)

			types |= L1D_FLUSH_ORI;



		/* Use fallback if nothing set in hcall */

		if (types == L1D_FLUSH_NONE)

			types = L1D_FLUSH_FALLBACK;



		if (!(result.behaviour & H_CPU_BEHAV_L1D_FLUSH_PR))

			enable = false;

	} else {

		/* Default to fallback if case hcall is not available */

		types = L1D_FLUSH_FALLBACK;

	}



	setup_rfi_flush(types, enable);

}



static void __init pSeries_setup_arch(void)

{

	set_arch_panic_timeout(10, ARCH_PANIC_TIMEOUT);
@@ -467,6 +500,8 @@ static void __init pSeries_setup_arch(void) 


	fwnmi_init();



	pseries_setup_rfi_flush();



	/* By default, only probe PCI (can be overridden by rtas_pci) */

	pci_add_flags(PCI_PROBE_ONLY);