Commit 95ec54a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull powerpc updates from Madhavan Srinivasan:

 - Add preempt lazy support

 - Deprecate cxl and cxl flash driver

 - Fix a possible IOMMU related OOPS at boot on pSeries

 - Optimize sched_clock() in ppc32 by replacing mulhdu() by
   mul_u64_u64_shr()

Thanks to Andrew Donnellan, Andy Shevchenko, Ankur Arora, Christophe
Leroy, Frederic Barrat, Gaurav Batra, Luis Felipe Hernandez, Michael
Ellerman, Nilay Shroff, Ricardo B.  Marliere, Ritesh Harjani (IBM),
Sebastian Andrzej Siewior, Shrikanth Hegde, Sourabh Jain, Thorsten Blum,
and Zhu Jun.

* tag 'powerpc-6.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  selftests/powerpc: Fix argument order to timer_sub()
  powerpc/prom_init: Use IS_ENABLED()
  powerpc/pseries/iommu: IOMMU incorrectly marks MMIO range in DDW
  powerpc: Use str_on_off() helper in check_cache_coherency()
  powerpc: Large user copy aware of full:rt:lazy preemption
  powerpc: Add preempt lazy support
  powerpc/book3s64/hugetlb: Fix disabling hugetlb when fadump is active
  powerpc/vdso: Mark the vDSO code read-only after init
  powerpc/64: Use get_user() in start_thread()
  macintosh: declare ctl_table as const
  selftest/powerpc/ptrace: Cleanup duplicate macro definitions
  selftest/powerpc/ptrace/ptrace-pkey: Remove duplicate macros
  selftest/powerpc/ptrace/core-pkey: Remove duplicate macros
  powerpc/8xx: Drop legacy-of-mm-gpiochip.h header
  scsi/cxlflash: Deprecate driver
  cxl: Deprecate driver
  selftests/powerpc: Fix typo in test-vphn.c
  powerpc/xmon: Use str_yes_no() helper in dump_one_paca()
  powerpc/32: Replace mulhdu() by mul_u64_u64_shr()
parents 9ad09c4f 2bf66e66

Documentation/ABI/testing/sysfs-class-cxl→Documentation/ABI/obsolete/sysfs-class-cxl

+3 −0
Original line number Diff line number Diff line 
The cxl driver is no longer maintained, and will be removed from the kernel in

the near future.



Please note that attributes that are shared between devices are stored in

the directory pointed to by the symlink device/.

For example, the real path of the attribute /sys/class/cxl/afu0.0s/irqs_max is

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -6226,8 +6226,8 @@ CXL (IBM Coherent Accelerator Processor Interface CAPI) DRIVER 
M:	Frederic Barrat <fbarrat@linux.ibm.com>

M:	Andrew Donnellan <ajd@linux.ibm.com>

L:	linuxppc-dev@lists.ozlabs.org

S:	Supported

F:	Documentation/ABI/testing/sysfs-class-cxl

S:	Obsolete

F:	Documentation/ABI/obsolete/sysfs-class-cxl

F:	Documentation/arch/powerpc/cxl.rst

F:	arch/powerpc/platforms/powernv/pci-cxl.c

F:	drivers/misc/cxl/

arch/powerpc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ config PPC 
	select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE

	select ARCH_HAS_PHYS_TO_DMA

	select ARCH_HAS_PMEM_API

	select ARCH_HAS_PREEMPT_LAZY

	select ARCH_HAS_PTE_DEVMAP		if PPC_BOOK3S_64

	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_SCALED_CPUTIME		if VIRT_CPU_ACCOUNTING_NATIVE && PPC_BOOK3S_64

arch/powerpc/include/asm/hugetlb.h

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


extern bool hugetlb_disabled;



static inline bool hugepages_supported(void)

{

	if (hugetlb_disabled)

		return false;



	return HPAGE_SHIFT != 0;

}

#define hugepages_supported hugepages_supported



void __init hugetlbpage_init_defaultsize(void);



int slice_is_hugepage_only_range(struct mm_struct *mm, unsigned long addr,

arch/powerpc/include/asm/thread_info.h

+6 −3
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ void arch_setup_new_exec(void); 
#define TIF_PATCH_PENDING	6	/* pending live patching update */

#define TIF_SYSCALL_AUDIT	7	/* syscall auditing active */

#define TIF_SINGLESTEP		8	/* singlestepping active */

#define TIF_NEED_RESCHED_LAZY	9       /* Scheduler driven lazy preemption */

#define TIF_SECCOMP		10	/* secure computing */

#define TIF_RESTOREALL		11	/* Restore all regs (implies NOERROR) */

#define TIF_NOERROR		12	/* Force successful syscall return */
@@ -122,6 +123,7 @@ void arch_setup_new_exec(void); 
#define _TIF_SYSCALL_TRACE	(1<<TIF_SYSCALL_TRACE)

#define _TIF_SIGPENDING		(1<<TIF_SIGPENDING)

#define _TIF_NEED_RESCHED	(1<<TIF_NEED_RESCHED)

#define _TIF_NEED_RESCHED_LAZY	(1<<TIF_NEED_RESCHED_LAZY)

#define _TIF_NOTIFY_SIGNAL	(1<<TIF_NOTIFY_SIGNAL)

#define _TIF_POLLING_NRFLAG	(1<<TIF_POLLING_NRFLAG)

#define _TIF_32BIT		(1<<TIF_32BIT)
@@ -142,9 +144,10 @@ void arch_setup_new_exec(void); 
				 _TIF_SYSCALL_EMU)



#define _TIF_USER_WORK_MASK	(_TIF_SIGPENDING | _TIF_NEED_RESCHED | \

				 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \

				 _TIF_RESTORE_TM | _TIF_PATCH_PENDING | \

				 _TIF_NOTIFY_SIGNAL)

				 _TIF_NEED_RESCHED_LAZY | _TIF_NOTIFY_RESUME | \

				 _TIF_UPROBE | _TIF_RESTORE_TM | \

				 _TIF_PATCH_PENDING | _TIF_NOTIFY_SIGNAL)



#define _TIF_PERSYSCALL_MASK	(_TIF_RESTOREALL|_TIF_NOERROR)



/* Bits in local_flags */