Commit 75603b14 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull more powerpc fixes from Michael Ellerman:

 - Fix a bug in copying of sigset_t for 32-bit systems, which caused X
   to not start.

 - Fix handling of shared LSIs (rare) with the xive interrupt controller
   (Power9/10).

 - Fix missing TOC setup in some KVM code, which could result in oopses
   depending on kernel data layout.

 - Fix DMA mapping when we have persistent memory and only one DMA
   window available.

 - Fix further problems with STRICT_KERNEL_RWX on 8xx, exposed by a
   recent fix.

 - A couple of other minor fixes.

Thanks to Alexey Kardashevskiy, Aneesh Kumar K.V, Cédric Le Goater,
Christian Zigotzky, Christophe Leroy, Daniel Axtens, Finn Thain, Greg
Kurz, Masahiro Yamada, Nicholas Piggin, and Uwe Kleine-König.

* tag 'powerpc-5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc/xive: Change IRQ domain to a tree domain
  powerpc/8xx: Fix pinned TLBs with CONFIG_STRICT_KERNEL_RWX
  powerpc/signal32: Fix sigset_t copy
  powerpc/book3e: Fix TLBCAM preset at boot
  powerpc/pseries/ddw: Do not try direct mapping with persistent memory and one window
  powerpc/pseries/ddw: simplify enable_ddw()
  powerpc/pseries/ddw: Revert "Extend upper limit for huge DMA window for persistent memory"
  powerpc/pseries: Fix numa FORM2 parsing fallback code
  powerpc/pseries: rename numa_dist_table to form2_distances
  powerpc: clean vdso32 and vdso64 directories
  powerpc/83xx/mpc8349emitx: Drop unused variable
  KVM: PPC: Book3S HV: Use GLOBAL_TOC for kvmppc_h_set_dabr/xdabr()
parents 61eb495c 8e80a73f

arch/powerpc/kernel/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -196,3 +196,6 @@ clean-files := vmlinux.lds 
# Force dependency (incbin is bad)

$(obj)/vdso32_wrapper.o : $(obj)/vdso32/vdso32.so.dbg

$(obj)/vdso64_wrapper.o : $(obj)/vdso64/vdso64.so.dbg



# for cleaning

subdir- += vdso32 vdso64

arch/powerpc/kernel/head_8xx.S

+7 −6
Original line number Diff line number Diff line
@@ -733,6 +733,7 @@ _GLOBAL(mmu_pin_tlb) 
#ifdef CONFIG_PIN_TLB_DATA

	LOAD_REG_IMMEDIATE(r6, PAGE_OFFSET)

	LOAD_REG_IMMEDIATE(r7, MI_SVALID | MI_PS8MEG | _PMD_ACCESSED)

	li	r8, 0

#ifdef CONFIG_PIN_TLB_IMMR

	li	r0, 3

#else
@@ -741,26 +742,26 @@ _GLOBAL(mmu_pin_tlb) 
	mtctr	r0

	cmpwi	r4, 0

	beq	4f

	LOAD_REG_IMMEDIATE(r8, 0xf0 | _PAGE_RO | _PAGE_SPS | _PAGE_SH | _PAGE_PRESENT)

	LOAD_REG_ADDR(r9, _sinittext)



2:	ori	r0, r6, MD_EVALID

	ori	r12, r8, 0xf0 | _PAGE_RO | _PAGE_SPS | _PAGE_SH | _PAGE_PRESENT

	mtspr	SPRN_MD_CTR, r5

	mtspr	SPRN_MD_EPN, r0

	mtspr	SPRN_MD_TWC, r7

	mtspr	SPRN_MD_RPN, r8

	mtspr	SPRN_MD_RPN, r12

	addi	r5, r5, 0x100

	addis	r6, r6, SZ_8M@h

	addis	r8, r8, SZ_8M@h

	cmplw	r6, r9

	bdnzt	lt, 2b



