diff options
| author | Alastair D'Silva <alastair@d-silva.org> | 2019-03-27 16:31:34 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-05-03 02:55:02 +1000 |
| commit | 2ec3b7ed2ab8e07fdb5f800ff420e94dec75435f (patch) | |
| tree | acdfb4e33f79649bfdf85da299e3e33c6437a532 /drivers/misc/ocxl/file.c | |
| parent | b9721d275cc2c5e6c07371239c827e0faf05a6b9 (diff) | |
ocxl: afu_irq only deals with IRQ IDs, not offsets
The use of offsets is required only in the frontend, so alter
the IRQ API to only work with IRQ IDs in the backend.
Signed-off-by: Alastair D'Silva <alastair@d-silva.org>
Acked-by: Frederic Barrat <fbarrat@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'drivers/misc/ocxl/file.c')
| -rw-r--r-- | drivers/misc/ocxl/file.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index 8225892a5d77..7f5282a3af3a 100644 --- a/drivers/misc/ocxl/file.c +++ b/drivers/misc/ocxl/file.c @@ -188,6 +188,7 @@ static long afu_ioctl(struct file *file, unsigned int cmd, { struct ocxl_context *ctx = file->private_data; struct ocxl_ioctl_irq_fd irq_fd; + int irq_id; u64 irq_offset; long rc; bool closed; @@ -209,12 +210,13 @@ static long afu_ioctl(struct file *file, unsigned int cmd, break; case OCXL_IOCTL_IRQ_ALLOC: - rc = ocxl_afu_irq_alloc(ctx, &irq_offset); + rc = ocxl_afu_irq_alloc(ctx, &irq_id); if (!rc) { + irq_offset = ocxl_irq_id_to_offset(ctx, irq_id); rc = copy_to_user((u64 __user *) args, &irq_offset, sizeof(irq_offset)); if (rc) { - ocxl_afu_irq_free(ctx, irq_offset); + ocxl_afu_irq_free(ctx, irq_id); return -EFAULT; } } @@ -225,7 +227,8 @@ static long afu_ioctl(struct file *file, unsigned int cmd, sizeof(irq_offset)); if (rc) return -EFAULT; - rc = ocxl_afu_irq_free(ctx, irq_offset); + irq_id = ocxl_irq_offset_to_id(ctx, irq_offset); + rc = ocxl_afu_irq_free(ctx, irq_id); break; case OCXL_IOCTL_IRQ_SET_FD: @@ -235,8 +238,8 @@ static long afu_ioctl(struct file *file, unsigned int cmd, return -EFAULT; if (irq_fd.reserved) return -EINVAL; - rc = ocxl_afu_irq_set_fd(ctx, irq_fd.irq_offset, - irq_fd.eventfd); + irq_id = ocxl_irq_offset_to_id(ctx, irq_fd.irq_offset); + rc = ocxl_afu_irq_set_fd(ctx, irq_id, irq_fd.eventfd); break; case OCXL_IOCTL_GET_METADATA: |