i2c: create debugfs entry per adapter

[ Upstream commit 73febd775bdbdb98c81255ff85773ac410ded5c4 ]

Two drivers already implement custom debugfs handling for their
i2c_adapter and more will come. So, let the core create a debugfs
directory per adapter and pass that to drivers for their debugfs files.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>
Stable-dep-of: 8d3cefaf6592 ("i2c: core: Lock address during client device instantiation")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index c8cb6f44a0f880b43ca2a4a2b9a96dbb3424ff4a..76d70de2d317d10ee2b218ae08d2902e02e461d1 100644 (file)
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -16,6 +16,7 @@
 #include <linux/acpi.h>
 #include <linux/clk/clk-conf.h>
 #include <linux/completion.h>
+#include <linux/debugfs.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/errno.h>
@@ -66,6 +67,8 @@ static int i2c_detect(struct i2c_adapter *adapter, struct i2c_driver *driver);
 static DEFINE_STATIC_KEY_FALSE(i2c_trace_msg_key);
 static bool is_registered;
 
+static struct dentry *i2c_debugfs_root;
+
 int i2c_transfer_trace_reg(void)
 {
        static_branch_inc(&i2c_trace_msg_key);
@@ -1526,6 +1529,8 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
                goto out_list;
        }
 
+       adap->debugfs = debugfs_create_dir(dev_name(&adap->dev), i2c_debugfs_root);
+
        res = i2c_setup_smbus_alert(adap);
        if (res)
                goto out_reg;
@@ -1564,6 +1569,7 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
        return 0;
 
 out_reg:
+       debugfs_remove_recursive(adap->debugfs);
        init_completion(&adap->dev_released);
        device_unregister(&adap->dev);
        wait_for_completion(&adap->dev_released);
@@ -1765,6 +1771,8 @@ void i2c_del_adapter(struct i2c_adapter *adap)
 
        i2c_host_notify_irq_teardown(adap);
 
+       debugfs_remove_recursive(adap->debugfs);
+
        /* wait until all references to the device are gone
         *
         * FIXME: This is old code and should ideally be replaced by an
@@ -2062,6 +2070,8 @@ static int __init i2c_init(void)
 
        is_registered = true;
 
+       i2c_debugfs_root = debugfs_create_dir("i2c", NULL);
+
 #ifdef CONFIG_I2C_COMPAT
        i2c_adapter_compat_class = class_compat_register("i2c-adapter");
        if (!i2c_adapter_compat_class) {
@@ -2100,6 +2110,7 @@ static void __exit i2c_exit(void)
 #ifdef CONFIG_I2C_COMPAT
        class_compat_unregister(i2c_adapter_compat_class);
 #endif
+       debugfs_remove_recursive(i2c_debugfs_root);
        bus_unregister(&i2c_bus_type);
        tracepoint_synchronize_unregister();
 }

diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 8bcc0142c32c249bafc46a9020e382d07d9cd091..7c2ff4d7c360a0d956d566fa0906249651438ec3 100644 (file)
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -740,6 +740,8 @@ struct i2c_adapter {
 
        struct irq_domain *host_notify_domain;
        struct regulator *bus_regulator;
+
+       struct dentry *debugfs;
 };
 #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev)