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

Commit 8766dc68 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 "Some powerpc fixes for 4.8:

  Misc:
   - powerpc/vdso: Fix build rules to rebuild vdsos correctly from Nicholas Piggin
   - powerpc/ptrace: Fix coredump since ptrace TM changes from Cyril Bur
   - powerpc/32: Fix csum_partial_copy_generic() from Christophe Leroy
   - cxl: Set psl_fir_cntl to production environment value from Frederic Barrat
   - powerpc/eeh: Switch to conventional PCI address output in EEH log from Guilherme G. Piccoli
   - cxl: Use fixed width predefined types in data structure. from Philippe Bergheaud
   - powerpc/vdso: Add missing include file from Guenter Roeck
   - powerpc: Fix unused function warning 'lmb_to_memblock' from Alastair D'Silva
   - powerpc/powernv/ioda: Fix TCE invalidate to work in real mode again from Alexey Kardashevskiy
   - powerpc/cell: Add missing error code in spufs_mkgang() from Dan Carpenter
   - crypto: crc32c-vpmsum - Convert to CPU feature based module autoloading from Anton Blanchard
   - powerpc/pasemi: Fix coherent_dma_mask for dma engine from Darren Stevens

  Benjamin Herrenschmidt:
   - powerpc/32: Fix crash during static key init
   - powerpc: Update obsolete comment in setup_32.c about early_init()
   - powerpc: Print the kernel load address at the end of prom_init()
   - powerpc/pnv/pci: Fix incorrect PE reservation attempt on some 64-bit BARs
   - powerpc/xics: Properly set Edge/Level type and enable resend

  Mahesh Salgaonkar:
   - powerpc/book3s: Fix MCE console messages for unrecoverable MCE.
   - powerpc/powernv: Fix MCE handler to avoid trashing CR0/CR1 registers.
   - powerpc/powernv: Move IDLE_STATE_ENTER_SEQ macro to cpuidle.h
   - powerpc/powernv: Load correct TOC pointer while waking up from winkle.

  Andrew Donnellan:
   - cxl: Fix sparse warnings
   - cxl: Fix NULL dereference in cxl_context_init() on PowerVM guests

  Michael Ellerman:
   - selftests/powerpc: Specify we expect to build with std=gnu99
   - powerpc/Makefile: Use cflags-y/aflags-y for setting endian options
   - powerpc/pci: Fix endian bug in fixed PHB numbering"

* tag 'powerpc-4.8-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (26 commits)
  selftests/powerpc: Specify we expect to build with std=gnu99
  powerpc/vdso: Fix build rules to rebuild vdsos correctly
  powerpc/Makefile: Use cflags-y/aflags-y for setting endian options
  powerpc/32: Fix crash during static key init
  powerpc: Update obsolete comment in setup_32.c about early_init()
  powerpc: Print the kernel load address at the end of prom_init()
  powerpc/ptrace: Fix coredump since ptrace TM changes
  powerpc/32: Fix csum_partial_copy_generic()
  cxl: Set psl_fir_cntl to production environment value
  powerpc/pnv/pci: Fix incorrect PE reservation attempt on some 64-bit BARs
  powerpc/book3s: Fix MCE console messages for unrecoverable MCE.
  powerpc/pci: Fix endian bug in fixed PHB numbering
  powerpc/eeh: Switch to conventional PCI address output in EEH log
  cxl: Fix sparse warnings
  cxl: Fix NULL dereference in cxl_context_init() on PowerVM guests
  cxl: Use fixed width predefined types in data structure.
  powerpc/vdso: Add missing include file
  powerpc: Fix unused function warning 'lmb_to_memblock'
  powerpc/powernv: Fix MCE handler to avoid trashing CR0/CR1 registers.
  powerpc/powernv: Move IDLE_STATE_ENTER_SEQ macro to cpuidle.h
  ...
parents 4b9eaf33 ca49e64f

arch/powerpc/Makefile

+12 −10
Original line number Diff line number Diff line
@@ -66,29 +66,28 @@ endif 
UTS_MACHINE := $(OLDARCH)



ifeq ($(CONFIG_CPU_LITTLE_ENDIAN),y)

override CC	+= -mlittle-endian

ifneq ($(cc-name),clang)

