ndtest: Add dimm attributes
authorSantosh Sivaraj <santosh@fossix.org>
Tue, 22 Dec 2020 04:22:37 +0000 (09:52 +0530)
committerDan Williams <dan.j.williams@intel.com>
Thu, 28 Jan 2021 08:22:49 +0000 (00:22 -0800)
This patch adds sysfs attributes for nvdimm and the dimm device.

Signed-off-by: Santosh Sivaraj <santosh@fossix.org>
Link: https://lore.kernel.org/r/20201222042240.2983755-5-santosh@fossix.org
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
tools/testing/nvdimm/test/ndtest.c

index a82790013f8a97d697c20087a4dae92d2619158e..f7682e1d3efe68349462c32dbaa6d0889bef2adb 100644 (file)
@@ -219,6 +219,203 @@ static void put_dimms(void *data)
                }
 }
 
+static ssize_t handle_show(struct device *dev, struct device_attribute *attr,
+               char *buf)
+{
+       struct ndtest_dimm *dimm = dev_get_drvdata(dev);
+
+       return sprintf(buf, "%#x\n", dimm->handle);
+}
+static DEVICE_ATTR_RO(handle);
+
+static ssize_t fail_cmd_show(struct device *dev, struct device_attribute *attr,
+               char *buf)
+{
+       struct ndtest_dimm *dimm = dev_get_drvdata(dev);
+
+       return sprintf(buf, "%#x\n", dimm->fail_cmd);
+}
+
+static ssize_t fail_cmd_store(struct device *dev, struct device_attribute *attr,
+               const char *buf, size_t size)
+{
+       struct ndtest_dimm *dimm = dev_get_drvdata(dev);
+       unsigned long val;
+       ssize_t rc;
+
+       rc = kstrtol(buf, 0, &val);
+       if (rc)
+               return rc;
+
+       dimm->fail_cmd = val;
+
+       return size;
+}
+static DEVICE_ATTR_RW(fail_cmd);
+
+static ssize_t fail_cmd_code_show(struct device *dev, struct device_attribute *attr,
+               char *buf)
+{
+       struct ndtest_dimm *dimm = dev_get_drvdata(dev);
+
+       return sprintf(buf, "%d\n", dimm->fail_cmd_code);
+}
+
+static ssize_t fail_cmd_code_store(struct device *dev, struct device_attribute *attr,
+               const char *buf, size_t size)
+{
+       struct ndtest_dimm *dimm = dev_get_drvdata(dev);
+       unsigned long val;
+       ssize_t rc;
+
+       rc = kstrtol(buf, 0, &val);
+       if (rc)
+               return rc;
+
+       dimm->fail_cmd_code = val;
+       return size;
+}
+static DEVICE_ATTR_RW(fail_cmd_code);
+
+static struct attribute *dimm_attributes[] = {
+       &dev_attr_handle.attr,
+       &dev_attr_fail_cmd.attr,
+       &dev_attr_fail_cmd_code.attr,
+       NULL,
+};
+
+static struct attribute_group dimm_attribute_group = {
+       .attrs = dimm_attributes,
+};
+
+static const struct attribute_group *dimm_attribute_groups[] = {
+       &dimm_attribute_group,
+       NULL,
+};
+
+static ssize_t phys_id_show(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       struct nvdimm *nvdimm = to_nvdimm(dev);
+       struct ndtest_dimm *dimm = nvdimm_provider_data(nvdimm);
+
+       return sprintf(buf, "%#x\n", dimm->physical_id);
+}
+static DEVICE_ATTR_RO(phys_id);
+
+static ssize_t vendor_show(struct device *dev,
+                          struct device_attribute *attr, char *buf)
+{
+       return sprintf(buf, "0x1234567\n");
+}
+static DEVICE_ATTR_RO(vendor);
+
+static ssize_t id_show(struct device *dev,
+                      struct device_attribute *attr, char *buf)
+{
+       struct nvdimm *nvdimm = to_nvdimm(dev);
+       struct ndtest_dimm *dimm = nvdimm_provider_data(nvdimm);
+
+       return sprintf(buf, "%04x-%02x-%04x-%08x", 0xabcd,
+                      0xa, 2016, ~(dimm->handle));
+}
+static DEVICE_ATTR_RO(id);
+
+static ssize_t nvdimm_handle_show(struct device *dev,
+                                 struct device_attribute *attr, char *buf)
+{
+       struct nvdimm *nvdimm = to_nvdimm(dev);
+       struct ndtest_dimm *dimm = nvdimm_provider_data(nvdimm);
+
+       return sprintf(buf, "%#x\n", dimm->handle);
+}
+
+static struct device_attribute dev_attr_nvdimm_show_handle =  {
+       .attr   = { .name = "handle", .mode = 0444 },
+       .show   = nvdimm_handle_show,
+};
+
+static ssize_t subsystem_vendor_show(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       return sprintf(buf, "0x%04x\n", 0);
+}
+static DEVICE_ATTR_RO(subsystem_vendor);
+
+static ssize_t dirty_shutdown_show(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       return sprintf(buf, "%d\n", 42);
+}
+static DEVICE_ATTR_RO(dirty_shutdown);
+
+static ssize_t formats_show(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       struct nvdimm *nvdimm = to_nvdimm(dev);
+       struct ndtest_dimm *dimm = nvdimm_provider_data(nvdimm);
+
+       return sprintf(buf, "%d\n", dimm->num_formats);
+}
+static DEVICE_ATTR_RO(formats);
+
+static ssize_t format_show(struct device *dev,
+               struct device_attribute *attr, char *buf)
+{
+       struct nvdimm *nvdimm = to_nvdimm(dev);
+       struct ndtest_dimm *dimm = nvdimm_provider_data(nvdimm);
+
+       if (dimm->num_formats > 1)
+               return sprintf(buf, "0x201\n");
+
+       return sprintf(buf, "0x101\n");
+}
+static DEVICE_ATTR_RO(format);
+
+static ssize_t format1_show(struct device *dev, struct device_attribute *attr,
+                           char *buf)
+{
+       return sprintf(buf, "0x301\n");
+}
+static DEVICE_ATTR_RO(format1);
+
+static umode_t ndtest_nvdimm_attr_visible(struct kobject *kobj,
+                                       struct attribute *a, int n)
+{
+       struct device *dev = container_of(kobj, struct device, kobj);
+       struct nvdimm *nvdimm = to_nvdimm(dev);
+       struct ndtest_dimm *dimm = nvdimm_provider_data(nvdimm);
+
+       if (a == &dev_attr_format1.attr && dimm->num_formats <= 1)
+               return 0;
+
+       return a->mode;
+}
+
+static struct attribute *ndtest_nvdimm_attributes[] = {
+       &dev_attr_nvdimm_show_handle.attr,
+       &dev_attr_vendor.attr,
+       &dev_attr_id.attr,
+       &dev_attr_phys_id.attr,
+       &dev_attr_subsystem_vendor.attr,
+       &dev_attr_dirty_shutdown.attr,
+       &dev_attr_formats.attr,
+       &dev_attr_format.attr,
+       &dev_attr_format1.attr,
+       NULL,
+};
+
+static const struct attribute_group ndtest_nvdimm_attribute_group = {
+       .name = "papr",
+       .attrs = ndtest_nvdimm_attributes,
+       .is_visible = ndtest_nvdimm_attr_visible,
+};
+
+static const struct attribute_group *ndtest_nvdimm_attribute_groups[] = {
+       &ndtest_nvdimm_attribute_group,
+       NULL,
+};
+
 static int ndtest_dimm_register(struct ndtest_priv *priv,
                                struct ndtest_dimm *dimm, int id)
 {
@@ -230,7 +427,8 @@ static int ndtest_dimm_register(struct ndtest_priv *priv,
                set_bit(NDD_LABELING, &dimm_flags);
        }
 
-       dimm->nvdimm = nvdimm_create(priv->bus, dimm, NULL, dimm_flags,
+       dimm->nvdimm = nvdimm_create(priv->bus, dimm,
+                                   ndtest_nvdimm_attribute_groups, dimm_flags,
                                    NDTEST_SCM_DIMM_CMD_MASK, 0, NULL);
        if (!dimm->nvdimm) {
                dev_err(dev, "Error creating DIMM object for %pOF\n", priv->dn);
@@ -239,7 +437,7 @@ static int ndtest_dimm_register(struct ndtest_priv *priv,
 
        dimm->dev = device_create_with_groups(ndtest_dimm_class,
                                             &priv->pdev.dev,
-                                            0, dimm, NULL,
+                                            0, dimm, dimm_attribute_groups,
                                             "test_dimm%d", id);
        if (!dimm->dev) {
                pr_err("Could not create dimm device attributes\n");