These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / misc / cxl / file.c

diff --git a/kernel/drivers/misc/cxl/file.c b/kernel/drivers/misc/cxl/file.c
index 2364bca..7ccd299 100644 (file)
--- a/kernel/drivers/misc/cxl/file.c
+++ b/kernel/drivers/misc/cxl/file.c
@@ -73,6 +73,11 @@ static int __afu_open(struct inode *inode, struct file *file, bool master)
        if (!afu->current_mode)
                goto err_put_afu;
 
+       if (!cxl_adapter_link_ok(adapter)) {
+               rc = -EIO;
+               goto err_put_afu;
+       }
+
        if (!(ctx = cxl_context_alloc())) {
                rc = -ENOMEM;
                goto err_put_afu;
@@ -96,7 +101,8 @@ err_put_adapter:
        put_device(&adapter->dev);
        return rc;
 }
-static int afu_open(struct inode *inode, struct file *file)
+
+int afu_open(struct inode *inode, struct file *file)
 {
        return __afu_open(inode, file, false);
 }
@@ -106,7 +112,7 @@ static int afu_master_open(struct inode *inode, struct file *file)
        return __afu_open(inode, file, true);
 }
 
-static int afu_release(struct inode *inode, struct file *file)
+int afu_release(struct inode *inode, struct file *file)
 {
        struct cxl_context *ctx = file->private_data;
 
@@ -114,9 +120,16 @@ static int afu_release(struct inode *inode, struct file *file)
                 __func__, ctx->pe);
        cxl_context_detach(ctx);
 
-       mutex_lock(&ctx->mapping_lock);
-       ctx->mapping = NULL;
-       mutex_unlock(&ctx->mapping_lock);
+
+       /*
+        * Delete the context's mapping pointer, unless it's created by the
+        * kernel API, in which case leave it so it can be freed by reclaim_ctx()
+        */
+       if (!ctx->kernelapi) {
+               mutex_lock(&ctx->mapping_lock);
+               ctx->mapping = NULL;
+               mutex_unlock(&ctx->mapping_lock);
+       }
 
        put_device(&ctx->afu->dev);
 
@@ -128,7 +141,6 @@ static int afu_release(struct inode *inode, struct file *file)
         */
        cxl_context_free(ctx);
 
-       cxl_ctx_put();
        return 0;
 }
 
@@ -179,6 +191,8 @@ static long afu_ioctl_start_work(struct cxl_context *ctx,
        if (work.flags & CXL_START_WORK_AMR)
                amr = work.amr & mfspr(SPRN_UAMOR);
 
+       ctx->mmio_err_ff = !!(work.flags & CXL_START_WORK_ERR_FF);
+
        /*
         * We grab the PID here and not in the file open to allow for the case
         * where a process (master, some daemon, etc) has opened the chardev on
@@ -191,7 +205,7 @@ static long afu_ioctl_start_work(struct cxl_context *ctx,
 
        if ((rc = cxl_attach_process(ctx, false, work.work_element_descriptor,
                                     amr))) {
-               afu_release_irqs(ctx);
+               afu_release_irqs(ctx, ctx);
                goto out;
        }
 
@@ -212,19 +226,44 @@ static long afu_ioctl_process_element(struct cxl_context *ctx,
        return 0;
 }
 
-static long afu_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+static long afu_ioctl_get_afu_id(struct cxl_context *ctx,
+                                struct cxl_afu_id __user *upafuid)
+{
+       struct cxl_afu_id afuid = { 0 };
+
+       afuid.card_id = ctx->afu->adapter->adapter_num;
+       afuid.afu_offset = ctx->afu->slice;
+       afuid.afu_mode = ctx->afu->current_mode;
+
+       /* set the flag bit in case the afu is a slave */
+       if (ctx->afu->current_mode == CXL_MODE_DIRECTED && !ctx->master)
+               afuid.flags |= CXL_AFUID_FLAG_SLAVE;
+
+       if (copy_to_user(upafuid, &afuid, sizeof(afuid)))
+               return -EFAULT;
+
+       return 0;
+}
+
+long afu_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 {
        struct cxl_context *ctx = file->private_data;
 
        if (ctx->status == CLOSED)
                return -EIO;
 
+       if (!cxl_adapter_link_ok(ctx->afu->adapter))
+               return -EIO;
+
        pr_devel("afu_ioctl\n");
        switch (cmd) {
        case CXL_IOCTL_START_WORK:
                return afu_ioctl_start_work(ctx, (struct cxl_ioctl_start_work __user *)arg);
        case CXL_IOCTL_GET_PROCESS_ELEMENT:
                return afu_ioctl_process_element(ctx, (__u32 __user *)arg);
+       case CXL_IOCTL_GET_AFU_ID:
+               return afu_ioctl_get_afu_id(ctx, (struct cxl_afu_id __user *)
+                                           arg);
        }
        return -EINVAL;
 }