override CC	+= -mno-strict-align

endif

override AS	+= -mlittle-endian

override LD	+= -EL

override CROSS32CC += -mlittle-endian

override CROSS32AS += -mlittle-endian

LDEMULATION	:= lppc

GNUTARGET	:= powerpcle

MULTIPLEWORD	:= -mno-multiple

KBUILD_CFLAGS_MODULE += $(call cc-option,-mno-save-toc-indirect)

else

ifeq ($(call cc-option-yn,-mbig-endian),y)

override CC	+= -mbig-endian

override AS	+= -mbig-endian

endif

override LD	+= -EB

LDEMULATION	:= ppc

GNUTARGET	:= powerpc

MULTIPLEWORD	:= -mmultiple

endif



cflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(call cc-option,-mbig-endian)

cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= -mlittle-endian

ifneq ($(cc-name),clang)

  cflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= -mno-strict-align

endif



aflags-$(CONFIG_CPU_BIG_ENDIAN)		+= $(call cc-option,-mbig-endian)

aflags-$(CONFIG_CPU_LITTLE_ENDIAN)	+= -mlittle-endian



ifeq ($(HAS_BIARCH),y)

override AS	+= -a$(CONFIG_WORD_SIZE)

override LD	+= -m elf$(CONFIG_WORD_SIZE)$(LDEMULATION)
@@ -232,6 +231,9 @@ cpu-as-$(CONFIG_E200) += -Wa,-me200 
KBUILD_AFLAGS += $(cpu-as-y)

KBUILD_CFLAGS += $(cpu-as-y)



KBUILD_AFLAGS += $(aflags-y)

KBUILD_CFLAGS += $(cflags-y)



head-y				:= arch/powerpc/kernel/head_$(CONFIG_WORD_SIZE).o

head-$(CONFIG_8xx)		:= arch/powerpc/kernel/head_8xx.o

head-$(CONFIG_40x)		:= arch/powerpc/kernel/head_40x.o

arch/powerpc/crypto/crc32c-vpmsum_glue.c

+2 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include <linux/module.h>

#include <linux/string.h>

#include <linux/kernel.h>

#include <linux/cpufeature.h>

#include <asm/switch_to.h>



#define CHKSUM_BLOCK_SIZE	1
@@ -157,7 +158,7 @@ static void __exit crc32c_vpmsum_mod_fini(void) 
	crypto_unregister_shash(&alg);

}



module_init(crc32c_vpmsum_mod_init);

module_cpu_feature_match(PPC_MODULE_FEATURE_VEC_CRYPTO, crc32c_vpmsum_mod_init);

module_exit(crc32c_vpmsum_mod_fini);



MODULE_AUTHOR("Anton Blanchard <anton@samba.org>");

arch/powerpc/include/asm/cpuidle.h

+13 −0
Original line number Diff line number Diff line
@@ -19,4 +19,17 @@ extern u64 pnv_first_deep_stop_state; 


#endif



/* Idle state entry routines */

#ifdef	CONFIG_PPC_P7_NAP

#define	IDLE_STATE_ENTER_SEQ(IDLE_INST)				\

	/* Magic NAP/SLEEP/WINKLE mode enter sequence */	\

	std	r0,0(r1);					\

	ptesync;						\

	ld	r0,0(r1);					\

1:	cmp	cr0,r0,r0;					\

	bne	1b;						\

	IDLE_INST;						\

	b	.

#endif /* CONFIG_PPC_P7_NAP */



#endif

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

+1 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ label##3: \ 


#ifndef __ASSEMBLY__

void apply_feature_fixups(void);

void setup_feature_keys(void);

#endif



#endif /* __ASM_POWERPC_FEATURE_FIXUPS_H */

arch/powerpc/include/asm/switch_to.h

+0 −8
Original line number Diff line number Diff line
@@ -75,14 +75,6 @@ static inline void disable_kernel_spe(void) 
static inline void __giveup_spe(struct task_struct *t) { }

#endif



#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

extern void flush_tmregs_to_thread(struct task_struct *);

#else

static inline void flush_tmregs_to_thread(struct task_struct *t)

{

}

#endif



static inline void clear_task_ebb(struct task_struct *t)

{

#ifdef CONFIG_PPC_BOOK3S_64