Skip to contentSkip to conversation

hwmon: (pmbus) add MFR_* registers to debugfs

PATCH New Adam Wujek 2 participants 10 messages Apr 19, 2022 – Apr 20, 2022 Hardware monitoring

lore
Share & tools
lore

Adam Wujek

author
#0 lore raw

PATCH 1/1 hwmon: (pmbus) add MFR_* registers to debugfs

Add registers to debugfs:
PMBUS_MFR_ID
PMBUS_MFR_MODEL
PMBUS_MFR_REVISION
PMBUS_MFR_LOCATION
PMBUS_MFR_DATE
PMBUS_MFR_SERIAL

---
 drivers/hwmon/pmbus/pmbus_core.c | 85 ++++++++++++++++++++++++++++++++
 1 file changed, 85 insertions(+)
drivers/hwmon/pmbus/pmbus_core.c +85 -0
index ef9989be8f89..6dc63f364ee6 100644
@@ -2156,6 +2156,31 @@ static int pmbus_debugfs_get_status(void *data, u64 *val)
 DEFINE_DEBUGFS_ATTRIBUTE(pmbus_debugfs_ops_status, pmbus_debugfs_get_status,
 			 NULL, "0x%04llx\n");
 
+
+static ssize_t pmbus_debugfs_mfr_read(struct file *file, char __user *buf,
+				       size_t count, loff_t *ppos)
+{
+	int rc;
+	struct pmbus_debugfs_entry *entry = file->private_data;
+	char data[I2C_SMBUS_BLOCK_MAX + 2] = { 0 };
+
+	rc = i2c_smbus_read_block_data(entry->client, entry->reg, data);
+	if (rc < 0)
+		return rc;
+
+	data[rc] = '\n';
+	rc += 2;
+
+	return simple_read_from_buffer(buf, count, ppos, data, rc);
+}
+
+static const struct file_operations pmbus_debugfs_ops_mfr = {
+	.llseek = noop_llseek,
+	.read = pmbus_debugfs_mfr_read,
+	.write = NULL,
+	.open = simple_open,
+};
+
 static int pmbus_init_debugfs(struct i2c_client *client,
 			      struct pmbus_data *data)
 {
@@ -2286,6 +2311,66 @@ static int pmbus_init_debugfs(struct i2c_client *client,
 					    &entries[idx++],
 					    &pmbus_debugfs_ops);
 		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_ID)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_ID;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_id", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_MODEL)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_MODEL;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_model", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_REVISION)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_REVISION;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_revision", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_LOCATION)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_LOCATION;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_location", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_DATE)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_DATE;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_date", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_SERIAL)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_SERIAL;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_serial", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
 	}
 
 	return 0;

--
2.17.1

author
#1 lore raw

PATCH 2/2 hwmon: (pmbus) add MFR_* registers to debugfs

Add registers to debugfs:
PMBUS_MFR_ID
PMBUS_MFR_MODEL
PMBUS_MFR_REVISION
PMBUS_MFR_LOCATION
PMBUS_MFR_DATE
PMBUS_MFR_SERIAL

---
 drivers/hwmon/pmbus/pmbus_core.c | 84 ++++++++++++++++++++++++++++++++
 1 file changed, 84 insertions(+)
drivers/hwmon/pmbus/pmbus_core.c +84 -0
index 0af7a3d74f47..1dc186780ccf 100644
@@ -2625,6 +2625,30 @@ static int pmbus_debugfs_get_status(void *data, u64 *val)
 DEFINE_DEBUGFS_ATTRIBUTE(pmbus_debugfs_ops_status, pmbus_debugfs_get_status,
 			 NULL, "0x%04llx\n");
 
