diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-29 18:50:08 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-29 18:50:08 -0700 |
| commit | 1b46bac6275506db73592aa8b9bd1d67c79b95dc (patch) | |
| tree | 4294a77a5532896dfcc6730584944becdeabcee0 /drivers/misc/cxl/context.c | |
| parent | 65c4cbeba797e3fce68aba899e066f50e638e08d (diff) | |
| parent | d701cca6744fe0d67c86346dcfc9b128b17b5045 (diff) | |
| download | linux-1b46bac6275506db73592aa8b9bd1d67c79b95dc.tar.gz linux-1b46bac6275506db73592aa8b9bd1d67c79b95dc.tar.bz2 linux-1b46bac6275506db73592aa8b9bd1d67c79b95dc.zip | |
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
Diffstat (limited to 'drivers/misc/cxl/context.c')
| -rw-r--r-- | drivers/misc/cxl/context.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/misc/cxl/context.c b/drivers/misc/cxl/context.c index 10370f280500..7edea9c19199 100644 --- a/drivers/misc/cxl/context.c +++ b/drivers/misc/cxl/context.c @@ -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); |