projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'powerpc-3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mpe/linux
[linux-drm-fsl-dcu.git]
/
drivers
/
misc
/
cxl
/
file.c
diff --git
a/drivers/misc/cxl/file.c
b/drivers/misc/cxl/file.c
index b15d8113877c9f6ed5c45c58fb012fa6f50276aa..2364bcadb9a94c195abc6398a77c734f45a7e468 100644
(file)
--- a/
drivers/misc/cxl/file.c
+++ b/
drivers/misc/cxl/file.c
@@
-23,6
+23,7
@@
#include <asm/copro.h>
#include "cxl.h"
#include <asm/copro.h>
#include "cxl.h"
+#include "trace.h"
#define CXL_NUM_MINORS 256 /* Total to reserve */
#define CXL_DEV_MINORS 13 /* 1 control + 4 AFUs * 3 (dedicated/master/shared) */
#define CXL_NUM_MINORS 256 /* Total to reserve */
#define CXL_DEV_MINORS 13 /* 1 control + 4 AFUs * 3 (dedicated/master/shared) */
@@
-186,9
+187,13
@@
static long afu_ioctl_start_work(struct cxl_context *ctx,
*/
ctx->pid = get_pid(get_task_pid(current, PIDTYPE_PID));
*/
ctx->pid = get_pid(get_task_pid(current, PIDTYPE_PID));
+ trace_cxl_attach(ctx, work.work_element_descriptor, work.num_interrupts, amr);
+
if ((rc = cxl_attach_process(ctx, false, work.work_element_descriptor,
if ((rc = cxl_attach_process(ctx, false, work.work_element_descriptor,
- amr)))
+ amr))) {
+ afu_release_irqs(ctx);
goto out;
goto out;
+ }
ctx->status = STARTED;
rc = 0;
ctx->status = STARTED;
rc = 0;