+static ssize_t pmbus_debugfs_mfr_read(struct file *file, char __user *buf,
+				       size_t count, loff_t *ppos)
+{
+	int rc;
+	struct pmbus_debugfs_entry *entry = file->private_data;
+	char data[I2C_SMBUS_BLOCK_MAX + 2] = { 0 };
+
+	rc = i2c_smbus_read_block_data(entry->client, entry->reg, data);
+	if (rc < 0)
+		return rc;
+
+	data[rc] = '\n';
+	rc += 2;
+
+	return simple_read_from_buffer(buf, count, ppos, data, rc);
+}
+
+static const struct file_operations pmbus_debugfs_ops_mfr = {
+	.llseek = noop_llseek,
+	.read = pmbus_debugfs_mfr_read,
+	.write = NULL,
+	.open = simple_open,
+};
+
 static int pmbus_debugfs_get_pec(void *data, u64 *val)
 {
 	struct i2c_client *client = data;
@@ -2801,6 +2825,66 @@ static int pmbus_init_debugfs(struct i2c_client *client,
 					    &entries[idx++],
 					    &pmbus_debugfs_ops);
 		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_ID)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_ID;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_id", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_MODEL)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_MODEL;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_model", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_REVISION)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_REVISION;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_revision", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_LOCATION)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_LOCATION;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_location", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_DATE)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_DATE;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_date", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_SERIAL)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_SERIAL;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_serial", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
 	}
 
 	return devm_add_action_or_reset(data->dev,

--
2.25.1

maintainer
#2 lore raw
Quoted 9 lines · Adam Wujek

Add registers to debugfs:
PMBUS_MFR_ID
PMBUS_MFR_MODEL
PMBUS_MFR_REVISION
PMBUS_MFR_LOCATION
PMBUS_MFR_DATE
PMBUS_MFR_SERIAL

Where is patch 1/2, and why did you resend this patch ?

Guenter

Quoted 110 lines
---
  drivers/hwmon/pmbus/pmbus_core.c | 84 ++++++++++++++++++++++++++++++++
  1 file changed, 84 insertions(+)
drivers/hwmon/pmbus/pmbus_core.c +84 -1
index 0af7a3d74f47..1dc186780ccf 100644
@@ -2625,6 +2625,30 @@ static int pmbus_debugfs_get_status(void *data, u64 *val)
  DEFINE_DEBUGFS_ATTRIBUTE(pmbus_debugfs_ops_status, pmbus_debugfs_get_status,
  			 NULL, "0x%04llx\n");
 
+static ssize_t pmbus_debugfs_mfr_read(struct file *file, char __user *buf,
+				       size_t count, loff_t *ppos)
+{
+	int rc;
+	struct pmbus_debugfs_entry *entry = file->private_data;
+	char data[I2C_SMBUS_BLOCK_MAX + 2] = { 0 };
+
+	rc = i2c_smbus_read_block_data(entry->client, entry->reg, data);
+	if (rc < 0)
+		return rc;
+
+	data[rc] = '\n';
+	rc += 2;
+
+	return simple_read_from_buffer(buf, count, ppos, data, rc);
+}
+
+static const struct file_operations pmbus_debugfs_ops_mfr = {
+	.llseek = noop_llseek,
+	.read = pmbus_debugfs_mfr_read,
+	.write = NULL,
+	.open = simple_open,
+};
+
  static int pmbus_debugfs_get_pec(void *data, u64 *val)
  {
  	struct i2c_client *client = data;
@@ -2801,6 +2825,66 @@ static int pmbus_init_debugfs(struct i2c_client *client,
  					    &entries[idx++],
  					    &pmbus_debugfs_ops);
  		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_ID)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_ID;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_id", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_MODEL)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_MODEL;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_model", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_REVISION)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_REVISION;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_revision", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_LOCATION)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_LOCATION;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_location", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_DATE)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_DATE;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_date", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_SERIAL)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_SERIAL;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_serial", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
  	}
 
  	return devm_add_action_or_reset(data->dev,
--

2.25.1

author
#3 lore raw

------- Original Message -------

Quoted 12 lines · Guenter Roeck
Quoted 8 lines · Adam Wujek

Add registers to debugfs:
PMBUS_MFR_ID
PMBUS_MFR_MODEL
PMBUS_MFR_REVISION
PMBUS_MFR_LOCATION
PMBUS_MFR_DATE
PMBUS_MFR_SERIAL

Quoted 5 lines
Quoted 1 line

Where is patch 1/2, and why did you resend this patch ?

There should be no "1/2" since this and the second patch are unrelated. I resend it because I rebased it on master.

Adam

Quoted 110 lines

Guenter

Quoted 108 lines

---
drivers/hwmon/pmbus/pmbus_core.c | 84 ++++++++++++++++++++++++++++++++

1 file changed, 84 insertions(+)
drivers/hwmon/pmbus/pmbus_core.c +84 -1
index 0af7a3d74f47..1dc186780ccf 100644
@@ -2625,6 +2625,30 @@ static int pmbus_debugfs_get_status(void *data, u64 *val)
 DEFINE_DEBUGFS_ATTRIBUTE(pmbus_debugfs_ops_status, pmbus_debugfs_get_status,
 NULL, "0x%04llx\n");
 
+static ssize_t pmbus_debugfs_mfr_read(struct file *file, char __user *buf,
+ size_t count, loff_t *ppos)
+{
+ int rc;
+ struct pmbus_debugfs_entry *entry = file->private_data;
+ char data[I2C_SMBUS_BLOCK_MAX + 2] = { 0 };
+
+ rc = i2c_smbus_read_block_data(entry->client, entry->reg, data);
+ if (rc < 0)
+ return rc;
+
+ data[rc] = '\n';
+ rc += 2;
+
+ return simple_read_from_buffer(buf, count, ppos, data, rc);
+}
+
+static const struct file_operations pmbus_debugfs_ops_mfr = {
+ .llseek = noop_llseek,
+ .read = pmbus_debugfs_mfr_read,
+ .write = NULL,
+ .open = simple_open,
+};
+
 static int pmbus_debugfs_get_pec(void *data, u64 *val)
 {
 struct i2c_client *client = data;
@@ -2801,6 +2825,66 @@ static int pmbus_init_debugfs(struct i2c_client *client,
 &entries[idx++],
 &pmbus_debugfs_ops);
 }
+
+ if (pmbus_check_byte_register(client, i, PMBUS_MFR_ID)) {
+ entries[idx].client = client;
+ entries[idx].page = i;
+ entries[idx].reg = PMBUS_MFR_ID;
+ scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_id", i);
+ debugfs_create_file(name, 0444, data->debugfs,
+ &entries[idx++],
+ &pmbus_debugfs_ops_mfr);
+ }
+
+ if (pmbus_check_byte_register(client, i, PMBUS_MFR_MODEL)) {
+ entries[idx].client = client;
+ entries[idx].page = i;
+ entries[idx].reg = PMBUS_MFR_MODEL;
+ scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_model", i);
+ debugfs_create_file(name, 0444, data->debugfs,
+ &entries[idx++],
+ &pmbus_debugfs_ops_mfr);
+ }
+
+ if (pmbus_check_byte_register(client, i, PMBUS_MFR_REVISION)) {
+ entries[idx].client = client;
+ entries[idx].page = i;
+ entries[idx].reg = PMBUS_MFR_REVISION;
+ scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_revision", i);
+ debugfs_create_file(name, 0444, data->debugfs,
+ &entries[idx++],
+ &pmbus_debugfs_ops_mfr);
+ }
+
+ if (pmbus_check_byte_register(client, i, PMBUS_MFR_LOCATION)) {
+ entries[idx].client = client;
+ entries[idx].page = i;
+ entries[idx].reg = PMBUS_MFR_LOCATION;
+ scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_location", i);
+ debugfs_create_file(name, 0444, data->debugfs,
+ &entries[idx++],
+ &pmbus_debugfs_ops_mfr);
+ }
+
+ if (pmbus_check_byte_register(client, i, PMBUS_MFR_DATE)) {
+ entries[idx].client = client;
+ entries[idx].page = i;
+ entries[idx].reg = PMBUS_MFR_DATE;
+ scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_date", i);
+ debugfs_create_file(name, 0444, data->debugfs,
+ &entries[idx++],
+ &pmbus_debugfs_ops_mfr);
+ }
+
+ if (pmbus_check_byte_register(client, i, PMBUS_MFR_SERIAL)) {
+ entries[idx].client = client;
+ entries[idx].page = i;
+ entries[idx].reg = PMBUS_MFR_SERIAL;
+ scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_serial", i);
+ debugfs_create_file(name, 0444, data->debugfs,
+ &entries[idx++],
+ &pmbus_debugfs_ops_mfr);
+ }
 }
 
 return devm_add_action_or_reset(data->dev,
--

2.25.1

maintainer
#4 lore raw
Quoted 15 lines · wujek dev

------- Original Message -------

Quoted 12 lines · Guenter Roeck
Quoted 8 lines · Adam Wujek

Add registers to debugfs:
PMBUS_MFR_ID
PMBUS_MFR_MODEL
PMBUS_MFR_REVISION
PMBUS_MFR_LOCATION
PMBUS_MFR_DATE
PMBUS_MFR_SERIAL

Quoted 8 lines
Quoted 5 lines
Quoted 1 line

Where is patch 1/2, and why did you resend this patch ?

There should be no "1/2" since this and the second patch are unrelated. I resend it because I rebased it on master.

Please provide change logs and version your patches in the future.

Quoted 16 lines

Adam

Quoted 14 lines

Guenter

Quoted 12 lines

---
drivers/hwmon/pmbus/pmbus_core.c | 84 ++++++++++++++++++++++++++++++++

1 file changed, 84 insertions(+)
drivers/hwmon/pmbus/pmbus_core.c +0 -0
index 0af7a3d74f47..1dc186780ccf 100644
@@ -2625,6 +2625,30 @@ static int pmbus_debugfs_get_status(void *data, u64 *val)
 DEFINE_DEBUGFS_ATTRIBUTE(pmbus_debugfs_ops_status, pmbus_debugfs_get_status,
 NULL, "0x%04llx\n");
 
Quoted 13 lines
Quoted 5 lines
Quoted 5 lines
drivers/hwmon/pmbus/pmbus_core.c +5 -0
+static ssize_t pmbus_debugfs_mfr_read(struct file *file, char __user *buf,
+ size_t count, loff_t *ppos)
+{
+ int rc;
+ struct pmbus_debugfs_entry *entry = file->private_data;
Quoted 8 lines

drivers/hwmon/pmbus/pmbus_core.c static int pmbus_debugfs_get_status(void *data, u64 *val) · line 2640

Quoted 8 lines
drivers/hwmon/pmbus/pmbus_core.c +8 -0
+ char data[I2C_SMBUS_BLOCK_MAX + 2] = { 0 };
+
+ rc = i2c_smbus_read_block_data(entry->client, entry->reg, data);
+ if (rc < 0)
+ return rc;
+
+ data[rc] = '\n';
+ rc += 2;

Why +2 ?

Quoted 20 lines
Quoted 20 lines
Quoted 20 lines
drivers/hwmon/pmbus/pmbus_core.c +13 -0
+
+ return simple_read_from_buffer(buf, count, ppos, data, rc);
+}
+
+static const struct file_operations pmbus_debugfs_ops_mfr = {
+ .llseek = noop_llseek,
+ .read = pmbus_debugfs_mfr_read,
+ .write = NULL,
+ .open = simple_open,
+};
+
 static int pmbus_debugfs_get_pec(void *data, u64 *val)
 {
 struct i2c_client *client = data;
@@ -2801,6 +2825,66 @@ static int pmbus_init_debugfs(struct i2c_client *client,
 &entries[idx++],
 &pmbus_debugfs_ops);
 }
+
+ if (pmbus_check_byte_register(client, i, PMBUS_MFR_ID)) {
Quoted 8 lines
Quoted 8 lines

drivers/hwmon/pmbus/pmbus_core.c static int pmbus_init_debugfs(struct i2c_client *client, · line 2837

Quoted 8 lines
drivers/hwmon/pmbus/pmbus_core.c +8 -0
+ entries[idx].client = client;
+ entries[idx].page = i;
+ entries[idx].reg = PMBUS_MFR_ID;
+ scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_id", i);
+ debugfs_create_file(name, 0444, data->debugfs,
+ &entries[idx++],
+ &pmbus_debugfs_ops_mfr);
+ }

You are adding several debugfs entries without increasing the size of the entries array. That means that up to 16 debugfs entries are now created into an array of size 10. That won't work.

Guenter

author
#5 lore raw

PATCH v3 1/1 hwmon: (pmbus) add MFR_* registers to debugfs

Add registers to debugfs:
PMBUS_MFR_ID
PMBUS_MFR_MODEL
PMBUS_MFR_REVISION
PMBUS_MFR_LOCATION
PMBUS_MFR_DATE
PMBUS_MFR_SERIAL

---
Notes:
Changes in v2:
- Rebase to the latest kernel
- Marked wrongly as a part of series of patches

Changes in v3:
- Submit as a single patch. V2 was wrongly submitted as a part of series of patches
- add justification for "rc += 2;"
- increase allocated memory for debugfs entries

 drivers/hwmon/pmbus/pmbus_core.c | 89 +++++++++++++++++++++++++++++++-
 1 file changed, 88 insertions(+), 1 deletion(-)
drivers/hwmon/pmbus/pmbus_core.c +88 -1
index d93574d6a1fb..a791e5f08fb2 100644
@@ -2627,6 +2627,33 @@ static int pmbus_debugfs_get_status(void *data, u64 *val)
 DEFINE_DEBUGFS_ATTRIBUTE(pmbus_debugfs_ops_status, pmbus_debugfs_get_status,
 			 NULL, "0x%04llx\n");
 
+static ssize_t pmbus_debugfs_mfr_read(struct file *file, char __user *buf,
+				       size_t count, loff_t *ppos)
+{
+	int rc;
+	struct pmbus_debugfs_entry *entry = file->private_data;
+	char data[I2C_SMBUS_BLOCK_MAX + 2] = { 0 };
+
+	rc = i2c_smbus_read_block_data(entry->client, entry->reg, data);
+	if (rc < 0)
+		return rc;
+
+	/* Add newline at the end of a string */
+	data[rc] = '\n';
+	/* Include newline and NULL char into the length as block read from
+	 * SMBUS does not include null character. */
+	rc += 2;
+
+	return simple_read_from_buffer(buf, count, ppos, data, rc);
+}
+
+static const struct file_operations pmbus_debugfs_ops_mfr = {
+	.llseek = noop_llseek,
+	.read = pmbus_debugfs_mfr_read,
+	.write = NULL,
+	.open = simple_open,
+};
+
 static int pmbus_debugfs_get_pec(void *data, u64 *val)
 {
 	struct i2c_client *client = data;
@@ -2693,7 +2720,7 @@ static int pmbus_init_debugfs(struct i2c_client *client,
 
 	/* Allocate the max possible entries we need. */
 	entries = devm_kcalloc(data->dev,
-			       data->info->pages * 10, sizeof(*entries),
+			       data->info->pages * 16, sizeof(*entries),
 			       GFP_KERNEL);
 	if (!entries)
 		return -ENOMEM;
@@ -2803,6 +2830,66 @@ static int pmbus_init_debugfs(struct i2c_client *client,
 					    &entries[idx++],
 					    &pmbus_debugfs_ops);
 		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_ID)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_ID;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_id", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_MODEL)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_MODEL;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_model", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_REVISION)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_REVISION;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_revision", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_LOCATION)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_LOCATION;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_location", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_DATE)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_DATE;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_date", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_SERIAL)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_SERIAL;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_serial", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
 	}
 
 	return devm_add_action_or_reset(data->dev,

--
2.25.1

author
#6 lore raw
In reply to Guenter Roeck

------- Original Message -------

Quoted 17 lines · Guenter Roeck
Quoted 13 lines · wujek dev

------- Original Message -------

Quoted 10 lines · On Wednesday, April 20th, 2022 at 15:53, Guenter Roeck [email protected] wrote:
Quoted 8 lines · Adam Wujek

Add registers to debugfs:
PMBUS_MFR_ID
PMBUS_MFR_MODEL
PMBUS_MFR_REVISION
PMBUS_MFR_LOCATION
PMBUS_MFR_DATE
PMBUS_MFR_SERIAL

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Where is patch 1/2, and why did you resend this patch ?

There should be no "1/2" since this and the second patch are unrelated. I resend it because I rebased it on master.

Please provide change logs and version your patches in the future.

ok, thank you for your patience.

Quoted 17 lines
Quoted 17 lines

Adam

Quoted 14 lines

Guenter

Quoted 12 lines

---
drivers/hwmon/pmbus/pmbus_core.c | 84 ++++++++++++++++++++++++++++++++

1 file changed, 84 insertions(+)
drivers/hwmon/pmbus/pmbus_core.c +0 -0
index 0af7a3d74f47..1dc186780ccf 100644
@@ -2625,6 +2625,30 @@ static int pmbus_debugfs_get_status(void *data, u64 *val)
 DEFINE_DEBUGFS_ATTRIBUTE(pmbus_debugfs_ops_status, pmbus_debugfs_get_status,
 NULL, "0x%04llx\n");
 
Quoted 17 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/hwmon/pmbus/pmbus_core.c +5 -0
+static ssize_t pmbus_debugfs_mfr_read(struct file *file, char __user *buf,
+ size_t count, loff_t *ppos)
+{
+ int rc;
+ struct pmbus_debugfs_entry *entry = file->private_data;
Quoted 8 lines
Quoted 8 lines

drivers/hwmon/pmbus/pmbus_core.c static int pmbus_debugfs_get_status(void *data, u64 *val) · line 2640

Quoted 8 lines
drivers/hwmon/pmbus/pmbus_core.c +8 -0
+ char data[I2C_SMBUS_BLOCK_MAX + 2] = { 0 };
+
+ rc = i2c_smbus_read_block_data(entry->client, entry->reg, data);
+ if (rc < 0)
+ return rc;
+
+ data[rc] = '\n';
+ rc += 2;

Why +2 ?

Copied from another driver.
+1 due to '\n'
+1 due to NULL character (smbus block transfer does not include it in the length) Explanation included in v3 patch.

Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
Quoted 25 lines
drivers/hwmon/pmbus/pmbus_core.c +18 -0
+
+ return simple_read_from_buffer(buf, count, ppos, data, rc);
+}
+
+static const struct file_operations pmbus_debugfs_ops_mfr = {
+ .llseek = noop_llseek,
+ .read = pmbus_debugfs_mfr_read,
+ .write = NULL,
+ .open = simple_open,
+};
+
 static int pmbus_debugfs_get_pec(void *data, u64 *val)
 {
 struct i2c_client *client = data;
@@ -2801,6 +2825,66 @@ static int pmbus_init_debugfs(struct i2c_client *client,
 &entries[idx++],
 &pmbus_debugfs_ops);
 }
+
+ if (pmbus_check_byte_register(client, i, PMBUS_MFR_ID)) {
+ entries[idx].client = client;
+ entries[idx].page = i;
+ entries[idx].reg = PMBUS_MFR_ID;
+ scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_id", i);
+ debugfs_create_file(name, 0444, data->debugfs,
Quoted 8 lines
Quoted 3 lines
Quoted 3 lines

drivers/hwmon/pmbus/pmbus_core.c static int pmbus_init_debugfs(struct i2c_client *client, · line 2837

Quoted 3 lines
drivers/hwmon/pmbus/pmbus_core.c +3 -0
+ &entries[idx++],
+ &pmbus_debugfs_ops_mfr);
+ }

You are adding several debugfs entries without increasing the size of the entries array. That means that up to 16 debugfs entries are now created into an array of size 10. That won't work.

You're right, I just sent another patch.

Adam

Quoted 2 lines

Guenter

maintainer
#7 lore raw
Quoted 64 lines · wujek dev

------- Original Message -------

Quoted 17 lines · Guenter Roeck
Quoted 13 lines · wujek dev

------- Original Message -------

Quoted 10 lines · On Wednesday, April 20th, 2022 at 15:53, Guenter Roeck [email protected] wrote:
Quoted 8 lines · Adam Wujek

Add registers to debugfs:
PMBUS_MFR_ID
PMBUS_MFR_MODEL
PMBUS_MFR_REVISION
PMBUS_MFR_LOCATION
PMBUS_MFR_DATE
PMBUS_MFR_SERIAL

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Where is patch 1/2, and why did you resend this patch ?

There should be no "1/2" since this and the second patch are unrelated. I resend it because I rebased it on master.

Please provide change logs and version your patches in the future.

ok, thank you for your patience.

Quoted 17 lines
Quoted 17 lines

Adam

Quoted 14 lines

Guenter

Quoted 12 lines

---
drivers/hwmon/pmbus/pmbus_core.c | 84 ++++++++++++++++++++++++++++++++

1 file changed, 84 insertions(+)
drivers/hwmon/pmbus/pmbus_core.c +0 -0
index 0af7a3d74f47..1dc186780ccf 100644
@@ -2625,6 +2625,30 @@ static int pmbus_debugfs_get_status(void *data, u64 *val)
 DEFINE_DEBUGFS_ATTRIBUTE(pmbus_debugfs_ops_status, pmbus_debugfs_get_status,
 NULL, "0x%04llx\n");
 
Quoted 17 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/hwmon/pmbus/pmbus_core.c +5 -0
+static ssize_t pmbus_debugfs_mfr_read(struct file *file, char __user *buf,
+ size_t count, loff_t *ppos)
+{
+ int rc;
+ struct pmbus_debugfs_entry *entry = file->private_data;
Quoted 8 lines
Quoted 8 lines

drivers/hwmon/pmbus/pmbus_core.c static int pmbus_debugfs_get_status(void *data, u64 *val) · line 2640

Quoted 8 lines
drivers/hwmon/pmbus/pmbus_core.c +8 -0
+ char data[I2C_SMBUS_BLOCK_MAX + 2] = { 0 };
+
+ rc = i2c_smbus_read_block_data(entry->client, entry->reg, data);
+ if (rc < 0)
+ return rc;
+
+ data[rc] = '\n';
+ rc += 2;

Why +2 ?

Quoted 4 lines

Copied from another driver.
+1 due to '\n'
+1 due to NULL character (smbus block transfer does not include it in the length) Explanation included in v3 patch.

"copied from another driver" is not really a good argument. That other driver might just be buggy.

What do you see in userspace when you read the data ? A string that ends with "\n\0" ? If so, does the "\0" at the end add any value ?

Guenter

author
#8 lore raw

------- Original Message -------

Quoted 64 lines · Guenter Roeck
Quoted 60 lines · wujek dev

------- Original Message -------

Quoted 56 lines · On Wednesday, April 20th, 2022 at 16:15, Guenter Roeck [email protected] wrote:
Quoted 13 lines · wujek dev

------- Original Message -------

Quoted 10 lines · On Wednesday, April 20th, 2022 at 15:53, Guenter Roeck [email protected] wrote:
Quoted 8 lines · Adam Wujek

Add registers to debugfs:
PMBUS_MFR_ID
PMBUS_MFR_MODEL
PMBUS_MFR_REVISION
PMBUS_MFR_LOCATION
PMBUS_MFR_DATE
PMBUS_MFR_SERIAL

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

Where is patch 1/2, and why did you resend this patch ?

There should be no "1/2" since this and the second patch are unrelated. I resend it because I rebased it on master.

Please provide change logs and version your patches in the future. ok, thank you for your patience.

Quoted 16 lines

Adam

Quoted 14 lines

Guenter

Quoted 12 lines

---
drivers/hwmon/pmbus/pmbus_core.c | 84 ++++++++++++++++++++++++++++++++

1 file changed, 84 insertions(+)
drivers/hwmon/pmbus/pmbus_core.c +0 -0
index 0af7a3d74f47..1dc186780ccf 100644
@@ -2625,6 +2625,30 @@ static int pmbus_debugfs_get_status(void *data, u64 *val)
 DEFINE_DEBUGFS_ATTRIBUTE(pmbus_debugfs_ops_status, pmbus_debugfs_get_status,
 NULL, "0x%04llx\n");
 
Quoted 13 lines
Quoted 5 lines
Quoted 5 lines
drivers/hwmon/pmbus/pmbus_core.c +5 -0
+static ssize_t pmbus_debugfs_mfr_read(struct file *file, char __user *buf,
+ size_t count, loff_t *ppos)
+{
+ int rc;
+ struct pmbus_debugfs_entry *entry = file->private_data;
Quoted 8 lines

drivers/hwmon/pmbus/pmbus_core.c static int pmbus_debugfs_get_status(void *data, u64 *val) · line 2640

Quoted 8 lines
drivers/hwmon/pmbus/pmbus_core.c +8 -0
+ char data[I2C_SMBUS_BLOCK_MAX + 2] = { 0 };
+
+ rc = i2c_smbus_read_block_data(entry->client, entry->reg, data);
+ if (rc < 0)
+ return rc;
+
+ data[rc] = '\n';
+ rc += 2;

Why +2 ?

Quoted 8 lines
Quoted 4 lines

Copied from another driver.
+1 due to '\n'
+1 due to NULL character (smbus block transfer does not include it in the length) Explanation included in v3 patch.

"copied from another driver" is not really a good argument. That other driver might just be buggy.

yes, you're right. There is a bug in that driver.

Quoted 3 lines

What do you see in userspace when you read the data ? A string that ends with "\n\0" ? If so, does the "\0" at the end add any value ?

I confirm I see "\n\0". I will fix it right now. Thank you for pointing it out.

Adam

Quoted 2 lines

Guenter

author
#9 lore raw

PATCH v4 1/1 hwmon: (pmbus) add MFR_* registers to debugfs

In reply to Guenter Roeck

Add registers to debugfs:
PMBUS_MFR_ID
PMBUS_MFR_MODEL
PMBUS_MFR_REVISION
PMBUS_MFR_LOCATION
PMBUS_MFR_DATE
PMBUS_MFR_SERIAL

---
Notes:
Changes in v2:
- Rebase to the latest kernel
- Marked wrongly as a part of series of patches

Changes in v3:
- Submit as a single patch. V2 was wrongly submitted as a part of series of patches
- Add justification for "rc += 2;"
- Increase allocated memory for debugfs entries

Changes in v4:
- Change "rc += 2;" into "rc += 1;". With "rc += 2" an extra '\0' is observed after '\n' at the end of debugfs file's output.

 drivers/hwmon/pmbus/pmbus_core.c | 89 +++++++++++++++++++++++++++++++-
 1 file changed, 88 insertions(+), 1 deletion(-)
drivers/hwmon/pmbus/pmbus_core.c +88 -1
index d93574d6a1fb..a791e5f08fb2 100644
@@ -2627,6 +2627,33 @@ static int pmbus_debugfs_get_status(void *data, u64 *val)
 DEFINE_DEBUGFS_ATTRIBUTE(pmbus_debugfs_ops_status, pmbus_debugfs_get_status,
 			 NULL, "0x%04llx\n");
 
+static ssize_t pmbus_debugfs_mfr_read(struct file *file, char __user *buf,
+				       size_t count, loff_t *ppos)
+{
+	int rc;
+	struct pmbus_debugfs_entry *entry = file->private_data;
+	char data[I2C_SMBUS_BLOCK_MAX + 2] = { 0 };
+
+	rc = i2c_smbus_read_block_data(entry->client, entry->reg, data);
+	if (rc < 0)
+		return rc;
+
+	/* Add newline at the end of a read data */
+	data[rc] = '\n';
+
+	/* Include newline into the length */
+	rc += 1;
+
+	return simple_read_from_buffer(buf, count, ppos, data, rc);
+}
+
+static const struct file_operations pmbus_debugfs_ops_mfr = {
+	.llseek = noop_llseek,
+	.read = pmbus_debugfs_mfr_read,
+	.write = NULL,
+	.open = simple_open,
+};
+
 static int pmbus_debugfs_get_pec(void *data, u64 *val)
 {
 	struct i2c_client *client = data;
@@ -2693,7 +2720,7 @@ static int pmbus_init_debugfs(struct i2c_client *client,
 
 	/* Allocate the max possible entries we need. */
 	entries = devm_kcalloc(data->dev,
-			       data->info->pages * 10, sizeof(*entries),
+			       data->info->pages * 16, sizeof(*entries),
 			       GFP_KERNEL);
 	if (!entries)
 		return -ENOMEM;
@@ -2803,6 +2830,66 @@ static int pmbus_init_debugfs(struct i2c_client *client,
 					    &entries[idx++],
 					    &pmbus_debugfs_ops);
 		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_ID)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_ID;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_id", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_MODEL)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_MODEL;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_model", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_REVISION)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_REVISION;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_revision", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_LOCATION)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_LOCATION;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_location", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_DATE)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_DATE;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_date", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
+
+		if (pmbus_check_byte_register(client, i, PMBUS_MFR_SERIAL)) {
+			entries[idx].client = client;
+			entries[idx].page = i;
+			entries[idx].reg = PMBUS_MFR_SERIAL;
+			scnprintf(name, PMBUS_NAME_SIZE, "mfr%d_serial", i);
+			debugfs_create_file(name, 0444, data->debugfs,
+					    &entries[idx++],
+					    &pmbus_debugfs_ops_mfr);
+		}
 	}
 
 	return devm_add_action_or_reset(data->dev,

--
2.25.1