Skip to contentSkip to conversation

i2c: npcm7xx: Support changing bus speed using debugfs.

PATCH In review Tali Perry 4 participants 4 messages Oct 13, 2020 – Oct 14, 2020

Subsystems (2)
lore
Share & tools
lore

Tali Perry

author maintainer
#0 lore raw

PATCH v2 1/1 i2c: npcm7xx: Support changing bus speed using debugfs.

Systems that can dynamically add and remove slave devices often need to change the bus speed in runtime. This patch expose the bus frequency to the user. This feature can also be used for test automation.

--
v2 -> v1:
- Fix typos.
- Remove casting to u64.

v1: initial version

Fixes 56a1485b102e (i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver)
---
 drivers/i2c/busses/i2c-npcm7xx.c | 35 ++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
drivers/i2c/busses/i2c-npcm7xx.c +35 -0
index 2ad166355ec9..633ac67153e2 100644
@@ -2208,6 +2208,40 @@ static const struct i2c_algorithm npcm_i2c_algo = {
 /* i2c debugfs directory: used to keep health monitor of i2c devices */
 static struct dentry *npcm_i2c_debugfs_dir;
 
+static int i2c_speed_get(void *data, u64 *val)
+{
+	struct npcm_i2c *bus = data;
+
+	*val = bus->bus_freq;
+	return 0;
+}
+
+static int i2c_speed_set(void *data, u64 val)
+{
+	struct npcm_i2c *bus = data;
+	int ret;
+
+	if (val < I2C_FREQ_MIN_HZ || val > I2C_FREQ_MAX_HZ)
+		return -EINVAL;
+
+	if (val == bus->bus_freq)
+		return 0;
+
+	i2c_lock_bus(&bus->adap, I2C_LOCK_ROOT_ADAPTER);
+
+	npcm_i2c_int_enable(bus, false);
+
+	ret = npcm_i2c_init_module(bus, I2C_MASTER, (u32)val);
+
+	i2c_unlock_bus(&bus->adap, I2C_LOCK_ROOT_ADAPTER);
+
+	if (ret)
+		return -EAGAIN;
+
+	return 0;
+}
+DEFINE_DEBUGFS_ATTRIBUTE(i2c_clock_ops, i2c_speed_get, i2c_speed_set, "%llu\n");
+
 static void npcm_i2c_init_debugfs(struct platform_device *pdev,
 				  struct npcm_i2c *bus)
 {
@@ -2223,6 +2257,7 @@ static void npcm_i2c_init_debugfs(struct platform_device *pdev,
 	debugfs_create_u64("rec_succ_cnt", 0444, d, &bus->rec_succ_cnt);
 	debugfs_create_u64("rec_fail_cnt", 0444, d, &bus->rec_fail_cnt);
 	debugfs_create_u64("timeout_cnt", 0444, d, &bus->timeout_cnt);
+	debugfs_create_file("i2c_speed", 0644, d, bus, &i2c_clock_ops);
 
 	bus->debugfs = d;
 }

base-commit: 865c50e1d279671728c2936cb7680eb89355eeea

Signature · 1 line
2.22.0
#1 lore raw
Quoted 11 lines · Tali Perry

Systems that can dynamically add and remove slave devices often need to change the bus speed in runtime. This patch expose the bus frequency to the user. This feature can also be used for test automation.

--
v2 -> v1:
- Fix typos.
- Remove casting to u64.

v1: initial version

Above block should go after cutter '---' (see below) line...

Quoted 3 lines
Fixes 56a1485b102e (i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver)

---

...here.

Quoted 2 lines
 drivers/i2c/busses/i2c-npcm7xx.c | 35 ++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

As we discussed previously I'm not a fan of the functionality this gives and a way it's done, but this is debugfs and not anyhow an ABI. Also it's localized inside one driver. In the future we may come up with better approach.

That said, no objections from me.

Quoted 58 lines
drivers/i2c/busses/i2c-npcm7xx.c +35 -0
index 2ad166355ec9..633ac67153e2 100644
@@ -2208,6 +2208,40 @@ static const struct i2c_algorithm npcm_i2c_algo = {
 /* i2c debugfs directory: used to keep health monitor of i2c devices */
 static struct dentry *npcm_i2c_debugfs_dir;
 
+static int i2c_speed_get(void *data, u64 *val)
+{
+	struct npcm_i2c *bus = data;
+
+	*val = bus->bus_freq;
+	return 0;
+}
+
+static int i2c_speed_set(void *data, u64 val)
+{
+	struct npcm_i2c *bus = data;
+	int ret;
+
+	if (val < I2C_FREQ_MIN_HZ || val > I2C_FREQ_MAX_HZ)
+		return -EINVAL;
+
+	if (val == bus->bus_freq)
+		return 0;
+
+	i2c_lock_bus(&bus->adap, I2C_LOCK_ROOT_ADAPTER);
+
+	npcm_i2c_int_enable(bus, false);
+
+	ret = npcm_i2c_init_module(bus, I2C_MASTER, (u32)val);
+
+	i2c_unlock_bus(&bus->adap, I2C_LOCK_ROOT_ADAPTER);
+
+	if (ret)
+		return -EAGAIN;
+
+	return 0;
+}
+DEFINE_DEBUGFS_ATTRIBUTE(i2c_clock_ops, i2c_speed_get, i2c_speed_set, "%llu\n");
+
 static void npcm_i2c_init_debugfs(struct platform_device *pdev,
 				  struct npcm_i2c *bus)
 {
@@ -2223,6 +2257,7 @@ static void npcm_i2c_init_debugfs(struct platform_device *pdev,
 	debugfs_create_u64("rec_succ_cnt", 0444, d, &bus->rec_succ_cnt);
 	debugfs_create_u64("rec_fail_cnt", 0444, d, &bus->rec_fail_cnt);
 	debugfs_create_u64("timeout_cnt", 0444, d, &bus->timeout_cnt);
+	debugfs_create_file("i2c_speed", 0644, d, bus, &i2c_clock_ops);
 
 	bus->debugfs = d;
 }

base-commit: 865c50e1d279671728c2936cb7680eb89355eeea

Signature · 1 line
2.22.0
Signature · 2 lines
With Best Regards,
Andy Shevchenko
Reviewed-by Tested-by
#2 lore raw

Tested again, and the updated patch is still working.

Quoted 7 lines · Andy Shevchenko
Quoted 4 lines · Tali Perry

Systems that can dynamically add and remove slave devices often need to change the bus speed in runtime. This patch expose the bus frequency to the user. This feature can also be used for test automation.

Quoted 11 lines
Quoted 6 lines

--
v2 -> v1:
- Fix typos.
- Remove casting to u64.

v1: initial version

Above block should go after cutter '---' (see below) line...

Quoted 2 lines
Fixes 56a1485b102e (i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver)
Quoted 67 lines
Quoted 1 line

---

...here.

Quoted 2 lines
 drivers/i2c/busses/i2c-npcm7xx.c | 35 ++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

As we discussed previously I'm not a fan of the functionality this gives and a way it's done, but this is debugfs and not anyhow an ABI. Also it's localized inside one driver. In the future we may come up with better approach.

That said, no objections from me.

Quoted 54 lines
drivers/i2c/busses/i2c-npcm7xx.c +35 -0
index 2ad166355ec9..633ac67153e2 100644
@@ -2208,6 +2208,40 @@ static const struct i2c_algorithm npcm_i2c_algo = {
 /* i2c debugfs directory: used to keep health monitor of i2c devices */
 static struct dentry *npcm_i2c_debugfs_dir;
 
+static int i2c_speed_get(void *data, u64 *val)
+{
+     struct npcm_i2c *bus = data;
+
+     *val = bus->bus_freq;
+     return 0;
+}
+
+static int i2c_speed_set(void *data, u64 val)
+{
+     struct npcm_i2c *bus = data;
+     int ret;
+
+     if (val < I2C_FREQ_MIN_HZ || val > I2C_FREQ_MAX_HZ)
+             return -EINVAL;
+
+     if (val == bus->bus_freq)
+             return 0;
+
+     i2c_lock_bus(&bus->adap, I2C_LOCK_ROOT_ADAPTER);
+
+     npcm_i2c_int_enable(bus, false);
+
+     ret = npcm_i2c_init_module(bus, I2C_MASTER, (u32)val);
+
+     i2c_unlock_bus(&bus->adap, I2C_LOCK_ROOT_ADAPTER);
+
+     if (ret)
+             return -EAGAIN;
+
+     return 0;
+}
+DEFINE_DEBUGFS_ATTRIBUTE(i2c_clock_ops, i2c_speed_get, i2c_speed_set, "%llu\n");
+
 static void npcm_i2c_init_debugfs(struct platform_device *pdev,
                                struct npcm_i2c *bus)
 {
@@ -2223,6 +2257,7 @@ static void npcm_i2c_init_debugfs(struct platform_device *pdev,
      debugfs_create_u64("rec_succ_cnt", 0444, d, &bus->rec_succ_cnt);
      debugfs_create_u64("rec_fail_cnt", 0444, d, &bus->rec_fail_cnt);
      debugfs_create_u64("timeout_cnt", 0444, d, &bus->timeout_cnt);
+     debugfs_create_file("i2c_speed", 0644, d, bus, &i2c_clock_ops);
 
      bus->debugfs = d;
 }
Quoted 10 lines
Quoted 4 lines

base-commit: 865c50e1d279671728c2936cb7680eb89355eeea --
2.22.0

--
With Best Regards,
Andy Shevchenko

- Alex Qiu

Reviewed-by on v2 1/1
#3 lore raw
In reply to Tali Perry
Quoted 11 lines · Tali Perry

Systems that can dynamically add and remove slave devices often need to change the bus speed in runtime. This patch expose the bus frequency to the user. This feature can also be used for test automation.

--
v2 -> v1:
- Fix typos.
- Remove casting to u64.

Quoted 4 lines

v1: initial version

Fixes 56a1485b102e (i2c: npcm7xx: Add Nuvoton NPCM I2C controller driver)

I'm not sure that the Fixes tag is quite correct, but it's no biggie.

Quoted 62 lines
---
 drivers/i2c/busses/i2c-npcm7xx.c | 35 ++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
drivers/i2c/busses/i2c-npcm7xx.c +35 -0
index 2ad166355ec9..633ac67153e2 100644
@@ -2208,6 +2208,40 @@ static const struct i2c_algorithm npcm_i2c_algo = {
 /* i2c debugfs directory: used to keep health monitor of i2c devices */
 static struct dentry *npcm_i2c_debugfs_dir;
 
+static int i2c_speed_get(void *data, u64 *val)
+{
+       struct npcm_i2c *bus = data;
+
+       *val = bus->bus_freq;
+       return 0;
+}
+
+static int i2c_speed_set(void *data, u64 val)
+{
+       struct npcm_i2c *bus = data;
+       int ret;
+
+       if (val < I2C_FREQ_MIN_HZ || val > I2C_FREQ_MAX_HZ)
+               return -EINVAL;
+
+       if (val == bus->bus_freq)
+               return 0;
+
+       i2c_lock_bus(&bus->adap, I2C_LOCK_ROOT_ADAPTER);
+
+       npcm_i2c_int_enable(bus, false);
+
+       ret = npcm_i2c_init_module(bus, I2C_MASTER, (u32)val);
+
+       i2c_unlock_bus(&bus->adap, I2C_LOCK_ROOT_ADAPTER);
+
+       if (ret)
+               return -EAGAIN;
+
+       return 0;
+}
+DEFINE_DEBUGFS_ATTRIBUTE(i2c_clock_ops, i2c_speed_get, i2c_speed_set, "%llu\n");
+
 static void npcm_i2c_init_debugfs(struct platform_device *pdev,
                                  struct npcm_i2c *bus)
 {
@@ -2223,6 +2257,7 @@ static void npcm_i2c_init_debugfs(struct platform_device *pdev,
        debugfs_create_u64("rec_succ_cnt", 0444, d, &bus->rec_succ_cnt);
        debugfs_create_u64("rec_fail_cnt", 0444, d, &bus->rec_fail_cnt);
        debugfs_create_u64("timeout_cnt", 0444, d, &bus->timeout_cnt);
+       debugfs_create_file("i2c_speed", 0644, d, bus, &i2c_clock_ops);
 
        bus->debugfs = d;
 }

base-commit: 865c50e1d279671728c2936cb7680eb89355eeea --
2.22.0