* [PATCH v10 4/4] i2c: core: support bus regulator controlling in adapter
@ 2020-01-16 2:56 ` Bibby Hsieh
0 siblings, 0 replies; 25+ messages in thread
From: Bibby Hsieh @ 2020-01-16 2:56 UTC (permalink / raw)
To: Wolfram Sang, Bartosz Golaszewski, linux-i2c-u79uwXL29TY76Z2rM5mHXA
Cc: tfiga-F7+t8E8rja9g9hUCZPvPmw, drinkcat-F7+t8E8rja9g9hUCZPvPmw,
srv_heupstream-NuS5LvNUpcJWk0Htik3J/w,
robh+dt-DgEjT+Ai2ygdnm+yROfE0A, mark.rutland-5wv7dgnIgG8,
devicetree-u79uwXL29TY76Z2rM5mHXA, Bibby Hsieh
Although in the most platforms, the bus power of i2c
are alway on, some platforms disable the i2c bus power
in order to meet low power request.
We get and enable bulk regulator in i2c adapter device.
Signed-off-by: Bibby Hsieh <bibby.hsieh@mediatek.com>
---
drivers/i2c/i2c-core-base.c | 81 +++++++++++++++++++++++++++++++++++++
include/linux/i2c.h | 3 ++
2 files changed, 84 insertions(+)
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
index 9333c865d4a9..9b9e96b094ca 100644
--- a/drivers/i2c/i2c-core-base.c
+++ b/drivers/i2c/i2c-core-base.c
@@ -306,6 +306,7 @@ static int i2c_smbus_host_notify_to_irq(const struct i2c_client *client)
static int i2c_device_probe(struct device *dev)
{
struct i2c_client *client = i2c_verify_client(dev);
+ struct i2c_adapter *adap = client->adapter;
struct i2c_driver *driver;
int status;
@@ -371,6 +372,12 @@ static int i2c_device_probe(struct device *dev)
dev_dbg(dev, "probe\n");
+ status = regulator_enable(adap->bus_reg);
+ if (status != 0) {
+ dev_err(&adap->dev, "Failed to enable power regulator\n");
+ goto err_clear_wakeup_irq;
+ }
+
status = of_clk_set_defaults(dev->of_node, false);
if (status < 0)
goto err_clear_wakeup_irq;
@@ -407,6 +414,7 @@ static int i2c_device_probe(struct device *dev)
static int i2c_device_remove(struct device *dev)
{
struct i2c_client *client = i2c_verify_client(dev);
+ struct i2c_adapter *adap = client->adapter;
struct i2c_driver *driver;
int status = 0;
@@ -420,6 +428,8 @@ static int i2c_device_remove(struct device *dev)
}
dev_pm_domain_detach(&client->dev, true);
+ if (!pm_runtime_status_suspended(&adap->dev))
+ regulator_disable(adap->bus_reg);
dev_pm_clear_wake_irq(&client->dev);
device_init_wakeup(&client->dev, false);
@@ -431,6 +441,71 @@ static int i2c_device_remove(struct device *dev)
return status;
}
+#ifdef CONFIG_PM_SLEEP
+static int i2c_resume(struct device *dev)
+{
+ struct i2c_client *client = i2c_verify_client(dev);
+ struct i2c_adapter *adap = client->adapter;
+ int err;
+
+ if (pm_runtime_status_suspended(&adap->dev)) {
+ err = regulator_enable(adap->bus_reg);
+ if (err)
+ return err;
+ }
+
+ return pm_generic_resume(dev);
+}
+
+static int i2c_suspend(struct device *dev)
+{
+ struct i2c_client *client = i2c_verify_client(dev);
+ struct i2c_adapter *adap = client->adapter;
+ int err;
+
+ if (!pm_runtime_status_suspended(&adap->dev)) {
+ err = regulator_disable(adap->bus_reg);
+ if (err)
+ return err;
+ }
+
+ return pm_generic_suspend(dev);
+}
+#endif
+
+#ifdef CONFIG_PM
+static int i2c_runtime_resume(struct device *dev)
+{
+ struct i2c_client *client = i2c_verify_client(dev);
+ struct i2c_adapter *adap = client->adapter;
+ int err;
+
+ err = regulator_enable(adap->bus_reg);
+ if (err)
+ return err;
+
+ return pm_generic_runtime_resume(dev);
+}
+
+static int i2c_runtime_suspend(struct device *dev)
+{
+ struct i2c_client *client = i2c_verify_client(dev);
+ struct i2c_adapter *adap = client->adapter;
+ int err;
+
+ err = pm_generic_runtime_suspend(dev);
+ if (err)
+ return err;
+
+ return regulator_disable(adap->bus_reg);
+}
+#endif
+
+static const struct dev_pm_ops i2c_device_pm = {
+ SET_SYSTEM_SLEEP_PM_OPS(i2c_suspend, i2c_resume)
+ SET_RUNTIME_PM_OPS(i2c_runtime_suspend, i2c_runtime_resume, NULL)
+};
+
static void i2c_device_shutdown(struct device *dev)
{
struct i2c_client *client = i2c_verify_client(dev);
@@ -488,6 +563,7 @@ struct bus_type i2c_bus_type = {
.probe = i2c_device_probe,
.remove = i2c_device_remove,
.shutdown = i2c_device_shutdown,
+ .pm = &i2c_device_pm,
};
EXPORT_SYMBOL_GPL(i2c_bus_type);
@@ -1351,6 +1427,11 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
goto out_reg;
dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
+ adap->bus_reg = devm_regulator_get(&adap->dev, "bus");
+ if (IS_ERR(adap->bus_reg)) {
+ res = PTR_ERR(adap->bus_reg);
+ goto out_reg;
+ }
pm_runtime_no_callbacks(&adap->dev);
pm_suspend_ignore_children(&adap->dev, true);
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index d2f786706657..833b81a680da 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -15,6 +15,7 @@
#include <linux/device.h> /* for struct device */
#include <linux/sched.h> /* for completion */
#include <linux/mutex.h>
+#include <linux/regulator/consumer.h>
#include <linux/rtmutex.h>
#include <linux/irqdomain.h> /* for Host Notify IRQ */
#include <linux/of.h> /* for struct device_node */
@@ -330,6 +331,7 @@ struct i2c_client {
int init_irq; /* irq set at initialization */
int irq; /* irq issued by device */
struct list_head detected;
+
#if IS_ENABLED(CONFIG_I2C_SLAVE)
i2c_slave_cb_t slave_cb; /* callback for slave mode */
#endif
@@ -723,6 +725,7 @@ struct i2c_adapter {
const struct i2c_adapter_quirks *quirks;
struct irq_domain *host_notify_domain;
+ struct regulator *bus_reg;
};
#define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev)
--
2.18.0
^ permalink raw reply related [flat|nested] 25+ messages in thread* Re: [PATCH v10 4/4] i2c: core: support bus regulator controlling in adapter
@ 2020-01-28 3:57 ` Tomasz Figa
0 siblings, 0 replies; 25+ messages in thread
From: Tomasz Figa @ 2020-01-28 3:57 UTC (permalink / raw)
To: Bibby Hsieh, Wolfram Sang
Cc: Bartosz Golaszewski, linux-i2c, Nicolas Boichat, srv_heupstream,
Rob Herring, Mark Rutland, linux-devicetree
On Thu, Jan 16, 2020 at 11:56 AM Bibby Hsieh <bibby.hsieh@mediatek.com> wrote:
>
> Although in the most platforms, the bus power of i2c
> are alway on, some platforms disable the i2c bus power
> in order to meet low power request.
>
> We get and enable bulk regulator in i2c adapter device.
>
> Signed-off-by: Bibby Hsieh <bibby.hsieh@mediatek.com>
> ---
> drivers/i2c/i2c-core-base.c | 81 +++++++++++++++++++++++++++++++++++++
> include/linux/i2c.h | 3 ++
> 2 files changed, 84 insertions(+)
>
Hi Bibby,
Please see my comments inline.
Hi Wolfram,
Would you have some time to take a look and comment on the general
approach? Thanks.
> diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
> index 9333c865d4a9..9b9e96b094ca 100644
> --- a/drivers/i2c/i2c-core-base.c
> +++ b/drivers/i2c/i2c-core-base.c
> @@ -306,6 +306,7 @@ static int i2c_smbus_host_notify_to_irq(const struct i2c_client *client)
> static int i2c_device_probe(struct device *dev)
> {
> struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> struct i2c_driver *driver;
> int status;
>
> @@ -371,6 +372,12 @@ static int i2c_device_probe(struct device *dev)
>
> dev_dbg(dev, "probe\n");
>
> + status = regulator_enable(adap->bus_reg);
> + if (status != 0) {
> + dev_err(&adap->dev, "Failed to enable power regulator\n");
> + goto err_clear_wakeup_irq;
> + }
> +
> status = of_clk_set_defaults(dev->of_node, false);
> if (status < 0)
> goto err_clear_wakeup_irq;
> @@ -407,6 +414,7 @@ static int i2c_device_probe(struct device *dev)
> static int i2c_device_remove(struct device *dev)
> {
> struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> struct i2c_driver *driver;
> int status = 0;
>
> @@ -420,6 +428,8 @@ static int i2c_device_remove(struct device *dev)
> }
>
> dev_pm_domain_detach(&client->dev, true);
> + if (!pm_runtime_status_suspended(&adap->dev))
Why adap->dev? We control the regulator in bus-level runtime PM
callbacks of the client->dev, right?
> + regulator_disable(adap->bus_reg);
>
> dev_pm_clear_wake_irq(&client->dev);
> device_init_wakeup(&client->dev, false);
> @@ -431,6 +441,71 @@ static int i2c_device_remove(struct device *dev)
> return status;
> }
>
> +#ifdef CONFIG_PM_SLEEP
> +static int i2c_resume(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + if (pm_runtime_status_suspended(&adap->dev)) {
Ditto.
> + err = regulator_enable(adap->bus_reg);
> + if (err)
> + return err;
> + }
> +
> + return pm_generic_resume(dev);
> +}
> +
> +static int i2c_suspend(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + if (!pm_runtime_status_suspended(&adap->dev)) {
Ditto.
> + err = regulator_disable(adap->bus_reg);
> + if (err)
> + return err;
> + }
> +
> + return pm_generic_suspend(dev);
> +}
> +#endif
> +
> +#ifdef CONFIG_PM
> +static int i2c_runtime_resume(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + err = regulator_enable(adap->bus_reg);
> + if (err)
> + return err;
> +
> + return pm_generic_runtime_resume(dev);
> +}
> +
> +static int i2c_runtime_suspend(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + err = pm_generic_runtime_suspend(dev);
> + if (err)
> + return err;
> +
> + return regulator_disable(adap->bus_reg);
> +}
> +#endif
> +
> +static const struct dev_pm_ops i2c_device_pm = {
> + SET_SYSTEM_SLEEP_PM_OPS(i2c_suspend, i2c_resume)
> + SET_RUNTIME_PM_OPS(i2c_runtime_suspend, i2c_runtime_resume, NULL)
> +};
> +
> static void i2c_device_shutdown(struct device *dev)
> {
> struct i2c_client *client = i2c_verify_client(dev);
> @@ -488,6 +563,7 @@ struct bus_type i2c_bus_type = {
> .probe = i2c_device_probe,
> .remove = i2c_device_remove,
> .shutdown = i2c_device_shutdown,
> + .pm = &i2c_device_pm,
> };
> EXPORT_SYMBOL_GPL(i2c_bus_type);
>
> @@ -1351,6 +1427,11 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
> goto out_reg;
>
> dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
> + adap->bus_reg = devm_regulator_get(&adap->dev, "bus");
> + if (IS_ERR(adap->bus_reg)) {
> + res = PTR_ERR(adap->bus_reg);
> + goto out_reg;
> + }
>
> pm_runtime_no_callbacks(&adap->dev);
> pm_suspend_ignore_children(&adap->dev, true);
> diff --git a/include/linux/i2c.h b/include/linux/i2c.h
> index d2f786706657..833b81a680da 100644
> --- a/include/linux/i2c.h
> +++ b/include/linux/i2c.h
> @@ -15,6 +15,7 @@
> #include <linux/device.h> /* for struct device */
> #include <linux/sched.h> /* for completion */
> #include <linux/mutex.h>
> +#include <linux/regulator/consumer.h>
> #include <linux/rtmutex.h>
> #include <linux/irqdomain.h> /* for Host Notify IRQ */
> #include <linux/of.h> /* for struct device_node */
> @@ -330,6 +331,7 @@ struct i2c_client {
> int init_irq; /* irq set at initialization */
> int irq; /* irq issued by device */
> struct list_head detected;
> +
nit: Unnecessary change.
Best regards,
Tomasz
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH v10 4/4] i2c: core: support bus regulator controlling in adapter
@ 2020-01-28 3:57 ` Tomasz Figa
0 siblings, 0 replies; 25+ messages in thread
From: Tomasz Figa @ 2020-01-28 3:57 UTC (permalink / raw)
To: Bibby Hsieh, Wolfram Sang
Cc: Bartosz Golaszewski, linux-i2c, Nicolas Boichat, srv_heupstream,
Rob Herring, Mark Rutland, linux-devicetree
On Thu, Jan 16, 2020 at 11:56 AM Bibby Hsieh <bibby.hsieh-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> wrote:
>
> Although in the most platforms, the bus power of i2c
> are alway on, some platforms disable the i2c bus power
> in order to meet low power request.
>
> We get and enable bulk regulator in i2c adapter device.
>
> Signed-off-by: Bibby Hsieh <bibby.hsieh-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
> ---
> drivers/i2c/i2c-core-base.c | 81 +++++++++++++++++++++++++++++++++++++
> include/linux/i2c.h | 3 ++
> 2 files changed, 84 insertions(+)
>
Hi Bibby,
Please see my comments inline.
Hi Wolfram,
Would you have some time to take a look and comment on the general
approach? Thanks.
> diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
> index 9333c865d4a9..9b9e96b094ca 100644
> --- a/drivers/i2c/i2c-core-base.c
> +++ b/drivers/i2c/i2c-core-base.c
> @@ -306,6 +306,7 @@ static int i2c_smbus_host_notify_to_irq(const struct i2c_client *client)
> static int i2c_device_probe(struct device *dev)
> {
> struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> struct i2c_driver *driver;
> int status;
>
> @@ -371,6 +372,12 @@ static int i2c_device_probe(struct device *dev)
>
> dev_dbg(dev, "probe\n");
>
> + status = regulator_enable(adap->bus_reg);
> + if (status != 0) {
> + dev_err(&adap->dev, "Failed to enable power regulator\n");
> + goto err_clear_wakeup_irq;
> + }
> +
> status = of_clk_set_defaults(dev->of_node, false);
> if (status < 0)
> goto err_clear_wakeup_irq;
> @@ -407,6 +414,7 @@ static int i2c_device_probe(struct device *dev)
> static int i2c_device_remove(struct device *dev)
> {
> struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> struct i2c_driver *driver;
> int status = 0;
>
> @@ -420,6 +428,8 @@ static int i2c_device_remove(struct device *dev)
> }
>
> dev_pm_domain_detach(&client->dev, true);
> + if (!pm_runtime_status_suspended(&adap->dev))
Why adap->dev? We control the regulator in bus-level runtime PM
callbacks of the client->dev, right?
> + regulator_disable(adap->bus_reg);
>
> dev_pm_clear_wake_irq(&client->dev);
> device_init_wakeup(&client->dev, false);
> @@ -431,6 +441,71 @@ static int i2c_device_remove(struct device *dev)
> return status;
> }
>
> +#ifdef CONFIG_PM_SLEEP
> +static int i2c_resume(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + if (pm_runtime_status_suspended(&adap->dev)) {
Ditto.
> + err = regulator_enable(adap->bus_reg);
> + if (err)
> + return err;
> + }
> +
> + return pm_generic_resume(dev);
> +}
> +
> +static int i2c_suspend(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + if (!pm_runtime_status_suspended(&adap->dev)) {
Ditto.
> + err = regulator_disable(adap->bus_reg);
> + if (err)
> + return err;
> + }
> +
> + return pm_generic_suspend(dev);
> +}
> +#endif
> +
> +#ifdef CONFIG_PM
> +static int i2c_runtime_resume(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + err = regulator_enable(adap->bus_reg);
> + if (err)
> + return err;
> +
> + return pm_generic_runtime_resume(dev);
> +}
> +
> +static int i2c_runtime_suspend(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + err = pm_generic_runtime_suspend(dev);
> + if (err)
> + return err;
> +
> + return regulator_disable(adap->bus_reg);
> +}
> +#endif
> +
> +static const struct dev_pm_ops i2c_device_pm = {
> + SET_SYSTEM_SLEEP_PM_OPS(i2c_suspend, i2c_resume)
> + SET_RUNTIME_PM_OPS(i2c_runtime_suspend, i2c_runtime_resume, NULL)
> +};
> +
> static void i2c_device_shutdown(struct device *dev)
> {
> struct i2c_client *client = i2c_verify_client(dev);
> @@ -488,6 +563,7 @@ struct bus_type i2c_bus_type = {
> .probe = i2c_device_probe,
> .remove = i2c_device_remove,
> .shutdown = i2c_device_shutdown,
> + .pm = &i2c_device_pm,
> };
> EXPORT_SYMBOL_GPL(i2c_bus_type);
>
> @@ -1351,6 +1427,11 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
> goto out_reg;
>
> dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
> + adap->bus_reg = devm_regulator_get(&adap->dev, "bus");
> + if (IS_ERR(adap->bus_reg)) {
> + res = PTR_ERR(adap->bus_reg);
> + goto out_reg;
> + }
>
> pm_runtime_no_callbacks(&adap->dev);
> pm_suspend_ignore_children(&adap->dev, true);
> diff --git a/include/linux/i2c.h b/include/linux/i2c.h
> index d2f786706657..833b81a680da 100644
> --- a/include/linux/i2c.h
> +++ b/include/linux/i2c.h
> @@ -15,6 +15,7 @@
> #include <linux/device.h> /* for struct device */
> #include <linux/sched.h> /* for completion */
> #include <linux/mutex.h>
> +#include <linux/regulator/consumer.h>
> #include <linux/rtmutex.h>
> #include <linux/irqdomain.h> /* for Host Notify IRQ */
> #include <linux/of.h> /* for struct device_node */
> @@ -330,6 +331,7 @@ struct i2c_client {
> int init_irq; /* irq set at initialization */
> int irq; /* irq issued by device */
> struct list_head detected;
> +
nit: Unnecessary change.
Best regards,
Tomasz
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH v10 4/4] i2c: core: support bus regulator controlling in adapter
@ 2020-01-28 6:36 ` Wolfram Sang
0 siblings, 0 replies; 25+ messages in thread
From: Wolfram Sang @ 2020-01-28 6:36 UTC (permalink / raw)
To: Bibby Hsieh
Cc: Bartosz Golaszewski, linux-i2c, tfiga, drinkcat, srv_heupstream,
robh+dt, mark.rutland, devicetree
[-- Attachment #1: Type: text/plain, Size: 3962 bytes --]
On Thu, Jan 16, 2020 at 10:56:37AM +0800, Bibby Hsieh wrote:
> Although in the most platforms, the bus power of i2c
> are alway on, some platforms disable the i2c bus power
> in order to meet low power request.
>
> We get and enable bulk regulator in i2c adapter device.
>
> Signed-off-by: Bibby Hsieh <bibby.hsieh@mediatek.com>
...
> +#ifdef CONFIG_PM_SLEEP
> +static int i2c_resume(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + if (pm_runtime_status_suspended(&adap->dev)) {
> + err = regulator_enable(adap->bus_reg);
> + if (err)
> + return err;
> + }
> +
> + return pm_generic_resume(dev);
> +}
> +
> +static int i2c_suspend(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + if (!pm_runtime_status_suspended(&adap->dev)) {
> + err = regulator_disable(adap->bus_reg);
> + if (err)
> + return err;
> + }
> +
> + return pm_generic_suspend(dev);
> +}
> +#endif
> +
> +#ifdef CONFIG_PM
> +static int i2c_runtime_resume(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + err = regulator_enable(adap->bus_reg);
> + if (err)
> + return err;
> +
> + return pm_generic_runtime_resume(dev);
> +}
> +
> +static int i2c_runtime_suspend(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + err = pm_generic_runtime_suspend(dev);
> + if (err)
> + return err;
> +
> + return regulator_disable(adap->bus_reg);
> +}
> +#endif
> +
> +static const struct dev_pm_ops i2c_device_pm = {
> + SET_SYSTEM_SLEEP_PM_OPS(i2c_suspend, i2c_resume)
> + SET_RUNTIME_PM_OPS(i2c_runtime_suspend, i2c_runtime_resume, NULL)
> +};
> +
It looks good to me, yet I am not a PM expert. An ack from someone more
into that topic would be great, if possible.
> static void i2c_device_shutdown(struct device *dev)
> {
> struct i2c_client *client = i2c_verify_client(dev);
> @@ -488,6 +563,7 @@ struct bus_type i2c_bus_type = {
> .probe = i2c_device_probe,
> .remove = i2c_device_remove,
> .shutdown = i2c_device_shutdown,
> + .pm = &i2c_device_pm,
> };
> EXPORT_SYMBOL_GPL(i2c_bus_type);
>
> @@ -1351,6 +1427,11 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
> goto out_reg;
>
> dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
> + adap->bus_reg = devm_regulator_get(&adap->dev, "bus");
> + if (IS_ERR(adap->bus_reg)) {
> + res = PTR_ERR(adap->bus_reg);
> + goto out_reg;
> + }
>
> pm_runtime_no_callbacks(&adap->dev);
> pm_suspend_ignore_children(&adap->dev, true);
> diff --git a/include/linux/i2c.h b/include/linux/i2c.h
> index d2f786706657..833b81a680da 100644
> --- a/include/linux/i2c.h
> +++ b/include/linux/i2c.h
> @@ -15,6 +15,7 @@
> #include <linux/device.h> /* for struct device */
> #include <linux/sched.h> /* for completion */
> #include <linux/mutex.h>
> +#include <linux/regulator/consumer.h>
> #include <linux/rtmutex.h>
> #include <linux/irqdomain.h> /* for Host Notify IRQ */
> #include <linux/of.h> /* for struct device_node */
> @@ -330,6 +331,7 @@ struct i2c_client {
> int init_irq; /* irq set at initialization */
> int irq; /* irq issued by device */
> struct list_head detected;
> +
> #if IS_ENABLED(CONFIG_I2C_SLAVE)
> i2c_slave_cb_t slave_cb; /* callback for slave mode */
> #endif
> @@ -723,6 +725,7 @@ struct i2c_adapter {
> const struct i2c_adapter_quirks *quirks;
>
> struct irq_domain *host_notify_domain;
> + struct regulator *bus_reg;
"bus_regulator" please. "reg" is ambigious with "register".
And what Tomasz said, of course.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH v10 4/4] i2c: core: support bus regulator controlling in adapter
@ 2020-01-28 6:36 ` Wolfram Sang
0 siblings, 0 replies; 25+ messages in thread
From: Wolfram Sang @ 2020-01-28 6:36 UTC (permalink / raw)
To: Bibby Hsieh
Cc: Bartosz Golaszewski, linux-i2c-u79uwXL29TY76Z2rM5mHXA,
tfiga-F7+t8E8rja9g9hUCZPvPmw, drinkcat-F7+t8E8rja9g9hUCZPvPmw,
srv_heupstream-NuS5LvNUpcJWk0Htik3J/w,
robh+dt-DgEjT+Ai2ygdnm+yROfE0A, mark.rutland-5wv7dgnIgG8,
devicetree-u79uwXL29TY76Z2rM5mHXA
[-- Attachment #1: Type: text/plain, Size: 3989 bytes --]
On Thu, Jan 16, 2020 at 10:56:37AM +0800, Bibby Hsieh wrote:
> Although in the most platforms, the bus power of i2c
> are alway on, some platforms disable the i2c bus power
> in order to meet low power request.
>
> We get and enable bulk regulator in i2c adapter device.
>
> Signed-off-by: Bibby Hsieh <bibby.hsieh-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
...
> +#ifdef CONFIG_PM_SLEEP
> +static int i2c_resume(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + if (pm_runtime_status_suspended(&adap->dev)) {
> + err = regulator_enable(adap->bus_reg);
> + if (err)
> + return err;
> + }
> +
> + return pm_generic_resume(dev);
> +}
> +
> +static int i2c_suspend(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + if (!pm_runtime_status_suspended(&adap->dev)) {
> + err = regulator_disable(adap->bus_reg);
> + if (err)
> + return err;
> + }
> +
> + return pm_generic_suspend(dev);
> +}
> +#endif
> +
> +#ifdef CONFIG_PM
> +static int i2c_runtime_resume(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + err = regulator_enable(adap->bus_reg);
> + if (err)
> + return err;
> +
> + return pm_generic_runtime_resume(dev);
> +}
> +
> +static int i2c_runtime_suspend(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + err = pm_generic_runtime_suspend(dev);
> + if (err)
> + return err;
> +
> + return regulator_disable(adap->bus_reg);
> +}
> +#endif
> +
> +static const struct dev_pm_ops i2c_device_pm = {
> + SET_SYSTEM_SLEEP_PM_OPS(i2c_suspend, i2c_resume)
> + SET_RUNTIME_PM_OPS(i2c_runtime_suspend, i2c_runtime_resume, NULL)
> +};
> +
It looks good to me, yet I am not a PM expert. An ack from someone more
into that topic would be great, if possible.
> static void i2c_device_shutdown(struct device *dev)
> {
> struct i2c_client *client = i2c_verify_client(dev);
> @@ -488,6 +563,7 @@ struct bus_type i2c_bus_type = {
> .probe = i2c_device_probe,
> .remove = i2c_device_remove,
> .shutdown = i2c_device_shutdown,
> + .pm = &i2c_device_pm,
> };
> EXPORT_SYMBOL_GPL(i2c_bus_type);
>
> @@ -1351,6 +1427,11 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
> goto out_reg;
>
> dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
> + adap->bus_reg = devm_regulator_get(&adap->dev, "bus");
> + if (IS_ERR(adap->bus_reg)) {
> + res = PTR_ERR(adap->bus_reg);
> + goto out_reg;
> + }
>
> pm_runtime_no_callbacks(&adap->dev);
> pm_suspend_ignore_children(&adap->dev, true);
> diff --git a/include/linux/i2c.h b/include/linux/i2c.h
> index d2f786706657..833b81a680da 100644
> --- a/include/linux/i2c.h
> +++ b/include/linux/i2c.h
> @@ -15,6 +15,7 @@
> #include <linux/device.h> /* for struct device */
> #include <linux/sched.h> /* for completion */
> #include <linux/mutex.h>
> +#include <linux/regulator/consumer.h>
> #include <linux/rtmutex.h>
> #include <linux/irqdomain.h> /* for Host Notify IRQ */
> #include <linux/of.h> /* for struct device_node */
> @@ -330,6 +331,7 @@ struct i2c_client {
> int init_irq; /* irq set at initialization */
> int irq; /* irq issued by device */
> struct list_head detected;
> +
> #if IS_ENABLED(CONFIG_I2C_SLAVE)
> i2c_slave_cb_t slave_cb; /* callback for slave mode */
> #endif
> @@ -723,6 +725,7 @@ struct i2c_adapter {
> const struct i2c_adapter_quirks *quirks;
>
> struct irq_domain *host_notify_domain;
> + struct regulator *bus_reg;
"bus_regulator" please. "reg" is ambigious with "register".
And what Tomasz said, of course.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH v10 4/4] i2c: core: support bus regulator controlling in adapter
2020-01-28 6:36 ` Wolfram Sang
@ 2020-01-28 7:32 ` Tomasz Figa
-1 siblings, 0 replies; 25+ messages in thread
From: Tomasz Figa @ 2020-01-28 7:32 UTC (permalink / raw)
To: Wolfram Sang
Cc: Bibby Hsieh, Bartosz Golaszewski, linux-i2c, Nicolas Boichat,
srv_heupstream, Rob Herring, Mark Rutland, linux-devicetree,
Rafael J. Wysocki
On Tue, Jan 28, 2020 at 3:36 PM Wolfram Sang <wsa@the-dreams.de> wrote:
>
> On Thu, Jan 16, 2020 at 10:56:37AM +0800, Bibby Hsieh wrote:
> > Although in the most platforms, the bus power of i2c
> > are alway on, some platforms disable the i2c bus power
> > in order to meet low power request.
> >
> > We get and enable bulk regulator in i2c adapter device.
> >
> > Signed-off-by: Bibby Hsieh <bibby.hsieh@mediatek.com>
>
> ...
>
> > +#ifdef CONFIG_PM_SLEEP
> > +static int i2c_resume(struct device *dev)
> > +{
> > + struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > + int err;
> > +
> > + if (pm_runtime_status_suspended(&adap->dev)) {
> > + err = regulator_enable(adap->bus_reg);
> > + if (err)
> > + return err;
> > + }
> > +
> > + return pm_generic_resume(dev);
> > +}
> > +
> > +static int i2c_suspend(struct device *dev)
> > +{
> > + struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > + int err;
> > +
> > + if (!pm_runtime_status_suspended(&adap->dev)) {
> > + err = regulator_disable(adap->bus_reg);
> > + if (err)
> > + return err;
> > + }
> > +
> > + return pm_generic_suspend(dev);
> > +}
> > +#endif
> > +
> > +#ifdef CONFIG_PM
> > +static int i2c_runtime_resume(struct device *dev)
> > +{
> > + struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > + int err;
> > +
> > + err = regulator_enable(adap->bus_reg);
> > + if (err)
> > + return err;
> > +
> > + return pm_generic_runtime_resume(dev);
> > +}
> > +
> > +static int i2c_runtime_suspend(struct device *dev)
> > +{
> > + struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > + int err;
> > +
> > + err = pm_generic_runtime_suspend(dev);
> > + if (err)
> > + return err;
> > +
> > + return regulator_disable(adap->bus_reg);
> > +}
> > +#endif
> > +
> > +static const struct dev_pm_ops i2c_device_pm = {
> > + SET_SYSTEM_SLEEP_PM_OPS(i2c_suspend, i2c_resume)
> > + SET_RUNTIME_PM_OPS(i2c_runtime_suspend, i2c_runtime_resume, NULL)
> > +};
> > +
>
> It looks good to me, yet I am not a PM expert. An ack from someone more
> into that topic would be great, if possible.
>
> > static void i2c_device_shutdown(struct device *dev)
> > {
> > struct i2c_client *client = i2c_verify_client(dev);
> > @@ -488,6 +563,7 @@ struct bus_type i2c_bus_type = {
> > .probe = i2c_device_probe,
> > .remove = i2c_device_remove,
> > .shutdown = i2c_device_shutdown,
> > + .pm = &i2c_device_pm,
> > };
> > EXPORT_SYMBOL_GPL(i2c_bus_type);
> >
> > @@ -1351,6 +1427,11 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
> > goto out_reg;
> >
> > dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
> > + adap->bus_reg = devm_regulator_get(&adap->dev, "bus");
> > + if (IS_ERR(adap->bus_reg)) {
> > + res = PTR_ERR(adap->bus_reg);
> > + goto out_reg;
> > + }
> >
> > pm_runtime_no_callbacks(&adap->dev);
> > pm_suspend_ignore_children(&adap->dev, true);
> > diff --git a/include/linux/i2c.h b/include/linux/i2c.h
> > index d2f786706657..833b81a680da 100644
> > --- a/include/linux/i2c.h
> > +++ b/include/linux/i2c.h
> > @@ -15,6 +15,7 @@
> > #include <linux/device.h> /* for struct device */
> > #include <linux/sched.h> /* for completion */
> > #include <linux/mutex.h>
> > +#include <linux/regulator/consumer.h>
> > #include <linux/rtmutex.h>
> > #include <linux/irqdomain.h> /* for Host Notify IRQ */
> > #include <linux/of.h> /* for struct device_node */
> > @@ -330,6 +331,7 @@ struct i2c_client {
> > int init_irq; /* irq set at initialization */
> > int irq; /* irq issued by device */
> > struct list_head detected;
> > +
> > #if IS_ENABLED(CONFIG_I2C_SLAVE)
> > i2c_slave_cb_t slave_cb; /* callback for slave mode */
> > #endif
> > @@ -723,6 +725,7 @@ struct i2c_adapter {
> > const struct i2c_adapter_quirks *quirks;
> >
> > struct irq_domain *host_notify_domain;
> > + struct regulator *bus_reg;
>
> "bus_regulator" please. "reg" is ambigious with "register".
>
> And what Tomasz said, of course.
>
Thanks a lot.
I've added Rafael and linux-pm in another reply quoting the whole patch.
Best regards,
Tomasz
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH v10 4/4] i2c: core: support bus regulator controlling in adapter
@ 2020-01-28 7:32 ` Tomasz Figa
0 siblings, 0 replies; 25+ messages in thread
From: Tomasz Figa @ 2020-01-28 7:32 UTC (permalink / raw)
To: Wolfram Sang
Cc: Bibby Hsieh, Bartosz Golaszewski, linux-i2c, Nicolas Boichat,
srv_heupstream, Rob Herring, Mark Rutland, linux-devicetree,
Rafael J. Wysocki
On Tue, Jan 28, 2020 at 3:36 PM Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org> wrote:
>
> On Thu, Jan 16, 2020 at 10:56:37AM +0800, Bibby Hsieh wrote:
> > Although in the most platforms, the bus power of i2c
> > are alway on, some platforms disable the i2c bus power
> > in order to meet low power request.
> >
> > We get and enable bulk regulator in i2c adapter device.
> >
> > Signed-off-by: Bibby Hsieh <bibby.hsieh-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
>
> ...
>
> > +#ifdef CONFIG_PM_SLEEP
> > +static int i2c_resume(struct device *dev)
> > +{
> > + struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > + int err;
> > +
> > + if (pm_runtime_status_suspended(&adap->dev)) {
> > + err = regulator_enable(adap->bus_reg);
> > + if (err)
> > + return err;
> > + }
> > +
> > + return pm_generic_resume(dev);
> > +}
> > +
> > +static int i2c_suspend(struct device *dev)
> > +{
> > + struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > + int err;
> > +
> > + if (!pm_runtime_status_suspended(&adap->dev)) {
> > + err = regulator_disable(adap->bus_reg);
> > + if (err)
> > + return err;
> > + }
> > +
> > + return pm_generic_suspend(dev);
> > +}
> > +#endif
> > +
> > +#ifdef CONFIG_PM
> > +static int i2c_runtime_resume(struct device *dev)
> > +{
> > + struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > + int err;
> > +
> > + err = regulator_enable(adap->bus_reg);
> > + if (err)
> > + return err;
> > +
> > + return pm_generic_runtime_resume(dev);
> > +}
> > +
> > +static int i2c_runtime_suspend(struct device *dev)
> > +{
> > + struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > + int err;
> > +
> > + err = pm_generic_runtime_suspend(dev);
> > + if (err)
> > + return err;
> > +
> > + return regulator_disable(adap->bus_reg);
> > +}
> > +#endif
> > +
> > +static const struct dev_pm_ops i2c_device_pm = {
> > + SET_SYSTEM_SLEEP_PM_OPS(i2c_suspend, i2c_resume)
> > + SET_RUNTIME_PM_OPS(i2c_runtime_suspend, i2c_runtime_resume, NULL)
> > +};
> > +
>
> It looks good to me, yet I am not a PM expert. An ack from someone more
> into that topic would be great, if possible.
>
> > static void i2c_device_shutdown(struct device *dev)
> > {
> > struct i2c_client *client = i2c_verify_client(dev);
> > @@ -488,6 +563,7 @@ struct bus_type i2c_bus_type = {
> > .probe = i2c_device_probe,
> > .remove = i2c_device_remove,
> > .shutdown = i2c_device_shutdown,
> > + .pm = &i2c_device_pm,
> > };
> > EXPORT_SYMBOL_GPL(i2c_bus_type);
> >
> > @@ -1351,6 +1427,11 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
> > goto out_reg;
> >
> > dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
> > + adap->bus_reg = devm_regulator_get(&adap->dev, "bus");
> > + if (IS_ERR(adap->bus_reg)) {
> > + res = PTR_ERR(adap->bus_reg);
> > + goto out_reg;
> > + }
> >
> > pm_runtime_no_callbacks(&adap->dev);
> > pm_suspend_ignore_children(&adap->dev, true);
> > diff --git a/include/linux/i2c.h b/include/linux/i2c.h
> > index d2f786706657..833b81a680da 100644
> > --- a/include/linux/i2c.h
> > +++ b/include/linux/i2c.h
> > @@ -15,6 +15,7 @@
> > #include <linux/device.h> /* for struct device */
> > #include <linux/sched.h> /* for completion */
> > #include <linux/mutex.h>
> > +#include <linux/regulator/consumer.h>
> > #include <linux/rtmutex.h>
> > #include <linux/irqdomain.h> /* for Host Notify IRQ */
> > #include <linux/of.h> /* for struct device_node */
> > @@ -330,6 +331,7 @@ struct i2c_client {
> > int init_irq; /* irq set at initialization */
> > int irq; /* irq issued by device */
> > struct list_head detected;
> > +
> > #if IS_ENABLED(CONFIG_I2C_SLAVE)
> > i2c_slave_cb_t slave_cb; /* callback for slave mode */
> > #endif
> > @@ -723,6 +725,7 @@ struct i2c_adapter {
> > const struct i2c_adapter_quirks *quirks;
> >
> > struct irq_domain *host_notify_domain;
> > + struct regulator *bus_reg;
>
> "bus_regulator" please. "reg" is ambigious with "register".
>
> And what Tomasz said, of course.
>
Thanks a lot.
I've added Rafael and linux-pm in another reply quoting the whole patch.
Best regards,
Tomasz
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH v10 4/4] i2c: core: support bus regulator controlling in adapter
2020-01-16 2:56 ` Bibby Hsieh
` (2 preceding siblings ...)
(?)
@ 2020-01-28 7:31 ` Tomasz Figa
2020-02-17 9:45 ` Tomasz Figa
-1 siblings, 1 reply; 25+ messages in thread
From: Tomasz Figa @ 2020-01-28 7:31 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Wolfram Sang, Bibby Hsieh, Bartosz Golaszewski, linux-i2c,
Nicolas Boichat, srv_heupstream, Rob Herring, Mark Rutland,
linux-devicetree, Linux PM
Hi Rafael,
On Thu, Jan 16, 2020 at 11:56 AM Bibby Hsieh <bibby.hsieh@mediatek.com> wrote:
>
> Although in the most platforms, the bus power of i2c
> are alway on, some platforms disable the i2c bus power
> in order to meet low power request.
>
> We get and enable bulk regulator in i2c adapter device.
>
> Signed-off-by: Bibby Hsieh <bibby.hsieh@mediatek.com>
> ---
> drivers/i2c/i2c-core-base.c | 81 +++++++++++++++++++++++++++++++++++++
> include/linux/i2c.h | 3 ++
> 2 files changed, 84 insertions(+)
>
I posted some comments in a separate reply [1] and Wolfram confirmed
that he's fine with the approach [2]. Would you have some time to take
a look from the PM point of view? Thanks.
[1] https://patchwork.ozlabs.org/patch/1223991/#2350984
[2] https://patchwork.ozlabs.org/patch/1223991/#2351032
Please let me know if you want me to CC you directly on any of those replies.
Best regards,
Tomasz
> diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
> index 9333c865d4a9..9b9e96b094ca 100644
> --- a/drivers/i2c/i2c-core-base.c
> +++ b/drivers/i2c/i2c-core-base.c
> @@ -306,6 +306,7 @@ static int i2c_smbus_host_notify_to_irq(const struct i2c_client *client)
> static int i2c_device_probe(struct device *dev)
> {
> struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> struct i2c_driver *driver;
> int status;
>
> @@ -371,6 +372,12 @@ static int i2c_device_probe(struct device *dev)
>
> dev_dbg(dev, "probe\n");
>
> + status = regulator_enable(adap->bus_reg);
> + if (status != 0) {
> + dev_err(&adap->dev, "Failed to enable power regulator\n");
> + goto err_clear_wakeup_irq;
> + }
> +
> status = of_clk_set_defaults(dev->of_node, false);
> if (status < 0)
> goto err_clear_wakeup_irq;
> @@ -407,6 +414,7 @@ static int i2c_device_probe(struct device *dev)
> static int i2c_device_remove(struct device *dev)
> {
> struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> struct i2c_driver *driver;
> int status = 0;
>
> @@ -420,6 +428,8 @@ static int i2c_device_remove(struct device *dev)
> }
>
> dev_pm_domain_detach(&client->dev, true);
> + if (!pm_runtime_status_suspended(&adap->dev))
> + regulator_disable(adap->bus_reg);
>
> dev_pm_clear_wake_irq(&client->dev);
> device_init_wakeup(&client->dev, false);
> @@ -431,6 +441,71 @@ static int i2c_device_remove(struct device *dev)
> return status;
> }
>
> +#ifdef CONFIG_PM_SLEEP
> +static int i2c_resume(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + if (pm_runtime_status_suspended(&adap->dev)) {
> + err = regulator_enable(adap->bus_reg);
> + if (err)
> + return err;
> + }
> +
> + return pm_generic_resume(dev);
> +}
> +
> +static int i2c_suspend(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + if (!pm_runtime_status_suspended(&adap->dev)) {
> + err = regulator_disable(adap->bus_reg);
> + if (err)
> + return err;
> + }
> +
> + return pm_generic_suspend(dev);
> +}
> +#endif
> +
> +#ifdef CONFIG_PM
> +static int i2c_runtime_resume(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + err = regulator_enable(adap->bus_reg);
> + if (err)
> + return err;
> +
> + return pm_generic_runtime_resume(dev);
> +}
> +
> +static int i2c_runtime_suspend(struct device *dev)
> +{
> + struct i2c_client *client = i2c_verify_client(dev);
> + struct i2c_adapter *adap = client->adapter;
> + int err;
> +
> + err = pm_generic_runtime_suspend(dev);
> + if (err)
> + return err;
> +
> + return regulator_disable(adap->bus_reg);
> +}
> +#endif
> +
> +static const struct dev_pm_ops i2c_device_pm = {
> + SET_SYSTEM_SLEEP_PM_OPS(i2c_suspend, i2c_resume)
> + SET_RUNTIME_PM_OPS(i2c_runtime_suspend, i2c_runtime_resume, NULL)
> +};
> +
> static void i2c_device_shutdown(struct device *dev)
> {
> struct i2c_client *client = i2c_verify_client(dev);
> @@ -488,6 +563,7 @@ struct bus_type i2c_bus_type = {
> .probe = i2c_device_probe,
> .remove = i2c_device_remove,
> .shutdown = i2c_device_shutdown,
> + .pm = &i2c_device_pm,
> };
> EXPORT_SYMBOL_GPL(i2c_bus_type);
>
> @@ -1351,6 +1427,11 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
> goto out_reg;
>
> dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
> + adap->bus_reg = devm_regulator_get(&adap->dev, "bus");
> + if (IS_ERR(adap->bus_reg)) {
> + res = PTR_ERR(adap->bus_reg);
> + goto out_reg;
> + }
>
> pm_runtime_no_callbacks(&adap->dev);
> pm_suspend_ignore_children(&adap->dev, true);
> diff --git a/include/linux/i2c.h b/include/linux/i2c.h
> index d2f786706657..833b81a680da 100644
> --- a/include/linux/i2c.h
> +++ b/include/linux/i2c.h
> @@ -15,6 +15,7 @@
> #include <linux/device.h> /* for struct device */
> #include <linux/sched.h> /* for completion */
> #include <linux/mutex.h>
> +#include <linux/regulator/consumer.h>
> #include <linux/rtmutex.h>
> #include <linux/irqdomain.h> /* for Host Notify IRQ */
> #include <linux/of.h> /* for struct device_node */
> @@ -330,6 +331,7 @@ struct i2c_client {
> int init_irq; /* irq set at initialization */
> int irq; /* irq issued by device */
> struct list_head detected;
> +
> #if IS_ENABLED(CONFIG_I2C_SLAVE)
> i2c_slave_cb_t slave_cb; /* callback for slave mode */
> #endif
> @@ -723,6 +725,7 @@ struct i2c_adapter {
> const struct i2c_adapter_quirks *quirks;
>
> struct irq_domain *host_notify_domain;
> + struct regulator *bus_reg;
> };
> #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev)
>
> --
> 2.18.0
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH v10 4/4] i2c: core: support bus regulator controlling in adapter
@ 2020-02-17 9:45 ` Tomasz Figa
0 siblings, 0 replies; 25+ messages in thread
From: Tomasz Figa @ 2020-02-17 9:45 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Wolfram Sang, Bibby Hsieh, Bartosz Golaszewski, linux-i2c,
Nicolas Boichat, srv_heupstream, Rob Herring, Mark Rutland,
linux-devicetree, Linux PM
Hi Rafael,
On Tue, Jan 28, 2020 at 4:31 PM Tomasz Figa <tfiga@chromium.org> wrote:
>
> Hi Rafael,
>
> On Thu, Jan 16, 2020 at 11:56 AM Bibby Hsieh <bibby.hsieh@mediatek.com> wrote:
> >
> > Although in the most platforms, the bus power of i2c
> > are alway on, some platforms disable the i2c bus power
> > in order to meet low power request.
> >
> > We get and enable bulk regulator in i2c adapter device.
> >
> > Signed-off-by: Bibby Hsieh <bibby.hsieh@mediatek.com>
> > ---
> > drivers/i2c/i2c-core-base.c | 81 +++++++++++++++++++++++++++++++++++++
> > include/linux/i2c.h | 3 ++
> > 2 files changed, 84 insertions(+)
> >
>
> I posted some comments in a separate reply [1] and Wolfram confirmed
> that he's fine with the approach [2]. Would you have some time to take
> a look from the PM point of view? Thanks.
>
> [1] https://patchwork.ozlabs.org/patch/1223991/#2350984
> [2] https://patchwork.ozlabs.org/patch/1223991/#2351032
>
> Please let me know if you want me to CC you directly on any of those replies.
Would you have a few minutes to take a look at this?
Thanks,
Tomasz
>
> Best regards,
> Tomasz
>
> > diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
> > index 9333c865d4a9..9b9e96b094ca 100644
> > --- a/drivers/i2c/i2c-core-base.c
> > +++ b/drivers/i2c/i2c-core-base.c
> > @@ -306,6 +306,7 @@ static int i2c_smbus_host_notify_to_irq(const struct i2c_client *client)
> > static int i2c_device_probe(struct device *dev)
> > {
> > struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > struct i2c_driver *driver;
> > int status;
> >
> > @@ -371,6 +372,12 @@ static int i2c_device_probe(struct device *dev)
> >
> > dev_dbg(dev, "probe\n");
> >
> > + status = regulator_enable(adap->bus_reg);
> > + if (status != 0) {
> > + dev_err(&adap->dev, "Failed to enable power regulator\n");
> > + goto err_clear_wakeup_irq;
> > + }
> > +
> > status = of_clk_set_defaults(dev->of_node, false);
> > if (status < 0)
> > goto err_clear_wakeup_irq;
> > @@ -407,6 +414,7 @@ static int i2c_device_probe(struct device *dev)
> > static int i2c_device_remove(struct device *dev)
> > {
> > struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > struct i2c_driver *driver;
> > int status = 0;
> >
> > @@ -420,6 +428,8 @@ static int i2c_device_remove(struct device *dev)
> > }
> >
> > dev_pm_domain_detach(&client->dev, true);
> > + if (!pm_runtime_status_suspended(&adap->dev))
> > + regulator_disable(adap->bus_reg);
> >
> > dev_pm_clear_wake_irq(&client->dev);
> > device_init_wakeup(&client->dev, false);
> > @@ -431,6 +441,71 @@ static int i2c_device_remove(struct device *dev)
> > return status;
> > }
> >
> > +#ifdef CONFIG_PM_SLEEP
> > +static int i2c_resume(struct device *dev)
> > +{
> > + struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > + int err;
> > +
> > + if (pm_runtime_status_suspended(&adap->dev)) {
> > + err = regulator_enable(adap->bus_reg);
> > + if (err)
> > + return err;
> > + }
> > +
> > + return pm_generic_resume(dev);
> > +}
> > +
> > +static int i2c_suspend(struct device *dev)
> > +{
> > + struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > + int err;
> > +
> > + if (!pm_runtime_status_suspended(&adap->dev)) {
> > + err = regulator_disable(adap->bus_reg);
> > + if (err)
> > + return err;
> > + }
> > +
> > + return pm_generic_suspend(dev);
> > +}
> > +#endif
> > +
> > +#ifdef CONFIG_PM
> > +static int i2c_runtime_resume(struct device *dev)
> > +{
> > + struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > + int err;
> > +
> > + err = regulator_enable(adap->bus_reg);
> > + if (err)
> > + return err;
> > +
> > + return pm_generic_runtime_resume(dev);
> > +}
> > +
> > +static int i2c_runtime_suspend(struct device *dev)
> > +{
> > + struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > + int err;
> > +
> > + err = pm_generic_runtime_suspend(dev);
> > + if (err)
> > + return err;
> > +
> > + return regulator_disable(adap->bus_reg);
> > +}
> > +#endif
> > +
> > +static const struct dev_pm_ops i2c_device_pm = {
> > + SET_SYSTEM_SLEEP_PM_OPS(i2c_suspend, i2c_resume)
> > + SET_RUNTIME_PM_OPS(i2c_runtime_suspend, i2c_runtime_resume, NULL)
> > +};
> > +
> > static void i2c_device_shutdown(struct device *dev)
> > {
> > struct i2c_client *client = i2c_verify_client(dev);
> > @@ -488,6 +563,7 @@ struct bus_type i2c_bus_type = {
> > .probe = i2c_device_probe,
> > .remove = i2c_device_remove,
> > .shutdown = i2c_device_shutdown,
> > + .pm = &i2c_device_pm,
> > };
> > EXPORT_SYMBOL_GPL(i2c_bus_type);
> >
> > @@ -1351,6 +1427,11 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
> > goto out_reg;
> >
> > dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
> > + adap->bus_reg = devm_regulator_get(&adap->dev, "bus");
> > + if (IS_ERR(adap->bus_reg)) {
> > + res = PTR_ERR(adap->bus_reg);
> > + goto out_reg;
> > + }
> >
> > pm_runtime_no_callbacks(&adap->dev);
> > pm_suspend_ignore_children(&adap->dev, true);
> > diff --git a/include/linux/i2c.h b/include/linux/i2c.h
> > index d2f786706657..833b81a680da 100644
> > --- a/include/linux/i2c.h
> > +++ b/include/linux/i2c.h
> > @@ -15,6 +15,7 @@
> > #include <linux/device.h> /* for struct device */
> > #include <linux/sched.h> /* for completion */
> > #include <linux/mutex.h>
> > +#include <linux/regulator/consumer.h>
> > #include <linux/rtmutex.h>
> > #include <linux/irqdomain.h> /* for Host Notify IRQ */
> > #include <linux/of.h> /* for struct device_node */
> > @@ -330,6 +331,7 @@ struct i2c_client {
> > int init_irq; /* irq set at initialization */
> > int irq; /* irq issued by device */
> > struct list_head detected;
> > +
> > #if IS_ENABLED(CONFIG_I2C_SLAVE)
> > i2c_slave_cb_t slave_cb; /* callback for slave mode */
> > #endif
> > @@ -723,6 +725,7 @@ struct i2c_adapter {
> > const struct i2c_adapter_quirks *quirks;
> >
> > struct irq_domain *host_notify_domain;
> > + struct regulator *bus_reg;
> > };
> > #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev)
> >
> > --
> > 2.18.0
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH v10 4/4] i2c: core: support bus regulator controlling in adapter
@ 2020-02-17 9:45 ` Tomasz Figa
0 siblings, 0 replies; 25+ messages in thread
From: Tomasz Figa @ 2020-02-17 9:45 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Wolfram Sang, Bibby Hsieh, Bartosz Golaszewski, linux-i2c,
Nicolas Boichat, srv_heupstream, Rob Herring, Mark Rutland,
linux-devicetree, Linux PM
Hi Rafael,
On Tue, Jan 28, 2020 at 4:31 PM Tomasz Figa <tfiga-F7+t8E8rja9g9hUCZPvPmw@public.gmane.org> wrote:
>
> Hi Rafael,
>
> On Thu, Jan 16, 2020 at 11:56 AM Bibby Hsieh <bibby.hsieh-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org> wrote:
> >
> > Although in the most platforms, the bus power of i2c
> > are alway on, some platforms disable the i2c bus power
> > in order to meet low power request.
> >
> > We get and enable bulk regulator in i2c adapter device.
> >
> > Signed-off-by: Bibby Hsieh <bibby.hsieh-NuS5LvNUpcJWk0Htik3J/w@public.gmane.org>
> > ---
> > drivers/i2c/i2c-core-base.c | 81 +++++++++++++++++++++++++++++++++++++
> > include/linux/i2c.h | 3 ++
> > 2 files changed, 84 insertions(+)
> >
>
> I posted some comments in a separate reply [1] and Wolfram confirmed
> that he's fine with the approach [2]. Would you have some time to take
> a look from the PM point of view? Thanks.
>
> [1] https://patchwork.ozlabs.org/patch/1223991/#2350984
> [2] https://patchwork.ozlabs.org/patch/1223991/#2351032
>
> Please let me know if you want me to CC you directly on any of those replies.
Would you have a few minutes to take a look at this?
Thanks,
Tomasz
>
> Best regards,
> Tomasz
>
> > diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
> > index 9333c865d4a9..9b9e96b094ca 100644
> > --- a/drivers/i2c/i2c-core-base.c
> > +++ b/drivers/i2c/i2c-core-base.c
> > @@ -306,6 +306,7 @@ static int i2c_smbus_host_notify_to_irq(const struct i2c_client *client)
> > static int i2c_device_probe(struct device *dev)
> > {
> > struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > struct i2c_driver *driver;
> > int status;
> >
> > @@ -371,6 +372,12 @@ static int i2c_device_probe(struct device *dev)
> >
> > dev_dbg(dev, "probe\n");
> >
> > + status = regulator_enable(adap->bus_reg);
> > + if (status != 0) {
> > + dev_err(&adap->dev, "Failed to enable power regulator\n");
> > + goto err_clear_wakeup_irq;
> > + }
> > +
> > status = of_clk_set_defaults(dev->of_node, false);
> > if (status < 0)
> > goto err_clear_wakeup_irq;
> > @@ -407,6 +414,7 @@ static int i2c_device_probe(struct device *dev)
> > static int i2c_device_remove(struct device *dev)
> > {
> > struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > struct i2c_driver *driver;
> > int status = 0;
> >
> > @@ -420,6 +428,8 @@ static int i2c_device_remove(struct device *dev)
> > }
> >
> > dev_pm_domain_detach(&client->dev, true);
> > + if (!pm_runtime_status_suspended(&adap->dev))
> > + regulator_disable(adap->bus_reg);
> >
> > dev_pm_clear_wake_irq(&client->dev);
> > device_init_wakeup(&client->dev, false);
> > @@ -431,6 +441,71 @@ static int i2c_device_remove(struct device *dev)
> > return status;
> > }
> >
> > +#ifdef CONFIG_PM_SLEEP
> > +static int i2c_resume(struct device *dev)
> > +{
> > + struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > + int err;
> > +
> > + if (pm_runtime_status_suspended(&adap->dev)) {
> > + err = regulator_enable(adap->bus_reg);
> > + if (err)
> > + return err;
> > + }
> > +
> > + return pm_generic_resume(dev);
> > +}
> > +
> > +static int i2c_suspend(struct device *dev)
> > +{
> > + struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > + int err;
> > +
> > + if (!pm_runtime_status_suspended(&adap->dev)) {
> > + err = regulator_disable(adap->bus_reg);
> > + if (err)
> > + return err;
> > + }
> > +
> > + return pm_generic_suspend(dev);
> > +}
> > +#endif
> > +
> > +#ifdef CONFIG_PM
> > +static int i2c_runtime_resume(struct device *dev)
> > +{
> > + struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > + int err;
> > +
> > + err = regulator_enable(adap->bus_reg);
> > + if (err)
> > + return err;
> > +
> > + return pm_generic_runtime_resume(dev);
> > +}
> > +
> > +static int i2c_runtime_suspend(struct device *dev)
> > +{
> > + struct i2c_client *client = i2c_verify_client(dev);
> > + struct i2c_adapter *adap = client->adapter;
> > + int err;
> > +
> > + err = pm_generic_runtime_suspend(dev);
> > + if (err)
> > + return err;
> > +
> > + return regulator_disable(adap->bus_reg);
> > +}
> > +#endif
> > +
> > +static const struct dev_pm_ops i2c_device_pm = {
> > + SET_SYSTEM_SLEEP_PM_OPS(i2c_suspend, i2c_resume)
> > + SET_RUNTIME_PM_OPS(i2c_runtime_suspend, i2c_runtime_resume, NULL)
> > +};
> > +
> > static void i2c_device_shutdown(struct device *dev)
> > {
> > struct i2c_client *client = i2c_verify_client(dev);
> > @@ -488,6 +563,7 @@ struct bus_type i2c_bus_type = {
> > .probe = i2c_device_probe,
> > .remove = i2c_device_remove,
> > .shutdown = i2c_device_shutdown,
> > + .pm = &i2c_device_pm,
> > };
> > EXPORT_SYMBOL_GPL(i2c_bus_type);
> >
> > @@ -1351,6 +1427,11 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
> > goto out_reg;
> >
> > dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
> > + adap->bus_reg = devm_regulator_get(&adap->dev, "bus");
> > + if (IS_ERR(adap->bus_reg)) {
> > + res = PTR_ERR(adap->bus_reg);
> > + goto out_reg;
> > + }
> >
> > pm_runtime_no_callbacks(&adap->dev);
> > pm_suspend_ignore_children(&adap->dev, true);
> > diff --git a/include/linux/i2c.h b/include/linux/i2c.h
> > index d2f786706657..833b81a680da 100644
> > --- a/include/linux/i2c.h
> > +++ b/include/linux/i2c.h
> > @@ -15,6 +15,7 @@
> > #include <linux/device.h> /* for struct device */
> > #include <linux/sched.h> /* for completion */
> > #include <linux/mutex.h>
> > +#include <linux/regulator/consumer.h>
> > #include <linux/rtmutex.h>
> > #include <linux/irqdomain.h> /* for Host Notify IRQ */
> > #include <linux/of.h> /* for struct device_node */
> > @@ -330,6 +331,7 @@ struct i2c_client {
> > int init_irq; /* irq set at initialization */
> > int irq; /* irq issued by device */
> > struct list_head detected;
> > +
> > #if IS_ENABLED(CONFIG_I2C_SLAVE)
> > i2c_slave_cb_t slave_cb; /* callback for slave mode */
> > #endif
> > @@ -723,6 +725,7 @@ struct i2c_adapter {
> > const struct i2c_adapter_quirks *quirks;
> >
> > struct irq_domain *host_notify_domain;
> > + struct regulator *bus_reg;
> > };
> > #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev)
> >
> > --
> > 2.18.0
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH v10 4/4] i2c: core: support bus regulator controlling in adapter
@ 2020-02-21 3:22 ` Bibby Hsieh
0 siblings, 0 replies; 25+ messages in thread
From: Bibby Hsieh @ 2020-02-21 3:22 UTC (permalink / raw)
To: rafael.j.wysocki
Cc: Tomasz Figa, Rafael J. Wysocki, Wolfram Sang,
Bartosz Golaszewski, linux-i2c, Nicolas Boichat, srv_heupstream,
Rob Herring, Mark Rutland, linux-devicetree, Linux PM
Hi, Rafael,
I'm Sorry to bother you.
I'm not sure if you receive our email...
So I re-sent this email to your another email.
Thanks.
Bibby
On Mon, 2020-02-17 at 18:45 +0900, Tomasz Figa wrote:
> Hi Rafael,
>
> On Tue, Jan 28, 2020 at 4:31 PM Tomasz Figa <tfiga@chromium.org> wrote:
> >
> > Hi Rafael,
> >
> > On Thu, Jan 16, 2020 at 11:56 AM Bibby Hsieh <bibby.hsieh@mediatek.com> wrote:
> > >
> > > Although in the most platforms, the bus power of i2c
> > > are alway on, some platforms disable the i2c bus power
> > > in order to meet low power request.
> > >
> > > We get and enable bulk regulator in i2c adapter device.
> > >
> > > Signed-off-by: Bibby Hsieh <bibby.hsieh@mediatek.com>
> > > ---
> > > drivers/i2c/i2c-core-base.c | 81 +++++++++++++++++++++++++++++++++++++
> > > include/linux/i2c.h | 3 ++
> > > 2 files changed, 84 insertions(+)
> > >
> >
> > I posted some comments in a separate reply [1] and Wolfram confirmed
> > that he's fine with the approach [2]. Would you have some time to take
> > a look from the PM point of view? Thanks.
> >
> > [1] https://patchwork.ozlabs.org/patch/1223991/#2350984
> > [2] https://patchwork.ozlabs.org/patch/1223991/#2351032
> >
> > Please let me know if you want me to CC you directly on any of those replies.
>
> Would you have a few minutes to take a look at this?
>
> Thanks,
> Tomasz
>
> >
> > Best regards,
> > Tomasz
> >
> > > diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
> > > index 9333c865d4a9..9b9e96b094ca 100644
> > > --- a/drivers/i2c/i2c-core-base.c
> > > +++ b/drivers/i2c/i2c-core-base.c
> > > @@ -306,6 +306,7 @@ static int i2c_smbus_host_notify_to_irq(const struct i2c_client *client)
> > > static int i2c_device_probe(struct device *dev)
> > > {
> > > struct i2c_client *client = i2c_verify_client(dev);
> > > + struct i2c_adapter *adap = client->adapter;
> > > struct i2c_driver *driver;
> > > int status;
> > >
> > > @@ -371,6 +372,12 @@ static int i2c_device_probe(struct device *dev)
> > >
> > > dev_dbg(dev, "probe\n");
> > >
> > > + status = regulator_enable(adap->bus_reg);
> > > + if (status != 0) {
> > > + dev_err(&adap->dev, "Failed to enable power regulator\n");
> > > + goto err_clear_wakeup_irq;
> > > + }
> > > +
> > > status = of_clk_set_defaults(dev->of_node, false);
> > > if (status < 0)
> > > goto err_clear_wakeup_irq;
> > > @@ -407,6 +414,7 @@ static int i2c_device_probe(struct device *dev)
> > > static int i2c_device_remove(struct device *dev)
> > > {
> > > struct i2c_client *client = i2c_verify_client(dev);
> > > + struct i2c_adapter *adap = client->adapter;
> > > struct i2c_driver *driver;
> > > int status = 0;
> > >
> > > @@ -420,6 +428,8 @@ static int i2c_device_remove(struct device *dev)
> > > }
> > >
> > > dev_pm_domain_detach(&client->dev, true);
> > > + if (!pm_runtime_status_suspended(&adap->dev))
> > > + regulator_disable(adap->bus_reg);
> > >
> > > dev_pm_clear_wake_irq(&client->dev);
> > > device_init_wakeup(&client->dev, false);
> > > @@ -431,6 +441,71 @@ static int i2c_device_remove(struct device *dev)
> > > return status;
> > > }
> > >
> > > +#ifdef CONFIG_PM_SLEEP
> > > +static int i2c_resume(struct device *dev)
> > > +{
> > > + struct i2c_client *client = i2c_verify_client(dev);
> > > + struct i2c_adapter *adap = client->adapter;
> > > + int err;
> > > +
> > > + if (pm_runtime_status_suspended(&adap->dev)) {
> > > + err = regulator_enable(adap->bus_reg);
> > > + if (err)
> > > + return err;
> > > + }
> > > +
> > > + return pm_generic_resume(dev);
> > > +}
> > > +
> > > +static int i2c_suspend(struct device *dev)
> > > +{
> > > + struct i2c_client *client = i2c_verify_client(dev);
> > > + struct i2c_adapter *adap = client->adapter;
> > > + int err;
> > > +
> > > + if (!pm_runtime_status_suspended(&adap->dev)) {
> > > + err = regulator_disable(adap->bus_reg);
> > > + if (err)
> > > + return err;
> > > + }
> > > +
> > > + return pm_generic_suspend(dev);
> > > +}
> > > +#endif
> > > +
> > > +#ifdef CONFIG_PM
> > > +static int i2c_runtime_resume(struct device *dev)
> > > +{
> > > + struct i2c_client *client = i2c_verify_client(dev);
> > > + struct i2c_adapter *adap = client->adapter;
> > > + int err;
> > > +
> > > + err = regulator_enable(adap->bus_reg);
> > > + if (err)
> > > + return err;
> > > +
> > > + return pm_generic_runtime_resume(dev);
> > > +}
> > > +
> > > +static int i2c_runtime_suspend(struct device *dev)
> > > +{
> > > + struct i2c_client *client = i2c_verify_client(dev);
> > > + struct i2c_adapter *adap = client->adapter;
> > > + int err;
> > > +
> > > + err = pm_generic_runtime_suspend(dev);
> > > + if (err)
> > > + return err;
> > > +
> > > + return regulator_disable(adap->bus_reg);
> > > +}
> > > +#endif
> > > +
> > > +static const struct dev_pm_ops i2c_device_pm = {
> > > + SET_SYSTEM_SLEEP_PM_OPS(i2c_suspend, i2c_resume)
> > > + SET_RUNTIME_PM_OPS(i2c_runtime_suspend, i2c_runtime_resume, NULL)
> > > +};
> > > +
> > > static void i2c_device_shutdown(struct device *dev)
> > > {
> > > struct i2c_client *client = i2c_verify_client(dev);
> > > @@ -488,6 +563,7 @@ struct bus_type i2c_bus_type = {
> > > .probe = i2c_device_probe,
> > > .remove = i2c_device_remove,
> > > .shutdown = i2c_device_shutdown,
> > > + .pm = &i2c_device_pm,
> > > };
> > > EXPORT_SYMBOL_GPL(i2c_bus_type);
> > >
> > > @@ -1351,6 +1427,11 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
> > > goto out_reg;
> > >
> > > dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
> > > + adap->bus_reg = devm_regulator_get(&adap->dev, "bus");
> > > + if (IS_ERR(adap->bus_reg)) {
> > > + res = PTR_ERR(adap->bus_reg);
> > > + goto out_reg;
> > > + }
> > >
> > > pm_runtime_no_callbacks(&adap->dev);
> > > pm_suspend_ignore_children(&adap->dev, true);
> > > diff --git a/include/linux/i2c.h b/include/linux/i2c.h
> > > index d2f786706657..833b81a680da 100644
> > > --- a/include/linux/i2c.h
> > > +++ b/include/linux/i2c.h
> > > @@ -15,6 +15,7 @@
> > > #include <linux/device.h> /* for struct device */
> > > #include <linux/sched.h> /* for completion */
> > > #include <linux/mutex.h>
> > > +#include <linux/regulator/consumer.h>
> > > #include <linux/rtmutex.h>
> > > #include <linux/irqdomain.h> /* for Host Notify IRQ */
> > > #include <linux/of.h> /* for struct device_node */
> > > @@ -330,6 +331,7 @@ struct i2c_client {
> > > int init_irq; /* irq set at initialization */
> > > int irq; /* irq issued by device */
> > > struct list_head detected;
> > > +
> > > #if IS_ENABLED(CONFIG_I2C_SLAVE)
> > > i2c_slave_cb_t slave_cb; /* callback for slave mode */
> > > #endif
> > > @@ -723,6 +725,7 @@ struct i2c_adapter {
> > > const struct i2c_adapter_quirks *quirks;
> > >
> > > struct irq_domain *host_notify_domain;
> > > + struct regulator *bus_reg;
> > > };
> > > #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev)
> > >
> > > --
> > > 2.18.0
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH v10 4/4] i2c: core: support bus regulator controlling in adapter
@ 2020-02-21 3:22 ` Bibby Hsieh
0 siblings, 0 replies; 25+ messages in thread
From: Bibby Hsieh @ 2020-02-21 3:22 UTC (permalink / raw)
To: rafael.j.wysocki-ral2JQCrhuEAvxtiuMwx3w
Cc: Tomasz Figa, Rafael J. Wysocki, Wolfram Sang,
Bartosz Golaszewski, linux-i2c, Nicolas Boichat, srv_heupstream,
Rob Herring, Mark Rutland, linux-devicetree, Linux PM
Hi, Rafael,
I'm Sorry to bother you.
I'm not sure if you receive our email...
So I re-sent this email to your another email.
Thanks.
Bibby
On Mon, 2020-02-17 at 18:45 +0900, Tomasz Figa wrote:
> Hi Rafael,
>
> On Tue, Jan 28, 2020 at 4:31 PM Tomasz Figa <tfiga@chromium.org> wrote:
> >
> > Hi Rafael,
> >
> > On Thu, Jan 16, 2020 at 11:56 AM Bibby Hsieh <bibby.hsieh@mediatek.com> wrote:
> > >
> > > Although in the most platforms, the bus power of i2c
> > > are alway on, some platforms disable the i2c bus power
> > > in order to meet low power request.
> > >
> > > We get and enable bulk regulator in i2c adapter device.
> > >
> > > Signed-off-by: Bibby Hsieh <bibby.hsieh@mediatek.com>
> > > ---
> > > drivers/i2c/i2c-core-base.c | 81 +++++++++++++++++++++++++++++++++++++
> > > include/linux/i2c.h | 3 ++
> > > 2 files changed, 84 insertions(+)
> > >
> >
> > I posted some comments in a separate reply [1] and Wolfram confirmed
> > that he's fine with the approach [2]. Would you have some time to take
> > a look from the PM point of view? Thanks.
> >
> > [1] https://patchwork.ozlabs.org/patch/1223991/#2350984
> > [2] https://patchwork.ozlabs.org/patch/1223991/#2351032
> >
> > Please let me know if you want me to CC you directly on any of those replies.
>
> Would you have a few minutes to take a look at this?
>
> Thanks,
> Tomasz
>
> >
> > Best regards,
> > Tomasz
> >
> > > diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
> > > index 9333c865d4a9..9b9e96b094ca 100644
> > > --- a/drivers/i2c/i2c-core-base.c
> > > +++ b/drivers/i2c/i2c-core-base.c
> > > @@ -306,6 +306,7 @@ static int i2c_smbus_host_notify_to_irq(const struct i2c_client *client)
> > > static int i2c_device_probe(struct device *dev)
> > > {
> > > struct i2c_client *client = i2c_verify_client(dev);
> > > + struct i2c_adapter *adap = client->adapter;
> > > struct i2c_driver *driver;
> > > int status;
> > >
> > > @@ -371,6 +372,12 @@ static int i2c_device_probe(struct device *dev)
> > >
> > > dev_dbg(dev, "probe\n");
> > >
> > > + status = regulator_enable(adap->bus_reg);
> > > + if (status != 0) {
> > > + dev_err(&adap->dev, "Failed to enable power regulator\n");
> > > + goto err_clear_wakeup_irq;
> > > + }
> > > +
> > > status = of_clk_set_defaults(dev->of_node, false);
> > > if (status < 0)
> > > goto err_clear_wakeup_irq;
> > > @@ -407,6 +414,7 @@ static int i2c_device_probe(struct device *dev)
> > > static int i2c_device_remove(struct device *dev)
> > > {
> > > struct i2c_client *client = i2c_verify_client(dev);
> > > + struct i2c_adapter *adap = client->adapter;
> > > struct i2c_driver *driver;
> > > int status = 0;
> > >
> > > @@ -420,6 +428,8 @@ static int i2c_device_remove(struct device *dev)
> > > }
> > >
> > > dev_pm_domain_detach(&client->dev, true);
> > > + if (!pm_runtime_status_suspended(&adap->dev))
> > > + regulator_disable(adap->bus_reg);
> > >
> > > dev_pm_clear_wake_irq(&client->dev);
> > > device_init_wakeup(&client->dev, false);
> > > @@ -431,6 +441,71 @@ static int i2c_device_remove(struct device *dev)
> > > return status;
> > > }
> > >
> > > +#ifdef CONFIG_PM_SLEEP
> > > +static int i2c_resume(struct device *dev)
> > > +{
> > > + struct i2c_client *client = i2c_verify_client(dev);
> > > + struct i2c_adapter *adap = client->adapter;
> > > + int err;
> > > +
> > > + if (pm_runtime_status_suspended(&adap->dev)) {
> > > + err = regulator_enable(adap->bus_reg);
> > > + if (err)
> > > + return err;
> > > + }
> > > +
> > > + return pm_generic_resume(dev);
> > > +}
> > > +
> > > +static int i2c_suspend(struct device *dev)
> > > +{
> > > + struct i2c_client *client = i2c_verify_client(dev);
> > > + struct i2c_adapter *adap = client->adapter;
> > > + int err;
> > > +
> > > + if (!pm_runtime_status_suspended(&adap->dev)) {
> > > + err = regulator_disable(adap->bus_reg);
> > > + if (err)
> > > + return err;
> > > + }
> > > +
> > > + return pm_generic_suspend(dev);
> > > +}
> > > +#endif
> > > +
> > > +#ifdef CONFIG_PM
> > > +static int i2c_runtime_resume(struct device *dev)
> > > +{
> > > + struct i2c_client *client = i2c_verify_client(dev);
> > > + struct i2c_adapter *adap = client->adapter;
> > > + int err;
> > > +
> > > + err = regulator_enable(adap->bus_reg);
> > > + if (err)
> > > + return err;
> > > +
> > > + return pm_generic_runtime_resume(dev);
> > > +}
> > > +
> > > +static int i2c_runtime_suspend(struct device *dev)
> > > +{
> > > + struct i2c_client *client = i2c_verify_client(dev);
> > > + struct i2c_adapter *adap = client->adapter;
> > > + int err;
> > > +
> > > + err = pm_generic_runtime_suspend(dev);
> > > + if (err)
> > > + return err;
> > > +
> > > + return regulator_disable(adap->bus_reg);
> > > +}
> > > +#endif
> > > +
> > > +static const struct dev_pm_ops i2c_device_pm = {
> > > + SET_SYSTEM_SLEEP_PM_OPS(i2c_suspend, i2c_resume)
> > > + SET_RUNTIME_PM_OPS(i2c_runtime_suspend, i2c_runtime_resume, NULL)
> > > +};
> > > +
> > > static void i2c_device_shutdown(struct device *dev)
> > > {
> > > struct i2c_client *client = i2c_verify_client(dev);
> > > @@ -488,6 +563,7 @@ struct bus_type i2c_bus_type = {
> > > .probe = i2c_device_probe,
> > > .remove = i2c_device_remove,
> > > .shutdown = i2c_device_shutdown,
> > > + .pm = &i2c_device_pm,
> > > };
> > > EXPORT_SYMBOL_GPL(i2c_bus_type);
> > >
> > > @@ -1351,6 +1427,11 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
> > > goto out_reg;
> > >
> > > dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
> > > + adap->bus_reg = devm_regulator_get(&adap->dev, "bus");
> > > + if (IS_ERR(adap->bus_reg)) {
> > > + res = PTR_ERR(adap->bus_reg);
> > > + goto out_reg;
> > > + }
> > >
> > > pm_runtime_no_callbacks(&adap->dev);
> > > pm_suspend_ignore_children(&adap->dev, true);
> > > diff --git a/include/linux/i2c.h b/include/linux/i2c.h
> > > index d2f786706657..833b81a680da 100644
> > > --- a/include/linux/i2c.h
> > > +++ b/include/linux/i2c.h
> > > @@ -15,6 +15,7 @@
> > > #include <linux/device.h> /* for struct device */
> > > #include <linux/sched.h> /* for completion */
> > > #include <linux/mutex.h>
> > > +#include <linux/regulator/consumer.h>
> > > #include <linux/rtmutex.h>
> > > #include <linux/irqdomain.h> /* for Host Notify IRQ */
> > > #include <linux/of.h> /* for struct device_node */
> > > @@ -330,6 +331,7 @@ struct i2c_client {
> > > int init_irq; /* irq set at initialization */
> > > int irq; /* irq issued by device */
> > > struct list_head detected;
> > > +
> > > #if IS_ENABLED(CONFIG_I2C_SLAVE)
> > > i2c_slave_cb_t slave_cb; /* callback for slave mode */
> > > #endif
> > > @@ -723,6 +725,7 @@ struct i2c_adapter {
> > > const struct i2c_adapter_quirks *quirks;
> > >
> > > struct irq_domain *host_notify_domain;
> > > + struct regulator *bus_reg;
> > > };
> > > #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev)
> > >
> > > --
> > > 2.18.0
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH v10 4/4] i2c: core: support bus regulator controlling in adapter
2020-02-21 3:22 ` Bibby Hsieh
(?)
@ 2020-02-24 22:28 ` Rafael J. Wysocki
-1 siblings, 0 replies; 25+ messages in thread
From: Rafael J. Wysocki @ 2020-02-24 22:28 UTC (permalink / raw)
To: Bibby Hsieh
Cc: Tomasz Figa, Rafael J. Wysocki, Wolfram Sang,
Bartosz Golaszewski, linux-i2c, Nicolas Boichat, srv_heupstream,
Rob Herring, Mark Rutland, linux-devicetree, Linux PM
On 2/21/2020 4:22 AM, Bibby Hsieh wrote:
> Hi, Rafael,
>
> I'm Sorry to bother you.
>
> I'm not sure if you receive our email...
> So I re-sent this email to your another email.
I actually have not realized that there was a question directly for me
in this thread.
> On Mon, 2020-02-17 at 18:45 +0900, Tomasz Figa wrote:
>> Hi Rafael,
>>
>> On Tue, Jan 28, 2020 at 4:31 PM Tomasz Figa <tfiga@chromium.org> wrote:
>>> Hi Rafael,
>>>
>>> On Thu, Jan 16, 2020 at 11:56 AM Bibby Hsieh <bibby.hsieh@mediatek.com> wrote:
>>>> Although in the most platforms, the bus power of i2c
>>>> are alway on, some platforms disable the i2c bus power
>>>> in order to meet low power request.
>>>>
>>>> We get and enable bulk regulator in i2c adapter device.
>>>>
>>>> Signed-off-by: Bibby Hsieh <bibby.hsieh@mediatek.com>
>>>> ---
>>>> drivers/i2c/i2c-core-base.c | 81 +++++++++++++++++++++++++++++++++++++
>>>> include/linux/i2c.h | 3 ++
>>>> 2 files changed, 84 insertions(+)
>>>>
>>> I posted some comments in a separate reply [1] and Wolfram confirmed
>>> that he's fine with the approach [2]. Would you have some time to take
>>> a look from the PM point of view? Thanks.
>>>
>>> [1] https://patchwork.ozlabs.org/patch/1223991/#2350984
>>> [2] https://patchwork.ozlabs.org/patch/1223991/#2351032
>>>
>>> Please let me know if you want me to CC you directly on any of those replies.
>> Would you have a few minutes to take a look at this?
>>
>> Thanks,
>> Tomasz
>>
>>> Best regards,
>>> Tomasz
>>>
>>>> diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c
>>>> index 9333c865d4a9..9b9e96b094ca 100644
>>>> --- a/drivers/i2c/i2c-core-base.c
>>>> +++ b/drivers/i2c/i2c-core-base.c
>>>> @@ -306,6 +306,7 @@ static int i2c_smbus_host_notify_to_irq(const struct i2c_client *client)
>>>> static int i2c_device_probe(struct device *dev)
>>>> {
>>>> struct i2c_client *client = i2c_verify_client(dev);
>>>> + struct i2c_adapter *adap = client->adapter;
>>>> struct i2c_driver *driver;
>>>> int status;
>>>>
>>>> @@ -371,6 +372,12 @@ static int i2c_device_probe(struct device *dev)
>>>>
>>>> dev_dbg(dev, "probe\n");
>>>>
>>>> + status = regulator_enable(adap->bus_reg);
>>>> + if (status != 0) {
>>>> + dev_err(&adap->dev, "Failed to enable power regulator\n");
>>>> + goto err_clear_wakeup_irq;
>>>> + }
>>>> +
>>>> status = of_clk_set_defaults(dev->of_node, false);
>>>> if (status < 0)
>>>> goto err_clear_wakeup_irq;
>>>> @@ -407,6 +414,7 @@ static int i2c_device_probe(struct device *dev)
>>>> static int i2c_device_remove(struct device *dev)
>>>> {
>>>> struct i2c_client *client = i2c_verify_client(dev);
>>>> + struct i2c_adapter *adap = client->adapter;
>>>> struct i2c_driver *driver;
>>>> int status = 0;
>>>>
>>>> @@ -420,6 +428,8 @@ static int i2c_device_remove(struct device *dev)
>>>> }
>>>>
>>>> dev_pm_domain_detach(&client->dev, true);
>>>> + if (!pm_runtime_status_suspended(&adap->dev))
>>>> + regulator_disable(adap->bus_reg);
>>>>
>>>> dev_pm_clear_wake_irq(&client->dev);
>>>> device_init_wakeup(&client->dev, false);
>>>> @@ -431,6 +441,71 @@ static int i2c_device_remove(struct device *dev)
>>>> return status;
>>>> }
>>>>
>>>> +#ifdef CONFIG_PM_SLEEP
>>>> +static int i2c_resume(struct device *dev)
>>>> +{
>>>> + struct i2c_client *client = i2c_verify_client(dev);
>>>> + struct i2c_adapter *adap = client->adapter;
>>>> + int err;
>>>> +
>>>> + if (pm_runtime_status_suspended(&adap->dev)) {
In general, this is racy, because the RPM status of the device may
change while it is running unless there are specific reasons why that
cannot happen.
It generally is better to do such checks at the "early resume" and
(analogously) "late suspend" stages when RPM is disabled.
>>>> + err = regulator_enable(adap->bus_reg);
>>>> + if (err)
>>>> + return err;
>>>> + }
>>>> +
>>>> + return pm_generic_resume(dev);
>>>> +}
>>>> +
>>>> +static int i2c_suspend(struct device *dev)
>>>> +{
>>>> + struct i2c_client *client = i2c_verify_client(dev);
>>>> + struct i2c_adapter *adap = client->adapter;
>>>> + int err;
>>>> +
>>>> + if (!pm_runtime_status_suspended(&adap->dev)) {
>>>> + err = regulator_disable(adap->bus_reg);
>>>> + if (err)
>>>> + return err;
>>>> + }
>>>> +
>>>> + return pm_generic_suspend(dev);
>>>> +}
>>>> +#endif
>>>> +
>>>> +#ifdef CONFIG_PM
>>>> +static int i2c_runtime_resume(struct device *dev)
>>>> +{
>>>> + struct i2c_client *client = i2c_verify_client(dev);
>>>> + struct i2c_adapter *adap = client->adapter;
>>>> + int err;
>>>> +
>>>> + err = regulator_enable(adap->bus_reg);
>>>> + if (err)
>>>> + return err;
>>>> +
>>>> + return pm_generic_runtime_resume(dev);
>>>> +}
>>>> +
>>>> +static int i2c_runtime_suspend(struct device *dev)
>>>> +{
>>>> + struct i2c_client *client = i2c_verify_client(dev);
>>>> + struct i2c_adapter *adap = client->adapter;
>>>> + int err;
>>>> +
>>>> + err = pm_generic_runtime_suspend(dev);
>>>> + if (err)
>>>> + return err;
>>>> +
>>>> + return regulator_disable(adap->bus_reg);
>>>> +}
>>>> +#endif
>>>> +
>>>> +static const struct dev_pm_ops i2c_device_pm = {
>>>> + SET_SYSTEM_SLEEP_PM_OPS(i2c_suspend, i2c_resume)
>>>> + SET_RUNTIME_PM_OPS(i2c_runtime_suspend, i2c_runtime_resume, NULL)
>>>> +};
>>>> +
>>>> static void i2c_device_shutdown(struct device *dev)
>>>> {
>>>> struct i2c_client *client = i2c_verify_client(dev);
>>>> @@ -488,6 +563,7 @@ struct bus_type i2c_bus_type = {
>>>> .probe = i2c_device_probe,
>>>> .remove = i2c_device_remove,
>>>> .shutdown = i2c_device_shutdown,
>>>> + .pm = &i2c_device_pm,
>>>> };
>>>> EXPORT_SYMBOL_GPL(i2c_bus_type);
>>>>
>>>> @@ -1351,6 +1427,11 @@ static int i2c_register_adapter(struct i2c_adapter *adap)
>>>> goto out_reg;
>>>>
>>>> dev_dbg(&adap->dev, "adapter [%s] registered\n", adap->name);
>>>> + adap->bus_reg = devm_regulator_get(&adap->dev, "bus");
>>>> + if (IS_ERR(adap->bus_reg)) {
>>>> + res = PTR_ERR(adap->bus_reg);
>>>> + goto out_reg;
>>>> + }
>>>>
>>>> pm_runtime_no_callbacks(&adap->dev);
>>>> pm_suspend_ignore_children(&adap->dev, true);
>>>> diff --git a/include/linux/i2c.h b/include/linux/i2c.h
>>>> index d2f786706657..833b81a680da 100644
>>>> --- a/include/linux/i2c.h
>>>> +++ b/include/linux/i2c.h
>>>> @@ -15,6 +15,7 @@
>>>> #include <linux/device.h> /* for struct device */
>>>> #include <linux/sched.h> /* for completion */
>>>> #include <linux/mutex.h>
>>>> +#include <linux/regulator/consumer.h>
>>>> #include <linux/rtmutex.h>
>>>> #include <linux/irqdomain.h> /* for Host Notify IRQ */
>>>> #include <linux/of.h> /* for struct device_node */
>>>> @@ -330,6 +331,7 @@ struct i2c_client {
>>>> int init_irq; /* irq set at initialization */
>>>> int irq; /* irq issued by device */
>>>> struct list_head detected;
>>>> +
>>>> #if IS_ENABLED(CONFIG_I2C_SLAVE)
>>>> i2c_slave_cb_t slave_cb; /* callback for slave mode */
>>>> #endif
>>>> @@ -723,6 +725,7 @@ struct i2c_adapter {
>>>> const struct i2c_adapter_quirks *quirks;
>>>>
>>>> struct irq_domain *host_notify_domain;
>>>> + struct regulator *bus_reg;
>>>> };
>>>> #define to_i2c_adapter(d) container_of(d, struct i2c_adapter, dev)
>>>>
>>>> --
>>>> 2.18.0
^ permalink raw reply [flat|nested] 25+ messages in thread