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

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

Pull powerpc fixes from Michael Ellerman:

 - A fix for undetected data corruption on Power9 Nimbus <= DD2.1 in the
   emulation of VSX loads. The affected CPUs were not widely available.

 - Two fixes for machine check handling in guests under PowerVM.

 - A fix for our recent changes to SMP setup, when
   CONFIG_CPUMASK_OFFSTACK=y.

 - Three fixes for races in the handling of some of our powernv sysfs
   attributes.

 - One change to remove TM from the set of Power10 CPU features.

 - A couple of other minor fixes.

Thanks to: Aneesh Kumar K.V, Christophe Leroy, Ganesh Goudar, Jordan
Niethe, Mahesh Salgaonkar, Michael Neuling, Oliver O'Halloran, Qian Cai,
Srikar Dronamraju, Vasant Hegde.

* tag 'powerpc-5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/pseries: Avoid using addr_to_pfn in real mode
  powerpc/uaccess: Don't use "m<>" constraint with GCC 4.9
  powerpc/eeh: Fix eeh_dev_check_failure() for PE#0
  powerpc/64s: Remove TM from Power10 features
  selftests/powerpc: Make alignment handler test P9N DD2.1 vector CI load workaround
  powerpc: Fix undetected data corruption with P9N DD2.1 VSX CI load emulation
  powerpc/powernv/dump: Handle multiple writes to ack attribute
  powerpc/powernv/dump: Fix race while processing OPAL dump
  powerpc/smp: Use GFP_ATOMIC while allocating tmp mask
  powerpc/smp: Remove unnecessary variable
  powerpc/mce: Avoid nmi_enter/exit in real mode on pseries hash
  powerpc/opal_elog: Handle multiple writes to ack attribute
parents 0593c1b4 4ff753fe

arch/powerpc/include/asm/asm-const.h

+13 −0
Original line number Diff line number Diff line
@@ -11,4 +11,17 @@ 
#  define __ASM_CONST(x)	x##UL

#  define ASM_CONST(x)		__ASM_CONST(x)

#endif



/*

 * Inline assembly memory constraint

 *

 * GCC 4.9 doesn't properly handle pre update memory constraint "m<>"

 *

 */

#if defined(GCC_VERSION) && GCC_VERSION < 50000

#define UPD_CONSTR ""

#else

#define UPD_CONSTR "<>"

#endif



#endif /* _ASM_POWERPC_ASM_CONST_H */

arch/powerpc/include/asm/cputable.h

+1 −1
Original line number Diff line number Diff line
@@ -477,7 +477,7 @@ static inline void cpu_feature_keys_init(void) { } 
	    CPU_FTR_STCX_CHECKS_ADDRESS | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \

	    CPU_FTR_CFAR | CPU_FTR_HVMODE | CPU_FTR_VMX_COPY | \

	    CPU_FTR_DBELL | CPU_FTR_HAS_PPR | CPU_FTR_ARCH_207S | \

	    CPU_FTR_TM_COMP | CPU_FTR_ARCH_300 | CPU_FTR_ARCH_31 | \

	    CPU_FTR_ARCH_300 | CPU_FTR_ARCH_31 | \

	    CPU_FTR_DAWR | CPU_FTR_DAWR1)

#define CPU_FTRS_CELL	(CPU_FTR_LWSYNC | \

	    CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \

arch/powerpc/include/asm/uaccess.h

+2 −2
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ do { \ 
		"1:	" op "%U1%X1 %0,%1	# put_user\n"	\

		EX_TABLE(1b, %l2)				\

		:						\

		: "r" (x), "m<>" (*addr)				\

		: "r" (x), "m"UPD_CONSTR (*addr)		\

		:						\

		: label)
@@ -253,7 +253,7 @@ extern long __get_user_bad(void); 
		".previous\n"				\

		EX_TABLE(1b, 3b)			\

		: "=r" (err), "=r" (x)			\

		: "m<>" (*addr), "i" (-EFAULT), "0" (err))

		: "m"UPD_CONSTR (*addr), "i" (-EFAULT), "0" (err))



#ifdef __powerpc64__

#define __get_user_asm2(x, addr, err)			\

arch/powerpc/kernel/cputable.c

+10 −3
Original line number Diff line number Diff line
@@ -121,9 +121,16 @@ extern void __restore_cpu_e6500(void); 
				 PPC_FEATURE2_DARN | \

				 PPC_FEATURE2_SCV)

#define COMMON_USER_POWER10	COMMON_USER_POWER9

#define COMMON_USER2_POWER10	(COMMON_USER2_POWER9 | \

				 PPC_FEATURE2_ARCH_3_1 | \

				 PPC_FEATURE2_MMA)

#define COMMON_USER2_POWER10	(PPC_FEATURE2_ARCH_3_1 | \

				 PPC_FEATURE2_MMA | \

				 PPC_FEATURE2_ARCH_3_00 | \

				 PPC_FEATURE2_HAS_IEEE128 | \

				 PPC_FEATURE2_DARN | \

				 PPC_FEATURE2_SCV | \

				 PPC_FEATURE2_ARCH_2_07 | \

				 PPC_FEATURE2_DSCR | \

				 PPC_FEATURE2_ISEL | PPC_FEATURE2_TAR | \

				 PPC_FEATURE2_VEC_CRYPTO)



#ifdef CONFIG_PPC_BOOK3E_64

#define COMMON_USER_BOOKE	(COMMON_USER_PPC64 | PPC_FEATURE_BOOKE)

arch/powerpc/kernel/eeh.c

+0 −5
Original line number Diff line number Diff line
@@ -466,11 +466,6 @@ int eeh_dev_check_failure(struct eeh_dev *edev) 
		return 0;

	}



	if (!pe->addr) {

		eeh_stats.no_cfg_addr++;

		return 0;

	}



	/*

	 * On PowerNV platform, we might already have fenced PHB

	 * there and we need take care of that firstly.

CRA Git | Maintained and supported by SUSTech CRA and CCSE