@@ -235,7 +274,7 @@ static long afu_compat_ioctl(struct file *file, unsigned int cmd,
        return afu_ioctl(file, cmd, arg);
 }
 
-static int afu_mmap(struct file *file, struct vm_area_struct *vm)
+int afu_mmap(struct file *file, struct vm_area_struct *vm)
 {
        struct cxl_context *ctx = file->private_data;
 
@@ -243,10 +282,13 @@ static int afu_mmap(struct file *file, struct vm_area_struct *vm)
        if (ctx->status != STARTED)
                return -EIO;
 
+       if (!cxl_adapter_link_ok(ctx->afu->adapter))
+               return -EIO;
+
        return cxl_context_iomap(ctx, vm);
 }
 
-static unsigned int afu_poll(struct file *file, struct poll_table_struct *poll)
+unsigned int afu_poll(struct file *file, struct poll_table_struct *poll)
 {
        struct cxl_context *ctx = file->private_data;
        int mask = 0;
@@ -278,7 +320,7 @@ static inline int ctx_event_pending(struct cxl_context *ctx)
            ctx->pending_afu_err || (ctx->status == CLOSED));
 }
 
-static ssize_t afu_read(struct file *file, char __user *buf, size_t count,
+ssize_t afu_read(struct file *file, char __user *buf, size_t count,
                        loff_t *off)
 {
        struct cxl_context *ctx = file->private_data;
@@ -287,6 +329,9 @@ static ssize_t afu_read(struct file *file, char __user *buf, size_t count,
        int rc;
        DEFINE_WAIT(wait);
 
+       if (!cxl_adapter_link_ok(ctx->afu->adapter))
+               return -EIO;
+
        if (count < CXL_READ_MIN_SIZE)
                return -EINVAL;
 
@@ -297,6 +342,11 @@ static ssize_t afu_read(struct file *file, char __user *buf, size_t count,
                if (ctx_event_pending(ctx))
                        break;
 
+               if (!cxl_adapter_link_ok(ctx->afu->adapter)) {
+                       rc = -EIO;
+                       goto out;
+               }
+
                if (file->f_flags & O_NONBLOCK) {
                        rc = -EAGAIN;
                        goto out;
@@ -359,7 +409,11 @@ out:
        return rc;
 }
 
-static const struct file_operations afu_fops = {
+/* 
+ * Note: if this is updated, we need to update api.c to patch the new ones in
+ * too
+ */
+const struct file_operations afu_fops = {
        .owner          = THIS_MODULE,
        .open           = afu_open,
        .poll           = afu_poll,
@@ -493,7 +547,7 @@ int __init cxl_file_init(void)
         * If these change we really need to update API.  Either change some
         * flags or update API version number CXL_API_VERSION.
         */
-       BUILD_BUG_ON(CXL_API_VERSION != 1);
+       BUILD_BUG_ON(CXL_API_VERSION != 2);
        BUILD_BUG_ON(sizeof(struct cxl_ioctl_start_work) != 64);
        BUILD_BUG_ON(sizeof(struct cxl_event_header) != 8);
        BUILD_BUG_ON(sizeof(struct cxl_event_afu_interrupt) != 8);