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

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

Pull powerpc fixes from Michael Ellerman:

 - Add perf support for emitting extended registers for power10.

 - A fix for CPU hotplug on pseries, where on large/loaded systems we
   may not wait long enough for the CPU to be offlined, leading to
   crashes.

 - Addition of a raw cputable entry for Power10, which is not required
   to boot, but is required to make our PMU setup work correctly in
   guests.

 - Three fixes for the recent changes on 32-bit Book3S to move modules
   into their own segment for strict RWX.

 - A fix for a recent change in our powernv PCI code that could lead to
   crashes.

 - A change to our perf interrupt accounting to avoid soft lockups when
   using some events, found by syzkaller.

 - A change in the way we handle power loss events from the hypervisor
   on pseries. We no longer immediately shut down if we're told we're
   running on a UPS.

 - A few other minor fixes.

Thanks to Alexey Kardashevskiy, Andreas Schwab, Aneesh Kumar K.V, Anju T
Sudhakar, Athira Rajeev, Christophe Leroy, Frederic Barrat, Greg Kurz,
Kajol Jain, Madhavan Srinivasan, Michael Neuling, Michael Roth,
Nageswara R Sastry, Oliver O'Halloran, Thiago Jung Bauermann,
Vaidyanathan Srinivasan, Vasant Hegde.

* tag 'powerpc-5.9-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/perf/hv-24x7: Move cpumask file to top folder of hv-24x7 driver
  powerpc/32s: Fix module loading failure when VMALLOC_END is over 0xf0000000
  powerpc/pseries: Do not initiate shutdown when system is running on UPS
  powerpc/perf: Fix soft lockups due to missed interrupt accounting
  powerpc/powernv/pci: Fix possible crash when releasing DMA resources
  powerpc/pseries/hotplug-cpu: wait indefinitely for vCPU death
  powerpc/32s: Fix is_module_segment() when MODULES_VADDR is defined
  powerpc/kasan: Fix KASAN_SHADOW_START on BOOK3S_32
  powerpc/fixmap: Fix the size of the early debug area
  powerpc/pkeys: Fix build error with PPC_MEM_KEYS disabled
  powerpc/kernel: Cleanup machine check function declarations
  powerpc: Add POWER10 raw mode cputable entry
  powerpc/perf: Add extended regs support for power10 platform
  powerpc/perf: Add support for outputting extended regs in perf intr_regs
  powerpc: Fix P10 PVR revision in /proc/cpuinfo for SMT4 cores
parents 550c2129 64ef8f2c

Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_24x7

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ Description: read only 
		This sysfs interface exposes the number of cores per chip

		present in the system.



What:		/sys/devices/hv_24x7/interface/cpumask

What:		/sys/devices/hv_24x7/cpumask

Date:		July 2020

Contact:	Linux on PowerPC Developer List <linuxppc-dev@lists.ozlabs.org>

Description:	read only

arch/powerpc/include/asm/cputable.h

+5 −0
Original line number Diff line number Diff line
@@ -9,6 +9,11 @@ 


#ifndef __ASSEMBLY__



/*

 * Added to include __machine_check_early_realmode_* functions

 */

#include <asm/mce.h>



/* This structure can grow, it's real size is used by head.S code

 * via the mkdefs mechanism.

 */

arch/powerpc/include/asm/fixmap.h

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ enum fixed_addresses { 
	FIX_HOLE,

	/* reserve the top 128K for early debugging purposes */

	FIX_EARLY_DEBUG_TOP = FIX_HOLE,

	FIX_EARLY_DEBUG_BASE = FIX_EARLY_DEBUG_TOP+(ALIGN(SZ_128, PAGE_SIZE)/PAGE_SIZE)-1,

	FIX_EARLY_DEBUG_BASE = FIX_EARLY_DEBUG_TOP+(ALIGN(SZ_128K, PAGE_SIZE)/PAGE_SIZE)-1,

#ifdef CONFIG_HIGHMEM

	FIX_KMAP_BEGIN,	/* reserved pte's for temporary kernel mappings */

	FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,

arch/powerpc/include/asm/kasan.h

+8 −1
Original line number Diff line number Diff line
@@ -15,11 +15,18 @@ 
#ifndef __ASSEMBLY__



#include <asm/page.h>

#include <linux/sizes.h>



#define KASAN_SHADOW_SCALE_SHIFT	3



#if defined(CONFIG_PPC_BOOK3S_32) && defined(CONFIG_MODULES) && defined(CONFIG_STRICT_KERNEL_RWX)

#define KASAN_KERN_START	ALIGN_DOWN(PAGE_OFFSET - SZ_256M, SZ_256M)

#else

#define KASAN_KERN_START	PAGE_OFFSET

#endif



#define KASAN_SHADOW_START	(KASAN_SHADOW_OFFSET + \

				 (PAGE_OFFSET >> KASAN_SHADOW_SCALE_SHIFT))

				 (KASAN_KERN_START >> KASAN_SHADOW_SCALE_SHIFT))



#define KASAN_SHADOW_OFFSET	ASM_CONST(CONFIG_KASAN_SHADOW_OFFSET)

arch/powerpc/include/asm/mce.h

+7 −0
Original line number Diff line number Diff line
@@ -210,6 +210,9 @@ struct mce_error_info { 
#define MCE_EVENT_RELEASE	true

#define MCE_EVENT_DONTRELEASE	false



struct pt_regs;

struct notifier_block;



extern void save_mce_event(struct pt_regs *regs, long handled,

			   struct mce_error_info *mce_err, uint64_t nip,

			   uint64_t addr, uint64_t phys_addr);
@@ -225,5 +228,9 @@ int mce_register_notifier(struct notifier_block *nb); 
int mce_unregister_notifier(struct notifier_block *nb);

#ifdef CONFIG_PPC_BOOK3S_64

void flush_and_reload_slb(void);

long __machine_check_early_realmode_p7(struct pt_regs *regs);

long __machine_check_early_realmode_p8(struct pt_regs *regs);

long __machine_check_early_realmode_p9(struct pt_regs *regs);

long __machine_check_early_realmode_p10(struct pt_regs *regs);

#endif /* CONFIG_PPC_BOOK3S_64 */

#endif /* __ASM_PPC64_MCE_H__ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE