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

Commit 6bb82119 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.15-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 "One fix for an oops at boot if we take a hotplug interrupt before we
  are ready to handle it.

  The bulk is patches to implement mitigation for Meltdown, see the
  change logs for more details.

  Thanks to: Nicholas Piggin, Michael Neuling, Oliver O'Halloran, Jon
  Masters, Jose Ricardo Ziviani, David Gibson"

* tag 'powerpc-4.15-7' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/powernv: Check device-tree for RFI flush settings
  powerpc/pseries: Query hypervisor for RFI flush settings
  powerpc/64s: Support disabling RFI flush with no_rfi_flush and nopti
  powerpc/64s: Add support for RFI flush of L1-D cache
  powerpc/64s: Convert slb_miss_common to use RFI_TO_USER/KERNEL
  powerpc/64: Convert fast_exception_return to use RFI_TO_USER/KERNEL
  powerpc/64: Convert the syscall exit path to use RFI_TO_USER/KERNEL
  powerpc/64s: Simple RFI macro conversions
  powerpc/64: Add macros for annotating the destination of rfid/hrfid
  powerpc/pseries: Add H_GET_CPU_CHARACTERISTICS flags & wrapper
  powerpc/pseries: Make RAS IRQ explicitly dependent on DLPAR WQ
parents 9443c168 6e032b35

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 */			\
@@ -218,7 +271,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)
@@ -232,7 +285,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

+17 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ 
#define H_GET_HCA_INFO          0x1B8

#define H_GET_PERF_COUNT        0x1BC

#define H_MANAGE_TRACE          0x1C0

#define H_GET_CPU_CHARACTERISTICS 0x1C8

#define H_FREE_LOGICAL_LAN_BUFFER 0x1D4

#define H_QUERY_INT_STATE       0x1E4

#define H_POLL_PENDING		0x1D8
@@ -330,6 +331,17 @@ 
#define H_SIGNAL_SYS_RESET_ALL_OTHERS		-2

/* >= 0 values are CPU number */



/* H_GET_CPU_CHARACTERISTICS return values */

#define H_CPU_CHAR_SPEC_BAR_ORI31	(1ull << 63) // IBM bit 0

#define H_CPU_CHAR_BCCTRL_SERIALISED	(1ull << 62) // IBM bit 1

#define H_CPU_CHAR_L1D_FLUSH_ORI30	(1ull << 61) // IBM bit 2

#define H_CPU_CHAR_L1D_FLUSH_TRIG2	(1ull << 60) // IBM bit 3

#define H_CPU_CHAR_L1D_THREAD_PRIV	(1ull << 59) // IBM bit 4



#define H_CPU_BEHAV_FAVOUR_SECURITY	(1ull << 63) // IBM bit 0

#define H_CPU_BEHAV_L1D_FLUSH_PR	(1ull << 62) // IBM bit 1

#define H_CPU_BEHAV_BNDS_CHK_SPEC_BAR	(1ull << 61) // IBM bit 2



/* Flag values used in H_REGISTER_PROC_TBL hcall */

#define PROC_TABLE_OP_MASK	0x18

#define PROC_TABLE_DEREG	0x10
@@ -436,6 +448,11 @@ static inline unsigned int get_longbusy_msecs(int longbusy_rc) 
	}

}



struct h_cpu_char_result {

	u64 character;

	u64 behaviour;

};



#endif /* __ASSEMBLY__ */

#endif /* __KERNEL__ */

#endif /* _ASM_POWERPC_HVCALL_H */

arch/powerpc/include/asm/paca.h

+10 −0
Original line number Diff line number Diff line
@@ -232,6 +232,16 @@ struct paca_struct { 
	struct sibling_subcore_state *sibling_subcore_state;

#endif

#endif

#ifdef CONFIG_PPC_BOOK3S_64

	/*

	 * rfi fallback flush must be in its own cacheline to prevent

	 * other paca data leaking into the L1d

	 */

	u64 exrfi[EX_SIZE] __aligned(0x80);

	void *rfi_flush_fallback_area;

	u64 l1d_flush_congruence;

	u64 l1d_flush_sets;

#endif

};



extern void copy_mm_to_paca(struct mm_struct *mm);