mfd: tps6586x: register restart handler
Subsystems (2)
v2 cover mfd: tps6586x: register restart handler
From: Benjamin Bara <[email protected]>
Hi!
v1: https://lore.kernel.org/all/[email protected]/system_state: https://lore.kernel.org/all/[email protected]/
v2:
- use devm-based restart handler
- convert the existing power_off handler to a devm-based handler
- handle system_state in extra PATCH
Best regards,
Benjamin
Benjamin Bara (2):
mfd: tps6586x: use devm-based power off handler
mfd: tps6586x: register restart handler
drivers/mfd/tps6586x.c | 47 +++++++++++++++++++++++++++++++++++------- 1 file changed, 39 insertions(+), 8 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 1/2 mfd: tps6586x: use devm-based power off handler
From: Benjamin Bara <[email protected]>
Convert the power off handler to a devm-based power off handler.
--- drivers/mfd/tps6586x.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-)
drivers/mfd/tps6586x.c +16 -8
@@ -22,6 +22,7 @@#include <linux/err.h> #include <linux/i2c.h> #include <linux/platform_device.h> +#include <linux/reboot.h> #include <linux/regmap.h> #include <linux/of.h>
@@ -457,13 +458,16 @@ static const struct regmap_config tps6586x_regmap_config = { .cache_type = REGCACHE_RBTREE, }; -static struct device *tps6586x_dev; -static void tps6586x_power_off (void ) +static int tps6586x_power_off_handler (struct sys_off_data *data) { -if (tps6586x_clr_bits (tps6586x_dev,TPS6586X_SUPPLYENE ,EXITSLREQ_BIT )) -return ; +int ret; +struct device *tps6586x_dev = (struct device *)data->cb_data; + + ret =tps6586x_clr_bits (tps6586x_dev,TPS6586X_SUPPLYENE ,EXITSLREQ_BIT ); +if (ret) +return ret; -tps6586x_set_bits (tps6586x_dev,TPS6586X_SUPPLYENE ,SLEEP_MODE_BIT ); +return tps6586x_set_bits (tps6586x_dev,TPS6586X_SUPPLYENE ,SLEEP_MODE_BIT ); }static void tps6586x_print_version (struct i2c_client *client,int version)
@@ -559,9 +563,13 @@ static int tps6586x_i2c_probe(struct i2c_client *client) goto err_add_devs; } -if (pdata->pm_off && !pm_power_off) { - tps6586x_dev = &client->dev; - pm_power_off = tps6586x_power_off; +if (pdata->pm_off) { + ret =devm_register_power_off_handler (&client->dev, &tps6586x_power_off_handler, + &client->dev); +if (ret) { +dev_err (&client->dev,"register power off handler failed: %d\n" , ret); + goto err_add_devs; + } }return 0 ;
Signature · 1 line
2.34.1
Re: [PATCH v2 1/2] mfd: tps6586x: use devm-based power off handler
drivers/mfd/tps6586x.c static const struct regmap_config tps6586x_regmap_config = { · line 463
Quoted 5 lines · Benjamin Bara
drivers/mfd/tps6586x.c +2
-2+static int tps6586x_power_off_handler (struct sys_off_data *data) { -if (tps6586x_clr_bits (tps6586x_dev,TPS6586X_SUPPLYENE ,EXITSLREQ_BIT )) -return ; +int ret;
Nit: "int ret" should be put after "struct tps6586x_dev" to adhere canonical kernel coding style
drivers/mfd/tps6586x.c static const struct regmap_config tps6586x_regmap_config = { · line 464
Quoted 1 line
drivers/mfd/tps6586x.c +1
-0+struct device *tps6586x_dev = (struct device *)data->cb_data;
No need for casting of the void* type
Signature · 2 lines
Best regards, Dmitry
PATCH v2 2/2 mfd: tps6586x: register restart handler
In reply to Benjamin BaraFrom: Benjamin Bara <[email protected]>
The TPS658629-Q1 (unfortunately the only TPS6586x with public data sheet) provides a SOFT RST bit in the SUPPLYENE reg to request a (cold) reboot.
Use it to implement and register a restart handler.
Tested on a TPS658640.
--- drivers/mfd/tps6586x.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+)
drivers/mfd/tps6586x.c +23 -0
@@ -15,6 +15,7 @@#include <linux/interrupt.h> #include <linux/irq.h> #include <linux/irqdomain.h> +#include <linux/irqflags.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/mutex.h>
@@ -30,6 +31,7 @@#include <linux/mfd/tps6586x.h> #define TPS6586X_SUPPLYENE 0x14 +#define SOFT_RST_BIT BIT(0)#define EXITSLREQ_BIT BIT(1)#define SLEEP_MODE_BIT BIT(3)
@@ -470,6 +472,20 @@ static int tps6586x_power_off_handler(struct sys_off_data *data)return tps6586x_set_bits (tps6586x_dev,TPS6586X_SUPPLYENE ,SLEEP_MODE_BIT ); } +static int tps6586x_restart_handler (struct sys_off_data *data) +{ +unsigned long flags; +struct device *tps6586x_dev = (struct device *)data->cb_data; + +/* bring pmic into HARD REBOOT state, enforce atomic i2c xfer */ +local_irq_save (flags); +tps6586x_set_bits (tps6586x_dev,TPS6586X_SUPPLYENE ,SOFT_RST_BIT ); +local_irq_restore (flags); + +mdelay (500 ); +return 0 ; +} +static void tps6586x_print_version (struct i2c_client *client,int version) {const char *name;
@@ -570,6 +586,13 @@ static int tps6586x_i2c_probe(struct i2c_client *client)dev_err (&client->dev,"register power off handler failed: %d\n" , ret); goto err_add_devs; } + + ret =devm_register_restart_handler (&client->dev, &tps6586x_restart_handler, + &client->dev); +if (ret) { +dev_err (&client->dev,"register restart handler failed: %d\n" , ret); + goto err_add_devs; + } }return 0 ;
Signature · 1 line
2.34.1
drivers/mfd/tps6586x.c static int tps6586x_power_off_handler(struct sys_off_data *data) · line 483
Quoted 9 lines · Benjamin Bara
drivers/mfd/tps6586x.c +9
-0+static int tps6586x_restart_handler (struct sys_off_data *data) +{ +unsigned long flags; +struct device *tps6586x_dev = (struct device *)data->cb_data; + +/* bring pmic into HARD REBOOT state, enforce atomic i2c xfer */ +local_irq_save (flags); +tps6586x_set_bits (tps6586x_dev,TPS6586X_SUPPLYENE ,SOFT_RST_BIT ); +local_irq_restore (flags);
Please change i2c_in_atomic_xfer_mode() to use preemptible() instead of irqs_disabled() and drop the local_irq_save/restore.
Signature · 2 lines
Best regards, Dmitry
Jon Hunter
maintainerQuoted 6 lines · Benjamin Bara
From: Benjamin Bara <[email protected]>
The TPS658629-Q1 (unfortunately the only TPS6586x with public data sheet) provides a SOFT RST bit in the SUPPLYENE reg to request a (cold) reboot.
Use it to implement and register a restart handler.
This does not explain why this is needed and/or why we are adding this.
Jon
Signature · 1 line
nvpublic