4:	LOAD_REG_IMMEDIATE(r8, 0xf0 | _PAGE_DIRTY | _PAGE_SPS | _PAGE_SH | _PAGE_PRESENT)

4:

2:	ori	r0, r6, MD_EVALID

	ori	r12, r8, 0xf0 | _PAGE_DIRTY | _PAGE_SPS | _PAGE_SH | _PAGE_PRESENT

	mtspr	SPRN_MD_CTR, r5

	mtspr	SPRN_MD_EPN, r0

	mtspr	SPRN_MD_TWC, r7

	mtspr	SPRN_MD_RPN, r8

	mtspr	SPRN_MD_RPN, r12

	addi	r5, r5, 0x100

	addis	r6, r6, SZ_8M@h

	addis	r8, r8, SZ_8M@h
@@ -781,7 +782,7 @@ _GLOBAL(mmu_pin_tlb) 
#endif

#if defined(CONFIG_PIN_TLB_IMMR) || defined(CONFIG_PIN_TLB_DATA)

	lis	r0, (MD_RSV4I | MD_TWAM)@h

	mtspr	SPRN_MI_CTR, r0

	mtspr	SPRN_MD_CTR, r0

#endif

	mtspr	SPRN_SRR1, r10

	mtspr	SPRN_SRR0, r11

arch/powerpc/kernel/signal.h

+8 −2
Original line number Diff line number Diff line
@@ -25,8 +25,14 @@ static inline int __get_user_sigset(sigset_t *dst, const sigset_t __user *src) 


	return __get_user(dst->sig[0], (u64 __user *)&src->sig[0]);

}

#define unsafe_get_user_sigset(dst, src, label) \

	unsafe_get_user((dst)->sig[0], (u64 __user *)&(src)->sig[0], label)

#define unsafe_get_user_sigset(dst, src, label) do {			\

	sigset_t *__dst = dst;						\

	const sigset_t __user *__src = src;				\

	int i;								\

									\

	for (i = 0; i < _NSIG_WORDS; i++)				\

		unsafe_get_user(__dst->sig[i], &__src->sig[i], label);	\

} while (0)



#ifdef CONFIG_VSX

extern unsigned long copy_vsx_to_user(void __user *to,

arch/powerpc/kvm/book3s_hv_rmhandlers.S

+2 −2
Original line number Diff line number Diff line
@@ -2005,7 +2005,7 @@ hcall_real_table: 
	.globl	hcall_real_table_end

hcall_real_table_end:



_GLOBAL(kvmppc_h_set_xdabr)

_GLOBAL_TOC(kvmppc_h_set_xdabr)

EXPORT_SYMBOL_GPL(kvmppc_h_set_xdabr)

	andi.	r0, r5, DABRX_USER | DABRX_KERNEL

	beq	6f
@@ -2015,7 +2015,7 @@ EXPORT_SYMBOL_GPL(kvmppc_h_set_xdabr) 
6:	li	r3, H_PARAMETER

	blr



_GLOBAL(kvmppc_h_set_dabr)

_GLOBAL_TOC(kvmppc_h_set_dabr)

EXPORT_SYMBOL_GPL(kvmppc_h_set_dabr)

	li	r5, DABRX_USER | DABRX_KERNEL

3:

arch/powerpc/mm/nohash/kaslr_booke.c

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ static unsigned long __init kaslr_choose_location(void *dt_ptr, phys_addr_t size 
		pr_warn("KASLR: No safe seed for randomizing the kernel base.\n");



	ram = min_t(phys_addr_t, __max_low_memory, size);

	ram = map_mem_in_cams(ram, CONFIG_LOWMEM_CAM_NUM, true, false);

	ram = map_mem_in_cams(ram, CONFIG_LOWMEM_CAM_NUM, true, true);

	linear_sz = min_t(unsigned long, ram, SZ_512M);



	/* If the linear size is smaller than 64M, do not randmize */