Merge branch 'fixes' into next

Merge our fixes branch from the 4.16 cycle.

There were a number of important fixes merged, in particular some Power9
workarounds that we want in next for testing purposes. There's also been
some conflicting changes in the CPU features code which are best merged
and tested before going upstream.

1 files changed, 27 insertions, 0 deletions

diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c
index 337462e1569f..038509e5d031 100644
--- a/drivers/misc/ocxl/file.c
+++ b/drivers/misc/ocxl/file.c
@@ -102,10 +102,32 @@ static long afu_ioctl_attach(struct ocxl_context *ctx,
         return rc;
 }
 
+static long afu_ioctl_get_metadata(struct ocxl_context *ctx,
+                struct ocxl_ioctl_metadata __user *uarg)
+{
+        struct ocxl_ioctl_metadata arg;
+
+        memset(&arg, 0, sizeof(arg));
+
+        arg.version = 0;
+
+        arg.afu_version_major = ctx->afu->config.version_major;
+        arg.afu_version_minor = ctx->afu->config.version_minor;
+        arg.pasid = ctx->pasid;
+        arg.pp_mmio_size = ctx->afu->config.pp_mmio_stride;
+        arg.global_mmio_size = ctx->afu->config.global_mmio_size;
+
+        if (copy_to_user(uarg, &arg, sizeof(arg)))
+                return -EFAULT;
+
+        return 0;
+}
+
 #define CMD_STR(x) (x == OCXL_IOCTL_ATTACH ? "ATTACH" :                 \
                         x == OCXL_IOCTL_IRQ_ALLOC ? "IRQ_ALLOC" :       \
                         x == OCXL_IOCTL_IRQ_FREE ? "IRQ_FREE" :         \
                         x == OCXL_IOCTL_IRQ_SET_FD ? "IRQ_SET_FD" :     \
+                        x == OCXL_IOCTL_GET_METADATA ? "GET_METADATA" : \
                         "UNKNOWN")
 
 static long afu_ioctl(struct file *file, unsigned int cmd,
@@ -159,6 +181,11 @@ static long afu_ioctl(struct file *file, unsigned int cmd,
                                         irq_fd.eventfd);
                 break;
 
+        case OCXL_IOCTL_GET_METADATA:
+                rc = afu_ioctl_get_metadata(ctx,
+                                (struct ocxl_ioctl_metadata __user *) args);
+                break;
+
         default:
                 rc = -EINVAL;
         }