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

Commit abf110f3 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

powerpc/rfi-flush: Make it possible to call setup_rfi_flush() again 



For PowerVM migration we want to be able to call setup_rfi_flush()
again after we've migrated the partition.

To support that we need to check that we're not trying to allocate the
fallback flush area after memblock has gone away (i.e., boot-time only).

Signed-off-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 1e2a9fc7

arch/powerpc/include/asm/setup.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ enum l1d_flush_type { 
	L1D_FLUSH_MTTRIG	= 0x8,

};



void __init setup_rfi_flush(enum l1d_flush_type, bool enable);

void setup_rfi_flush(enum l1d_flush_type, bool enable);

void do_rfi_flush_fixups(enum l1d_flush_type types);



#endif /* !__ASSEMBLY__ */

arch/powerpc/kernel/setup_64.c

+5 −1
Original line number Diff line number Diff line
@@ -860,6 +860,10 @@ static void init_fallback_flush(void) 
	u64 l1d_size, limit;

	int cpu;



	/* Only allocate the fallback flush area once (at boot time). */

	if (l1d_flush_fallback_area)

		return;



	l1d_size = ppc64_caches.l1d.size;

	limit = min(ppc64_bolted_size(), ppc64_rma_size);
@@ -877,7 +881,7 @@ static void init_fallback_flush(void) 
	}

}



void __init setup_rfi_flush(enum l1d_flush_type types, bool enable)

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");