Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1b46bac6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'powerpc-4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux 

Pull powerpc fixes from Michael Ellerman:
 "A few more powerpc fixes for 4.6:

   - cxl: Keep IRQ mappings on context teardown from Michael Neuling

   - cxl: Poll for outstanding IRQs when detaching a context from
     Michael Neuling

   - Wire up preadv2 and pwritev2 syscalls from Rui Salvaterra"

* tag 'powerpc-4.6-4' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
  powerpc: wire up preadv2 and pwritev2 syscalls
  cxl: Poll for outstanding IRQs when detaching a context
  cxl: Keep IRQ mappings on context teardown
parents 65c4cbeb d701cca6

arch/powerpc/include/asm/systbl.h

+2 −0
Original line number Diff line number Diff line
@@ -384,3 +384,5 @@ SYSCALL(ni_syscall) 
SYSCALL(ni_syscall)

SYSCALL(mlock2)

SYSCALL(copy_file_range)

COMPAT_SYS_SPU(preadv2)

COMPAT_SYS_SPU(pwritev2)

arch/powerpc/include/asm/unistd.h

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
#include <uapi/asm/unistd.h>





#define NR_syscalls		380

#define NR_syscalls		382



#define __NR__exit __NR_exit

arch/powerpc/include/uapi/asm/unistd.h

+2 −0
Original line number Diff line number Diff line
@@ -390,5 +390,7 @@ 
#define __NR_membarrier		365

#define __NR_mlock2		378

#define __NR_copy_file_range	379

#define __NR_preadv2		380

#define __NR_pwritev2		381



#endif /* _UAPI_ASM_POWERPC_UNISTD_H_ */

drivers/misc/cxl/context.c

+7 −0
Original line number Diff line number Diff line
@@ -223,6 +223,13 @@ int __detach_context(struct cxl_context *ctx) 
		cxl_ops->link_ok(ctx->afu->adapter, ctx->afu));

	flush_work(&ctx->fault_work); /* Only needed for dedicated process */



	/*

	 * Wait until no further interrupts are presented by the PSL

	 * for this context.

	 */

	if (cxl_ops->irq_wait)

		cxl_ops->irq_wait(ctx);



	/* release the reference to the group leader and mm handling pid */

	put_pid(ctx->pid);

	put_pid(ctx->glpid);

drivers/misc/cxl/cxl.h

+2 −0
Original line number Diff line number Diff line
@@ -274,6 +274,7 @@ static const cxl_p2n_reg_t CXL_PSL_WED_An = {0x0A0}; 
#define CXL_PSL_DSISR_An_PE (1ull << (63-4))  /* PSL Error (implementation specific) */

#define CXL_PSL_DSISR_An_AE (1ull << (63-5))  /* AFU Error */

#define CXL_PSL_DSISR_An_OC (1ull << (63-6))  /* OS Context Warning */

#define CXL_PSL_DSISR_PENDING (CXL_PSL_DSISR_TRANS | CXL_PSL_DSISR_An_PE | CXL_PSL_DSISR_An_AE | CXL_PSL_DSISR_An_OC)

/* NOTE: Bits 32:63 are undefined if DSISR[DS] = 1 */

#define CXL_PSL_DSISR_An_M  DSISR_NOHPTE      /* PTE not found */

#define CXL_PSL_DSISR_An_P  DSISR_PROTFAULT   /* Storage protection violation */
@@ -855,6 +856,7 @@ struct cxl_backend_ops { 
					u64 dsisr, u64 errstat);

	irqreturn_t (*psl_interrupt)(int irq, void *data);

	int (*ack_irq)(struct cxl_context *ctx, u64 tfc, u64 psl_reset_mask);

	void (*irq_wait)(struct cxl_context *ctx);

	int (*attach_process)(struct cxl_context *ctx, bool kernel,

			u64 wed, u64 amr);

	int (*detach_process)(struct cxl_context *ctx);