Commit 95dff480 authored by Michael Ellerman's avatar Michael Ellerman
Browse files

Merge branch 'fixes' into next 

Merge our fixes branch from the 4.16 cycle.

There were a number of important fixes merged, in particular some Power9
workarounds that we want in next for testing purposes. There's also been
some conflicting changes in the CPU features code which are best merged
and tested before going upstream.
parents c0b34672 52396500

Documentation/accelerators/ocxl.rst

+5 −0
Original line number Diff line number Diff line
@@ -152,6 +152,11 @@ OCXL_IOCTL_IRQ_SET_FD: 
  Associate an event fd to an AFU interrupt so that the user process

  can be notified when the AFU sends an interrupt.



OCXL_IOCTL_GET_METADATA:



  Obtains configuration information from the card, such at the size of

  MMIO areas, the AFU version, and the PASID for the current context.





mmap

----

arch/powerpc/boot/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ $(addprefix $(obj)/,$(zlib-y)): \ 
libfdt       := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c

libfdtheader := fdt.h libfdt.h libfdt_internal.h



$(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o epapr.o opal.o): \

$(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o epapr.o opal.o \

	treeboot-akebono.o treeboot-currituck.o treeboot-iss4xx.o): \

	$(addprefix $(obj)/,$(libfdtheader))



src-wlib-y := string.S crt0.S stdio.c decompress.c main.c \

arch/powerpc/include/asm/book3s/64/mmu.h

+3 −0
Original line number Diff line number Diff line
@@ -97,6 +97,9 @@ typedef struct { 
	/* Number of bits in the mm_cpumask */

	atomic_t active_cpus;



	/* Number of users of the external (Nest) MMU */

	atomic_t copros;



	/* NPU NMMU context */

	struct npu_context *npu_context;

arch/powerpc/include/asm/book3s/64/tlbflush-radix.h

+0 −3
Original line number Diff line number Diff line
@@ -47,9 +47,6 @@ extern void radix__flush_tlb_page_psize(struct mm_struct *mm, unsigned long vmad 
#endif

extern void radix__flush_tlb_pwc(struct mmu_gather *tlb, unsigned long addr);

extern void radix__flush_tlb_collapsed_pmd(struct mm_struct *mm, unsigned long addr);

extern void radix__flush_tlb_lpid_va(unsigned long lpid, unsigned long gpa,

				     unsigned long page_size);

extern void radix__flush_tlb_lpid(unsigned long lpid);

extern void radix__flush_tlb_all(void);

extern void radix__flush_tlb_pte_p9_dd1(unsigned long old_pte, struct mm_struct *mm,

					unsigned long address);

arch/powerpc/include/asm/cputable.h

+3 −1
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ static inline void cpu_feature_keys_init(void) { } 
#define CPU_FTR_POWER9_DD2_1		LONG_ASM_CONST(0x0000080000000000)

#define CPU_FTR_P9_TM_HV_ASSIST		LONG_ASM_CONST(0x0000100000000000)

#define CPU_FTR_P9_TM_XER_SO_BUG	LONG_ASM_CONST(0x0000200000000000)

#define CPU_FTR_P9_TLBIE_BUG		LONG_ASM_CONST(0x0000400000000000)



#ifndef __ASSEMBLY__
@@ -465,7 +466,8 @@ 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_PKEY)

	    CPU_FTR_TM_COMP | CPU_FTR_ARCH_300 | CPU_FTR_PKEY | \

	    CPU_FTR_P9_TLBIE_BUG)

#define CPU_FTRS_POWER9_DD1 ((CPU_FTRS_POWER9 | CPU_FTR_POWER9_DD1) & \

			     (~CPU_FTR_SAO))

#define CPU_FTRS_POWER9_DD2_0 CPU_FTRS_POWER9

CRA Git | Maintained and supported by SUSTech CRA and CCSE