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

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

Pull powerpc updates from Michael Ellerman:

 - A large series adding wrappers for our interrupt handlers, so that
   irq/nmi/user tracking can be isolated in the wrappers rather than
   spread in each handler.

 - Conversion of the 32-bit syscall handling into C.

 - A series from Nick to streamline our TLB flushing when using the
   Radix MMU.

 - Switch to using queued spinlocks by default for 64-bit server CPUs.

 - A rework of our PCI probing so that it happens later in boot, when
   more generic infrastructure is available.

 - Two small fixes to allow 32-bit little-endian processes to run on
   64-bit kernels.

 - Other smaller features, fixes & cleanups.

Thanks to: Alexey Kardashevskiy, Ananth N Mavinakayanahalli, Aneesh
Kumar K.V, Athira Rajeev, Bhaskar Chowdhury, Cédric Le Goater, Chengyang
Fan, Christophe Leroy, Christopher M. Riedl, Fabiano Rosas, Florian
Fainelli, Frederic Barrat, Ganesh Goudar, Hari Bathini, Jiapeng Chong,
Joseph J Allen, Kajol Jain, Markus Elfring, Michal Suchanek, Nathan
Lynch, Naveen N. Rao, Nicholas Piggin, Oliver O'Halloran, Pingfan Liu,
Po-Hsu Lin, Qian Cai, Ram Pai, Randy Dunlap, Sandipan Das, Stephen
Rothwell, Tyrel Datwyler, Will Springer, Yury Norov, and Zheng Yongjun.

* tag 'powerpc-5.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (188 commits)
  powerpc/perf: Adds support for programming of Thresholding in P10
  powerpc/pci: Remove unimplemented prototypes
  powerpc/uaccess: Merge raw_copy_to_user_allowed() into raw_copy_to_user()
  powerpc/uaccess: Merge __put_user_size_allowed() into __put_user_size()
  powerpc/uaccess: get rid of small constant size cases in raw_copy_{to,from}_user()
  powerpc/64: Fix stack trace not displaying final frame
  powerpc/time: Remove get_tbl()
  powerpc/time: Avoid using get_tbl()
  spi: mpc52xx: Avoid using get_tbl()
  powerpc/syscall: Avoid storing 'current' in another pointer
  powerpc/32: Handle bookE debugging in C in syscall entry/exit
  powerpc/syscall: Do not check unsupported scv vector on PPC32
  powerpc/32: Remove the counter in global_dbcr0
  powerpc/32: Remove verification of MSR_PR on syscall in the ASM entry
  powerpc/syscall: implement system call entry/exit logic in C for PPC32
  powerpc/32: Always save non volatile GPRs at syscall entry
  powerpc/syscall: Change condition to check MSR_RI
  powerpc/syscall: Save r3 in regs->orig_r3
  powerpc/syscall: Use is_compat_task()
  powerpc/syscall: Make interrupt.c buildable on PPC32
  ...
parents 6ff6f86b 82d2c16b

arch/powerpc/Kconfig

+8 −27
Original line number Diff line number Diff line
@@ -196,7 +196,6 @@ config PPC 
	select HAVE_STACKPROTECTOR		if PPC64 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r13)

	select HAVE_STACKPROTECTOR		if PPC32 && $(cc-option,-mstack-protector-guard=tls -mstack-protector-guard-reg=r2)

	select HAVE_CONTEXT_TRACKING		if PPC64

	select HAVE_TIF_NOHZ			if PPC64

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DEBUG_STACKOVERFLOW

	select HAVE_DYNAMIC_FTRACE
@@ -503,18 +502,14 @@ config HOTPLUG_CPU 
	  Say N if you are unsure.



config PPC_QUEUED_SPINLOCKS

	bool "Queued spinlocks"

	bool "Queued spinlocks" if EXPERT

	depends on SMP

	default PPC_BOOK3S_64

	help

	  Say Y here to use queued spinlocks which give better scalability and

	  fairness on large SMP and NUMA systems without harming single threaded

	  performance.



	  This option is currently experimental, the code is more complex and

	  less tested so it defaults to "N" for the moment.



	  If unsure, say "N".



config ARCH_CPU_PROBE_RELEASE

	def_bool y

	depends on HOTPLUG_CPU
@@ -718,18 +713,6 @@ config ARCH_MEMORY_PROBE 
	def_bool y

	depends on MEMORY_HOTPLUG



config STDBINUTILS

	bool "Using standard binutils settings"

	depends on 44x

	default y

	help

	  Turning this option off allows you to select 256KB PAGE_SIZE on 44x.

	  Note, that kernel will be able to run only those applications,

	  which had been compiled using binutils later than 2.17.50.0.3 with

	  '-zmax-page-size' set to 256K (the default is 64K). Or, if using

	  the older binutils, you can patch them with a trivial patch, which

	  changes the ELF_MAXPAGESIZE definition from 0x10000 to 0x40000.



choice

	prompt "Page size"

	default PPC_4K_PAGES
@@ -769,17 +752,15 @@ config PPC_64K_PAGES 
	select HAVE_ARCH_SOFT_DIRTY if PPC_BOOK3S_64



config PPC_256K_PAGES

	bool "256k page size"

	depends on 44x && !STDBINUTILS

	bool "256k page size (Requires non-standard binutils settings)"

	depends on 44x && !PPC_47x

	help

	  Make the page size 256k.



	  As the ELF standard only requires alignment to support page

	  sizes up to 64k, you will need to compile all of your user

	  space applications with a non-standard binutils settings

	  (see the STDBINUTILS description for details).



	  Say N unless you know what you are doing.

	  The kernel will only be able to run applications that have been

	  compiled with '-zmax-page-size' set to 256K (the default is 64K) using

	  binutils later than 2.17.50.0.3, or by patching the ELF_MAXPAGESIZE

	  definition from 0x10000 to 0x40000 in older versions.



