Re: [PATCH v5 13/18] cxl: sysfs support for guests

2016-03-02 Thread Ian Munsie 
Acked-by: Ian Munsie 

___
Linuxppc-dev mailing list
Linuxppc-dev@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/linuxppc-dev

Re: [PATCH v5 13/18] cxl: sysfs support for guests

2016-02-24 Thread Manoj Kumar 

Reviewed-by: Manoj Kumar 

---
Manoj Kumar



On 2/23/2016 10:21 AM, Frederic Barrat wrote:

From: Christophe Lombard 

Filter out a few adapter parameters which don't make sense in a guest.
Document the changes.

Co-authored-by: Frederic Barrat 
Signed-off-by: Frederic Barrat 
Signed-off-by: Christophe Lombard 
---
  Documentation/ABI/testing/sysfs-class-cxl |  8 +++
  drivers/misc/cxl/cxl.h|  1 +
  drivers/misc/cxl/guest.c  | 12 +++
  drivers/misc/cxl/native.c |  6 ++
  drivers/misc/cxl/sysfs.c  | 36 +++
  5 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/Documentation/ABI/testing/sysfs-class-cxl 
b/Documentation/ABI/testing/sysfs-class-cxl
index b07e86d..4d0da47 100644
--- a/Documentation/ABI/testing/sysfs-class-cxl
+++ b/Documentation/ABI/testing/sysfs-class-cxl
@@ -183,7 +183,7 @@ Description:read only
  Identifies the revision level of the PSL.
  Users:https://github.com/ibm-capi/libcxl

-What:   /sys/class/cxl//base_image
+What:   /sys/class/cxl//base_image (not in a guest)
  Date:   September 2014
  Contact:linuxppc-dev@lists.ozlabs.org
  Description:read only
@@ -193,7 +193,7 @@ Description:read only
  during the initial program load.
  Users:https://github.com/ibm-capi/libcxl

-What:   /sys/class/cxl//image_loaded
+What:   /sys/class/cxl//image_loaded (not in a guest)
  Date:   September 2014
  Contact:linuxppc-dev@lists.ozlabs.org
  Description:read only
@@ -201,7 +201,7 @@ Description:read only
  onto the card.
  Users:https://github.com/ibm-capi/libcxl

-What:   /sys/class/cxl//load_image_on_perst
+What:   /sys/class/cxl//load_image_on_perst (not in a guest)
  Date:   December 2014
  Contact:linuxppc-dev@lists.ozlabs.org
  Description:read/write
@@ -224,7 +224,7 @@ Description:write only
  to reload the FPGA depending on load_image_on_perst.
  Users:https://github.com/ibm-capi/libcxl

-What:  /sys/class/cxl//perst_reloads_same_image
+What:  /sys/class/cxl//perst_reloads_same_image (not in a guest)
  Date: July 2015
  Contact:  linuxppc-dev@lists.ozlabs.org
  Description:  read/write
diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h
index 4372a87..e54bf4f 100644
--- a/drivers/misc/cxl/cxl.h
+++ b/drivers/misc/cxl/cxl.h
@@ -844,6 +844,7 @@ struct cxl_backend_ops {
int (*attach_process)(struct cxl_context *ctx, bool kernel,
u64 wed, u64 amr);
int (*detach_process)(struct cxl_context *ctx);
+   bool (*support_attributes)(const char *attr_name);
bool (*link_ok)(struct cxl *cxl);
void (*release_afu)(struct device *dev);
ssize_t (*afu_read_err_buffer)(struct cxl_afu *afu, char *buf,
diff --git a/drivers/misc/cxl/guest.c b/drivers/misc/cxl/guest.c
index 03eb83d..d02ff03 100644
--- a/drivers/misc/cxl/guest.c
+++ b/drivers/misc/cxl/guest.c
@@ -596,6 +596,17 @@ static int guest_afu_check_and_enable(struct cxl_afu *afu)
return 0;
  }

+static bool guest_support_attributes(const char *attr_name)
+{
+   if ((strcmp(attr_name, "base_image") == 0) ||
+   (strcmp(attr_name, "load_image_on_perst") == 0) ||
+   (strcmp(attr_name, "perst_reloads_same_image") == 0) ||
+   (strcmp(attr_name, "image_loaded") == 0))
+   return false;
+
+   return true;
+}
+
  static int activate_afu_directed(struct cxl_afu *afu)
  {
int rc;
@@ -936,6 +947,7 @@ const struct cxl_backend_ops cxl_guest_ops = {
.ack_irq = guest_ack_irq,
.attach_process = guest_attach_process,
.detach_process = guest_detach_process,
+   .support_attributes = guest_support_attributes,
.link_ok = guest_link_ok,
.release_afu = guest_release_afu,
.afu_read_err_buffer = guest_afu_read_err_buffer,
diff --git a/drivers/misc/cxl/native.c b/drivers/misc/cxl/native.c
index c0bca59..acb9486 100644
--- a/drivers/misc/cxl/native.c
+++ b/drivers/misc/cxl/native.c
@@ -967,6 +967,11 @@ int cxl_check_error(struct cxl_afu *afu)
return (cxl_p1n_read(afu, CXL_PSL_SCNTL_An) == ~0ULL);
  }

+static bool native_support_attributes(const char *attr_name)
+{
+   return true;
+}
+
  static int native_afu_cr_read64(struct cxl_afu *afu, int cr, u64 off, u64 
*out)
  {
if (unlikely(!cxl_ops->link_ok(afu->adapter)))
@@ -1026,6 +1031,7 @@ const struct cxl_backend_ops cxl_native_ops = {
.ack_irq = native_ack_irq,
.attach_process = native_attach_process,
.detach_process = native_detach_process,
+   .support_attributes = native_support_attributes,
.link_ok = cxl_adapter_link_ok,
.release_afu = cxl_pci_release_afu,
.afu_r

[PATCH v5 13/18] cxl: sysfs support for guests

2016-02-23 Thread Frederic Barrat 
From: Christophe Lombard 

Filter out a few adapter parameters which don't make sense in a guest.
Document the changes.

Co-authored-by: Frederic Barrat 
Signed-off-by: Frederic Barrat 
Signed-off-by: Christophe Lombard 
---
 Documentation/ABI/testing/sysfs-class-cxl |  8 +++
 drivers/misc/cxl/cxl.h|  1 +
 drivers/misc/cxl/guest.c  | 12 +++
 drivers/misc/cxl/native.c |  6 ++
 drivers/misc/cxl/sysfs.c  | 36 +++
 5 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/Documentation/ABI/testing/sysfs-class-cxl 
b/Documentation/ABI/testing/sysfs-class-cxl
index b07e86d..4d0da47 100644
--- a/Documentation/ABI/testing/sysfs-class-cxl
+++ b/Documentation/ABI/testing/sysfs-class-cxl
@@ -183,7 +183,7 @@ Description:read only
 Identifies the revision level of the PSL.
 Users: https://github.com/ibm-capi/libcxl
 
-What:   /sys/class/cxl//base_image
+What:   /sys/class/cxl//base_image (not in a guest)
 Date:   September 2014
 Contact:linuxppc-dev@lists.ozlabs.org
 Description:read only
@@ -193,7 +193,7 @@ Description:read only
 during the initial program load.
 Users: https://github.com/ibm-capi/libcxl
 
-What:   /sys/class/cxl//image_loaded
+What:   /sys/class/cxl//image_loaded (not in a guest)
 Date:   September 2014
 Contact:linuxppc-dev@lists.ozlabs.org
 Description:read only
@@ -201,7 +201,7 @@ Description:read only
 onto the card.
 Users: https://github.com/ibm-capi/libcxl
 
-What:   /sys/class/cxl//load_image_on_perst
+What:   /sys/class/cxl//load_image_on_perst (not in a guest)
 Date:   December 2014
 Contact:linuxppc-dev@lists.ozlabs.org
 Description:read/write
@@ -224,7 +224,7 @@ Description:write only
 to reload the FPGA depending on load_image_on_perst.
 Users: https://github.com/ibm-capi/libcxl
 
-What:  /sys/class/cxl//perst_reloads_same_image
+What:  /sys/class/cxl//perst_reloads_same_image (not in a guest)
 Date:  July 2015
 Contact:   linuxppc-dev@lists.ozlabs.org
 Description:   read/write
diff --git a/drivers/misc/cxl/cxl.h b/drivers/misc/cxl/cxl.h
index 4372a87..e54bf4f 100644
--- a/drivers/misc/cxl/cxl.h
+++ b/drivers/misc/cxl/cxl.h
@@ -844,6 +844,7 @@ struct cxl_backend_ops {
int (*attach_process)(struct cxl_context *ctx, bool kernel,
u64 wed, u64 amr);
int (*detach_process)(struct cxl_context *ctx);
+   bool (*support_attributes)(const char *attr_name);
bool (*link_ok)(struct cxl *cxl);
void (*release_afu)(struct device *dev);
ssize_t (*afu_read_err_buffer)(struct cxl_afu *afu, char *buf,
diff --git a/drivers/misc/cxl/guest.c b/drivers/misc/cxl/guest.c
index 03eb83d..d02ff03 100644
--- a/drivers/misc/cxl/guest.c
+++ b/drivers/misc/cxl/guest.c
@@ -596,6 +596,17 @@ static int guest_afu_check_and_enable(struct cxl_afu *afu)
return 0;
 }
 
+static bool guest_support_attributes(const char *attr_name)
+{
+   if ((strcmp(attr_name, "base_image") == 0) ||
+   (strcmp(attr_name, "load_image_on_perst") == 0) ||
+   (strcmp(attr_name, "perst_reloads_same_image") == 0) ||
+   (strcmp(attr_name, "image_loaded") == 0))
+   return false;
+
+   return true;
+}
+
 static int activate_afu_directed(struct cxl_afu *afu)
 {
int rc;
@@ -936,6 +947,7 @@ const struct cxl_backend_ops cxl_guest_ops = {
.ack_irq = guest_ack_irq,
.attach_process = guest_attach_process,
.detach_process = guest_detach_process,
+   .support_attributes = guest_support_attributes,
.link_ok = guest_link_ok,
.release_afu = guest_release_afu,
.afu_read_err_buffer = guest_afu_read_err_buffer,
diff --git a/drivers/misc/cxl/native.c b/drivers/misc/cxl/native.c
index c0bca59..acb9486 100644
--- a/drivers/misc/cxl/native.c
+++ b/drivers/misc/cxl/native.c
@@ -967,6 +967,11 @@ int cxl_check_error(struct cxl_afu *afu)
return (cxl_p1n_read(afu, CXL_PSL_SCNTL_An) == ~0ULL);
 }
 
+static bool native_support_attributes(const char *attr_name)
+{
+   return true;
+}
+
 static int native_afu_cr_read64(struct cxl_afu *afu, int cr, u64 off, u64 *out)
 {
if (unlikely(!cxl_ops->link_ok(afu->adapter)))
@@ -1026,6 +1031,7 @@ const struct cxl_backend_ops cxl_native_ops = {
.ack_irq = native_ack_irq,
.attach_process = native_attach_process,
.detach_process = native_detach_process,
+   .support_attributes = native_support_attributes,
.link_ok = cxl_adapter_link_ok,
.release_afu = cxl_pci_release_afu,
.afu_read_err_buffer = cxl_pci_afu_read_err_buffer,
diff --git a/drivers/misc/cxl/sysfs.c b/drivers/misc/cxl/sysfs.c
index 1a1409c..41963d4 100644
--- a