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

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

Merge branch 'fixes' into next 

Merge our fixes branch from the 4.15 cycle.

Unusually the fixes branch saw some significant features merged,
notably the RFI flush patches, so we want the code in next to be
tested against that, to avoid any surprises when the two are merged.

There's also some other work on the panic handling that was reverted
in fixes and we now want to do properly in next, which would conflict.

And we also fix a few other minor merge conflicts.
parents 5400fc22 1b689a95

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ config PPC 
	select GENERIC_CLOCKEVENTS_BROADCAST	if SMP

	select GENERIC_CMOS_UPDATE

	select GENERIC_CPU_AUTOPROBE

	select GENERIC_CPU_VULNERABILITIES	if PPC_BOOK3S_64

	select GENERIC_IRQ_SHOW

	select GENERIC_IRQ_SHOW_LEVEL

	select GENERIC_SMP_IDLE_THREAD

arch/powerpc/include/asm/exception-64e.h

+6 −0
Original line number Diff line number Diff line
@@ -209,5 +209,11 @@ exc_##label##_book3e: 
	ori	r3,r3,vector_offset@l;		\

	mtspr	SPRN_IVOR##vector_number,r3;



#define RFI_TO_KERNEL							\

	rfi



#define RFI_TO_USER							\

	rfi



#endif /* _ASM_POWERPC_EXCEPTION_64E_H */

arch/powerpc/include/asm/exception-64s.h

+55 −2
Original line number Diff line number Diff line
@@ -74,6 +74,59 @@ 
 */

#define EX_R3		EX_DAR



/*

 * Macros for annotating the expected destination of (h)rfid

 *

 * The nop instructions allow us to insert one or more instructions to flush the

 * L1-D cache when returning to userspace or a guest.

 */

#define RFI_FLUSH_SLOT							\

	RFI_FLUSH_FIXUP_SECTION;					\

	nop;								\

	nop;								\

	nop



#define RFI_TO_KERNEL							\

	rfid



#define RFI_TO_USER							\

	RFI_FLUSH_SLOT;							\

	rfid;								\

	b	rfi_flush_fallback



#define RFI_TO_USER_OR_KERNEL						\

	RFI_FLUSH_SLOT;							\

	rfid;								\

	b	rfi_flush_fallback



#define RFI_TO_GUEST							\

	RFI_FLUSH_SLOT;							\

	rfid;								\

	b	rfi_flush_fallback



#define HRFI_TO_KERNEL							\

	hrfid



#define HRFI_TO_USER							\

	RFI_FLUSH_SLOT;							\

	hrfid;								\

	b	hrfi_flush_fallback



#define HRFI_TO_USER_OR_KERNEL						\

	RFI_FLUSH_SLOT;							\

	hrfid;								\

	b	hrfi_flush_fallback



#define HRFI_TO_GUEST							\

	RFI_FLUSH_SLOT;							\

	hrfid;								\

	b	hrfi_flush_fallback



#define HRFI_TO_UNKNOWN							\

	RFI_FLUSH_SLOT;							\

	hrfid;								\

	b	hrfi_flush_fallback



#ifdef CONFIG_RELOCATABLE

#define __EXCEPTION_RELON_PROLOG_PSERIES_1(label, h)			\

	mfspr	r11,SPRN_##h##SRR0;	/* save SRR0 */			\
@@ -240,7 +293,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943) 
	mtspr	SPRN_##h##SRR0,r12;					\

	mfspr	r12,SPRN_##h##SRR1;	/* and SRR1 */			\

	mtspr	SPRN_##h##SRR1,r10;					\

	h##rfid;							\

	h##RFI_TO_KERNEL;						\

	b	.	/* prevent speculative execution */

#define EXCEPTION_PROLOG_PSERIES_1(label, h)				\

	__EXCEPTION_PROLOG_PSERIES_1(label, h)
@@ -254,7 +307,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943) 
	mtspr	SPRN_##h##SRR0,r12;					\

	mfspr	r12,SPRN_##h##SRR1;	/* and SRR1 */			\

	mtspr	SPRN_##h##SRR1,r10;					\

	h##rfid;							\

	h##RFI_TO_KERNEL;						\

	b	.	/* prevent speculative execution */



#define EXCEPTION_PROLOG_PSERIES_1_NORI(label, h)			\

arch/powerpc/include/asm/feature-fixups.h

+13 −0
Original line number Diff line number Diff line
@@ -187,7 +187,20 @@ label##3: \ 
	FTR_ENTRY_OFFSET label##1b-label##3b;		\

	.popsection;



#define RFI_FLUSH_FIXUP_SECTION				\

951:							\

	.pushsection __rfi_flush_fixup,"a";		\

	.align 2;					\

952:							\

	FTR_ENTRY_OFFSET 951b-952b;			\

	.popsection;





#ifndef __ASSEMBLY__

#include <linux/types.h>



extern long __start___rfi_flush_fixup, __stop___rfi_flush_fixup;



void apply_feature_fixups(void);

void setup_feature_keys(void);

#endif

arch/powerpc/include/asm/hvcall.h

+1 −0
Original line number Diff line number Diff line
@@ -353,6 +353,7 @@ 
#define PROC_TABLE_GTSE		0x01



#ifndef __ASSEMBLY__

#include <linux/types.h>



/**

 * plpar_hcall_norets: - Make a pseries hypervisor call with no return arguments