endchoice

arch/powerpc/Kconfig.debug

+1 −0
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ config PPC_IRQ_SOFT_MASK_DEBUG 
config XMON

	bool "Include xmon kernel debugger"

	depends on DEBUG_KERNEL

	select CONSOLE_POLL if SERIAL_CPM_CONSOLE

	help

	  Include in-kernel hooks for the xmon kernel monitor/debugger.

	  Unless you are intending to debug the kernel, say N here.

arch/powerpc/configs/44x/akebono_defconfig

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ CONFIG_IRQ_ALL_CPUS=y 
# CONFIG_COMPACTION is not set

# CONFIG_SUSPEND is not set

CONFIG_NET=y

CONFIG_NETDEVICES=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CONFIG_INET=y
@@ -40,7 +41,9 @@ CONFIG_BLK_DEV_RAM_SIZE=35000 
# CONFIG_SCSI_PROC_FS is not set

CONFIG_BLK_DEV_SD=y

# CONFIG_SCSI_LOWLEVEL is not set

CONFIG_ATA=y

# CONFIG_SATA_PMP is not set

CONFIG_SATA_AHCI_PLATFORM=y

# CONFIG_ATA_SFF is not set

# CONFIG_NET_VENDOR_3COM is not set

# CONFIG_NET_VENDOR_ADAPTEC is not set
@@ -97,6 +100,8 @@ CONFIG_USB_OHCI_HCD=y 
# CONFIG_USB_OHCI_HCD_PCI is not set

CONFIG_USB_STORAGE=y

CONFIG_MMC=y

CONFIG_MMC_SDHCI=y

CONFIG_MMC_SDHCI_PLTFM=y

CONFIG_RTC_CLASS=y

CONFIG_RTC_DRV_M41T80=y

CONFIG_EXT2_FS=y

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

+0 −29
Original line number Diff line number Diff line
@@ -56,35 +56,6 @@ int exit_vmx_usercopy(void); 
int enter_vmx_ops(void);

void *exit_vmx_ops(void *dest);



/* Traps */

long machine_check_early(struct pt_regs *regs);

long hmi_exception_realmode(struct pt_regs *regs);

void SMIException(struct pt_regs *regs);

void handle_hmi_exception(struct pt_regs *regs);

void instruction_breakpoint_exception(struct pt_regs *regs);

void RunModeException(struct pt_regs *regs);

void single_step_exception(struct pt_regs *regs);

void program_check_exception(struct pt_regs *regs);

void alignment_exception(struct pt_regs *regs);

void StackOverflow(struct pt_regs *regs);

void stack_overflow_exception(struct pt_regs *regs);

void kernel_fp_unavailable_exception(struct pt_regs *regs);

void altivec_unavailable_exception(struct pt_regs *regs);

void vsx_unavailable_exception(struct pt_regs *regs);

void fp_unavailable_tm(struct pt_regs *regs);

void altivec_unavailable_tm(struct pt_regs *regs);

void vsx_unavailable_tm(struct pt_regs *regs);

void facility_unavailable_exception(struct pt_regs *regs);

void TAUException(struct pt_regs *regs);

void altivec_assist_exception(struct pt_regs *regs);

void unrecoverable_exception(struct pt_regs *regs);

void kernel_bad_stack(struct pt_regs *regs);

void system_reset_exception(struct pt_regs *regs);

void machine_check_exception(struct pt_regs *regs);

void emulation_assist_interrupt(struct pt_regs *regs);

long do_slb_fault(struct pt_regs *regs, unsigned long ea);

void do_bad_slb_fault(struct pt_regs *regs, unsigned long ea, long err);



/* signals, syscalls and interrupts */

long sys_swapcontext(struct ucontext __user *old_ctx,

		    struct ucontext __user *new_ctx,

arch/powerpc/include/asm/book3s/32/kup.h

+4 −4
Original line number Diff line number Diff line
@@ -95,12 +95,12 @@ static inline void kuap_update_sr(u32 sr, u32 addr, u32 end) 
	addr &= 0xf0000000;	/* align addr to start of segment */

	barrier();	/* make sure thread.kuap is updated before playing with SRs */

	while (addr < end) {

		mtsrin(sr, addr);

		mtsr(sr, addr);

		sr += 0x111;		/* next VSID */

		sr &= 0xf0ffffff;	/* clear VSID overflow */

		addr += 0x10000000;	/* address of next segment */

	}

	isync();	/* Context sync required after mtsrin() */

	isync();	/* Context sync required after mtsr() */

}



static __always_inline void allow_user_access(void __user *to, const void __user *from,
@@ -122,7 +122,7 @@ static __always_inline void allow_user_access(void __user *to, const void __user 
	end = min(addr + size, TASK_SIZE);



	current->thread.kuap = (addr & 0xf0000000) | ((((end - 1) >> 28) + 1) & 0xf);

	kuap_update_sr(mfsrin(addr) & ~SR_KS, addr, end);	/* Clear Ks */

	kuap_update_sr(mfsr(addr) & ~SR_KS, addr, end);	/* Clear Ks */

}



static __always_inline void prevent_user_access(void __user *to, const void __user *from,
@@ -151,7 +151,7 @@ static __always_inline void prevent_user_access(void __user *to, const void __us 
	}



	current->thread.kuap = 0;

	kuap_update_sr(mfsrin(addr) | SR_KS, addr, end);	/* set Ks */

	kuap_update_sr(mfsr(addr) | SR_KS, addr, end);	/* set Ks */

}



static inline unsigned long prevent_user_access_return(void)