Commit fbda7904 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 "One non-fix, the conversion of vio_driver->remove() to return void,
  which touches various powerpc specific drivers.

  Fix the privilege checks we do in our perf handling, which could cause
  soft/hard lockups in some configurations.

  Fix a bug with IRQ affinity seen on kdump kernels when CPU 0 is
  offline in the second kernel.

  Fix missed page faults after mprotect(..., PROT_NONE) on 603 (32-bit).

  Fix a bug in our VSX (vector) instruction emulation, which should only
  be seen when doing VSX ops to cache inhibited mappings.

  Three commits fixing various build issues with obscure configurations.

  Thanks to Athira Rajeev, Cédric Le Goater, Christophe Leroy, Christoph
  Plattner, Greg Kurz, Jordan Niethe, Laurent Vivier, Ravi Bangoria,
  Tyrel Datwyler, and Uwe Kleine-König"

* tag 'powerpc-5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/sstep: Fix VSX instruction emulation
  powerpc/perf: Fix handling of privilege level checks in perf interrupt context
  powerpc: Force inlining of mmu_has_feature to fix build failure
  vio: make remove callback return void
  powerpc/syscall: Force inlining of __prep_irq_for_enabled_exit()
  powerpc/603: Fix protection of user pages mapped with PROT_NONE
  powerpc/pseries: Don't enforce MSI affinity with kdump
  powerpc/4xx: Fix build errors from mfdcr()
parents dac51870 5c88a17e

arch/powerpc/include/asm/dcr-native.h

+4 −4
Original line number Diff line number Diff line
@@ -53,8 +53,8 @@ static inline void mtdcrx(unsigned int reg, unsigned int val) 
#define mfdcr(rn)						\

	({unsigned int rval;					\

	if (__builtin_constant_p(rn) && rn < 1024)		\

		asm volatile("mfdcr %0," __stringify(rn)	\

		              : "=r" (rval));			\

		asm volatile("mfdcr %0, %1" : "=r" (rval)	\

			      : "n" (rn));			\

	else if (likely(cpu_has_feature(CPU_FTR_INDEXED_DCR)))	\

		rval = mfdcrx(rn);				\

	else							\
@@ -64,8 +64,8 @@ static inline void mtdcrx(unsigned int reg, unsigned int val) 
#define mtdcr(rn, v)						\

do {								\

	if (__builtin_constant_p(rn) && rn < 1024)		\

		asm volatile("mtdcr " __stringify(rn) ",%0"	\

			      : : "r" (v)); 			\

		asm volatile("mtdcr %0, %1"			\

			      : : "n" (rn), "r" (v));		\

	else if (likely(cpu_has_feature(CPU_FTR_INDEXED_DCR)))	\

		mtdcrx(rn, v);					\

	else							\

arch/powerpc/include/asm/mmu.h

+2 −2
Original line number Diff line number Diff line
@@ -228,7 +228,7 @@ enum { 
#define MMU_FTRS_ALWAYS		0

#endif



static inline bool early_mmu_has_feature(unsigned long feature)

static __always_inline bool early_mmu_has_feature(unsigned long feature)

{

	if (MMU_FTRS_ALWAYS & feature)

		return true;
@@ -286,7 +286,7 @@ static inline void mmu_feature_keys_init(void) 


}



static inline bool mmu_has_feature(unsigned long feature)

static __always_inline bool mmu_has_feature(unsigned long feature)

{

	return early_mmu_has_feature(feature);

}

arch/powerpc/include/asm/vio.h

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ struct vio_driver { 
	const char *name;

	const struct vio_device_id *id_table;

	int (*probe)(struct vio_dev *dev, const struct vio_device_id *id);

	int (*remove)(struct vio_dev *dev);

	void (*remove)(struct vio_dev *dev);

	/* A driver must have a get_desired_dma() function to

	 * be loaded in a CMO environment if it uses DMA.

	 */

arch/powerpc/kernel/head_book3s_32.S

+6 −3
Original line number Diff line number Diff line
@@ -457,11 +457,12 @@ InstructionTLBMiss: 
	cmplw	0,r1,r3

#endif

	mfspr	r2, SPRN_SDR1

	li	r1,_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_EXEC

	li	r1,_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_EXEC | _PAGE_USER

	rlwinm	r2, r2, 28, 0xfffff000

#ifdef CONFIG_MODULES

	bgt-	112f

	lis	r2, (swapper_pg_dir - PAGE_OFFSET)@ha	/* if kernel address, use */

	li	r1,_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_EXEC

	addi	r2, r2, (swapper_pg_dir - PAGE_OFFSET)@l	/* kernel page table */

#endif

112:	rlwimi	r2,r3,12,20,29		/* insert top 10 bits of address */
@@ -520,10 +521,11 @@ DataLoadTLBMiss: 
	lis	r1, TASK_SIZE@h		/* check if kernel address */

	cmplw	0,r1,r3

	mfspr	r2, SPRN_SDR1

	li	r1, _PAGE_PRESENT | _PAGE_ACCESSED

	li	r1, _PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_USER

	rlwinm	r2, r2, 28, 0xfffff000

	bgt-	112f

	lis	r2, (swapper_pg_dir - PAGE_OFFSET)@ha	/* if kernel address, use */

	li	r1, _PAGE_PRESENT | _PAGE_ACCESSED

	addi	r2, r2, (swapper_pg_dir - PAGE_OFFSET)@l	/* kernel page table */

112:	rlwimi	r2,r3,12,20,29		/* insert top 10 bits of address */

	lwz	r2,0(r2)		/* get pmd entry */
@@ -597,10 +599,11 @@ DataStoreTLBMiss: 
	lis	r1, TASK_SIZE@h		/* check if kernel address */

	cmplw	0,r1,r3

	mfspr	r2, SPRN_SDR1

	li	r1, _PAGE_RW | _PAGE_DIRTY | _PAGE_PRESENT | _PAGE_ACCESSED

	li	r1, _PAGE_RW | _PAGE_DIRTY | _PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_USER

	rlwinm	r2, r2, 28, 0xfffff000

	bgt-	112f

	lis	r2, (swapper_pg_dir - PAGE_OFFSET)@ha	/* if kernel address, use */

	li	r1, _PAGE_RW | _PAGE_DIRTY | _PAGE_PRESENT | _PAGE_ACCESSED

	addi	r2, r2, (swapper_pg_dir - PAGE_OFFSET)@l	/* kernel page table */

112:	rlwimi	r2,r3,12,20,29		/* insert top 10 bits of address */

	lwz	r2,0(r2)		/* get pmd entry */

arch/powerpc/kernel/interrupt.c

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ notrace long system_call_exception(long r3, long r4, long r5, 
 * enabled when the interrupt handler returns (indicating a process-context /

 * synchronous interrupt) then irqs_enabled should be true.

 */

static notrace inline bool __prep_irq_for_enabled_exit(bool clear_ri)

static notrace __always_inline bool __prep_irq_for_enabled_exit(bool clear_ri)

{

	/* This must be done with RI=1 because tracing may touch vmaps */

	trace_hardirqs_on();