i3c: master: svc: some bug fixes and add runtime pm support
Subsystems (2)
v2 cover i3c: master: svc: some bug fixes and add runtime pm support
Hi,
V2 changes:
- align the parameters of the function in the second patch
- add a new patch to support runtime PM.
Clark Wang (5):
i3c: master: svc: move module reset behind clk enable
i3c: master: svc: fix atomic issue
i3c: master: svc: add support for slave to stop returning data
i3c: master: svc: set ODSTOP to let I2C device see the STOP signal
i3c: master: svc: add runtime pm support
drivers/i3c/master/svc-i3c-master.c | 234 ++++++++++++++++++++++------ 1 file changed, 184 insertions(+), 50 deletions(-)
Signature · 7 lines
2.25.1 -- linux-i3c mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-i3c
PATCH v2 1/5 i3c: master: svc: move module reset behind clk enable
Reset I3C module will R/W its regs, so enable its clocks first.
---
V2: No change.
--- drivers/i3c/master/svc-i3c-master.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/i3c/master/svc-i3c-master.c +2 -2
@@ -1381,8 +1381,6 @@ static int svc_i3c_master_probe(struct platform_device *pdev) master->dev = dev; -svc_i3c_master_reset (master); - ret =clk_prepare_enable (master->pclk);if (ret)return ret;
@@ -1419,6 +1417,8 @@ static int svc_i3c_master_probe(struct platform_device *pdev)platform_set_drvdata (pdev, master); +svc_i3c_master_reset (master); +/* Register the master */ ret =i3c_master_register (&master->base, &pdev->dev, &svc_i3c_master_ops, false);
Signature · 7 lines
2.25.1 -- linux-i3c mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-i3c
PATCH v2 2/5 i3c: master: svc: fix atomic issue
In reply to Clark Wangdo_daa_locked() function is in a spin lock environment, use readl_poll_timeout_atomic() to replace the origin readl_poll_timeout().
---
V2: align the parameters of the function.
--- drivers/i3c/master/svc-i3c-master.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
drivers/i3c/master/svc-i3c-master.c +15 -11
@@ -656,8 +656,10 @@ static int svc_i3c_master_readb(struct svc_i3c_master *master, u8 *dst,u32 reg;for (i =0 ; i < len; i++) { - ret =readl_poll_timeout (master->regs +SVC_I3C_MSTATUS , reg, -SVC_I3C_MSTATUS_RXPEND (reg),0 ,1000 ); + ret =readl_poll_timeout_atomic (master->regs +SVC_I3C_MSTATUS , + reg, +SVC_I3C_MSTATUS_RXPEND (reg), +0 ,1000 );if (ret)return ret;
@@ -687,10 +689,11 @@ static int svc_i3c_master_do_daa_locked(struct svc_i3c_master *master,* Either one slave will send its ID, or the assignment process * is done. */ - ret =readl_poll_timeout (master->regs +SVC_I3C_MSTATUS , reg, -SVC_I3C_MSTATUS_RXPEND (reg) | -SVC_I3C_MSTATUS_MCTRLDONE (reg), -1 ,1000 ); + ret =readl_poll_timeout_atomic (master->regs +SVC_I3C_MSTATUS , + reg, +SVC_I3C_MSTATUS_RXPEND (reg) | +SVC_I3C_MSTATUS_MCTRLDONE (reg), +1 ,1000 );if (ret)return ret;
@@ -744,11 +747,12 @@ static int svc_i3c_master_do_daa_locked(struct svc_i3c_master *master, }/* Wait for the slave to be ready to receive its address */ - ret =readl_poll_timeout (master->regs +SVC_I3C_MSTATUS , reg, -SVC_I3C_MSTATUS_MCTRLDONE (reg) && -SVC_I3C_MSTATUS_STATE_DAA (reg) && -SVC_I3C_MSTATUS_BETWEEN (reg), -0 ,1000 ); + ret =readl_poll_timeout_atomic (master->regs +SVC_I3C_MSTATUS , + reg, +SVC_I3C_MSTATUS_MCTRLDONE (reg) && +SVC_I3C_MSTATUS_STATE_DAA (reg) && +SVC_I3C_MSTATUS_BETWEEN (reg), +0 ,1000 );if (ret)return ret;
Signature · 7 lines
2.25.1 -- linux-i3c mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-i3c
PATCH v2 3/5 i3c: master: svc: add support for slave to stop returning data
In reply to Clark WangWhen i3c controller reads data from slave device, slave device can stop returning data with an ACK after any byte.
Add this support for svc i3c controller. Otherwise, it will go TIMEOUT error path when the slave device ends the read operation early.
---
V2: No change.
--- drivers/i3c/master/svc-i3c-master.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-)
drivers/i3c/master/svc-i3c-master.c +20 -8
@@ -869,7 +869,7 @@ static int svc_i3c_master_read(struct svc_i3c_master *master, u8 *in, unsigned int len) {int offset =0 , i, ret; -u32 mdctrl; +u32 mdctrl, mstatus;while (offset < len) {unsigned int count;
@@ -878,8 +878,15 @@ static int svc_i3c_master_read(struct svc_i3c_master *master, mdctrl, !(mdctrl &SVC_I3C_MDATACTRL_RXEMPTY ), 0, 1000); -if (ret) -return ret; +if (ret) { + ret =readl_poll_timeout (master->regs +SVC_I3C_MSTATUS , + mstatus,SVC_I3C_MSTATUS_COMPLETE (mstatus), +0 ,1000 ); +if (ret) +return ret; +else +return offset; + } count =SVC_I3C_MDATACTRL_RXCOUNT (mdctrl);for (i =0 ; i < count; i++)
@@ -888,7 +895,7 @@ static int svc_i3c_master_read(struct svc_i3c_master *master, offset += count; } -return 0 ; +return offset; } static int svc_i3c_master_write(struct svc_i3c_master *master,
@@ -921,7 +928,7 @@ static int svc_i3c_master_write(struct svc_i3c_master *master,static int svc_i3c_master_xfer (struct svc_i3c_master *master,bool rnw,unsigned int xfer_type,u8 addr,u8 *in,const u8 *out,unsigned int xfer_len, -unsigned int read_len,bool continued) +unsigned int *read_len,bool continued) {u32 reg;int ret;
@@ -931,7 +938,7 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master,SVC_I3C_MCTRL_IBIRESP_NACK |SVC_I3C_MCTRL_DIR (rnw) |SVC_I3C_MCTRL_ADDR (addr) | -SVC_I3C_MCTRL_RDTERM (read_len), +SVC_I3C_MCTRL_RDTERM (*read_len), master->regs + SVC_I3C_MCTRL); ret = readl_poll_timeout(master->regs + SVC_I3C_MSTATUS, reg,
@@ -943,8 +950,10 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master, ret =svc_i3c_master_read (master, in, xfer_len); else ret =svc_i3c_master_write (master, out, xfer_len); -if (ret) +if (ret <0 ) goto emit_stop; +if (rnw) + *read_len = ret; ret =readl_poll_timeout (master->regs +SVC_I3C_MSTATUS , reg,SVC_I3C_MSTATUS_COMPLETE (reg),0 ,1000 );
@@ -1016,7 +1025,7 @@ static void svc_i3c_master_start_xfer_locked(struct svc_i3c_master *master) ret =svc_i3c_master_xfer (master, cmd->rnw, xfer->type, cmd->addr, cmd->in, cmd->out, - cmd->len, cmd->read_len, + cmd->len, &cmd->read_len, cmd->continued);if (ret)break ;
@@ -1145,6 +1154,9 @@ static int svc_i3c_master_send_direct_ccc_cmd(struct svc_i3c_master *master,if (!wait_for_completion_timeout (&xfer->comp,msecs_to_jiffies (1000 )))svc_i3c_master_dequeue_xfer (master, xfer); +if (cmd->read_len != xfer_len) + ccc->dests[0 ].payload.len = cmd->read_len; + ret = xfer->ret;svc_i3c_master_free_xfer (xfer);
Signature · 7 lines
2.25.1 -- linux-i3c mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-i3c
PATCH v2 4/5 i3c: master: svc: set ODSTOP to let I2C device see the STOP signal
In reply to Clark WangIf using I2C/I3C mixed mode, need to set ODSTOP. Otherwise, the I2C devices cannot see the stop signal. It may cause message sending errors.
---
V2: No change.
--- drivers/i3c/master/svc-i3c-master.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/i3c/master/svc-i3c-master.c +5 -2
@@ -449,7 +449,7 @@ static int svc_i3c_master_bus_init(struct i3c_master_controller *m)struct i3c_device_info info = {};unsigned long fclk_rate, fclk_period_ns;unsigned int high_period_ns, od_low_period_ns; -u32 ppbaud, pplow, odhpp, odbaud, i2cbaud, reg; +u32 ppbaud, pplow, odhpp, odbaud, odstop, i2cbaud, reg;int ret;/* Timings derivation */
@@ -479,6 +479,7 @@ static int svc_i3c_master_bus_init(struct i3c_master_controller *m)switch (bus->mode) {case I3C_BUS_MODE_PURE : i2cbaud =0 ; + odstop =0 ;break ;case I3C_BUS_MODE_MIXED_FAST :case I3C_BUS_MODE_MIXED_LIMITED :
@@ -487,6 +488,7 @@ static int svc_i3c_master_bus_init(struct i3c_master_controller *m)* between the high and low period does not really matter. */ i2cbaud =DIV_ROUND_UP (1000 , od_low_period_ns) -2 ; + odstop =1 ;break ;case I3C_BUS_MODE_MIXED_SLOW :/*
@@ -494,6 +496,7 @@ static int svc_i3c_master_bus_init(struct i3c_master_controller *m)* constraints as the FM+ mode. */ i2cbaud =DIV_ROUND_UP (2500 , od_low_period_ns) -2 ; + odstop =1 ;break ;default :return -EINVAL ;
@@ -502,7 +505,7 @@ static int svc_i3c_master_bus_init(struct i3c_master_controller *m) reg =SVC_I3C_MCONFIG_MASTER_EN |SVC_I3C_MCONFIG_DISTO (0 ) |SVC_I3C_MCONFIG_HKEEP (0 ) | -SVC_I3C_MCONFIG_ODSTOP (0 ) | +SVC_I3C_MCONFIG_ODSTOP (odstop) |SVC_I3C_MCONFIG_PPBAUD (ppbaud) |SVC_I3C_MCONFIG_PPLOW (pplow) | SVC_I3C_MCONFIG_ODBAUD(odbaud) |
Signature · 7 lines
2.25.1 -- linux-i3c mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-i3c
PATCH v2 5/5 i3c: master: svc: add runtime pm support
In reply to Clark WangAdd runtime pm support to dynamically manage the clock.
---
V2: New patch in V2.
--- drivers/i3c/master/svc-i3c-master.c | 169 +++++++++++++++++++++++----- 1 file changed, 142 insertions(+), 27 deletions(-)
drivers/i3c/master/svc-i3c-master.c +142 -27
@@ -17,7 +17,9 @@#include <linux/list.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/pinctrl/consumer.h> #include <linux/platform_device.h> +#include <linux/pm_runtime.h> /* Master Mode Registers */ #define SVC_I3C_MCONFIG 0x000
@@ -119,6 +121,7 @@#define SVC_MDYNADDR_ADDR (x) FIELD_PREP(GENMASK(7, 1), (x))#define SVC_I3C_MAX_DEVS 32 +#define SVC_I3C_PM_TIMEOUT_MS 1000/* This parameter depends on the implementation and may be tuned */ #define SVC_I3C_FIFO_SIZE 16
@@ -452,10 +455,18 @@ static int svc_i3c_master_bus_init(struct i3c_master_controller *m)u32 ppbaud, pplow, odhpp, odbaud, odstop, i2cbaud, reg;int ret; + ret =pm_runtime_resume_and_get (master->dev); +if (ret <0 ) { +dev_err (master->dev,"<%s> Cannot get runtime PM.\n" , __func__); +return ret; + } +/* Timings derivation */ fclk_rate =clk_get_rate (master->fclk); -if (!fclk_rate) -return -EINVAL ; +if (!fclk_rate) { + ret = -EINVAL ; + goto rpm_out; + } fclk_period_ns =DIV_ROUND_UP (1000000000 , fclk_rate);
@@ -499,7 +510,7 @@ static int svc_i3c_master_bus_init(struct i3c_master_controller *m) odstop =1 ;break ;default : -return -EINVAL ; + goto rpm_out; } reg = SVC_I3C_MCONFIG_MASTER_EN |
@@ -517,7 +528,7 @@ static int svc_i3c_master_bus_init(struct i3c_master_controller *m)/* Master core's registration */ ret =i3c_master_get_free_addr (m,0 );if (ret <0 ) -return ret; + goto rpm_out; info.dyn_addr = ret;
@@ -526,21 +537,35 @@ static int svc_i3c_master_bus_init(struct i3c_master_controller *m) ret =i3c_master_set_info (&master->base, &info);if (ret) -return ret; + goto rpm_out;svc_i3c_master_enable_interrupts (master,SVC_I3C_MINT_SLVSTART ); -return 0 ; +rpm_out: +pm_runtime_mark_last_busy (master->dev); +pm_runtime_put_autosuspend (master->dev); + +return ret; }static void svc_i3c_master_bus_cleanup (struct i3c_master_controller *m) {struct svc_i3c_master *master =to_svc_i3c_master (m); +int ret; + + ret =pm_runtime_resume_and_get (master->dev); +if (ret <0 ) { +dev_err (master->dev,"<%s> Cannot get runtime PM.\n" , __func__); +return ; + }svc_i3c_master_disable_interrupts (master);/* Disable master */ writel (0 , master->regs +SVC_I3C_MCONFIG ); + +pm_runtime_mark_last_busy (master->dev); +pm_runtime_put_autosuspend (master->dev); }static int svc_i3c_master_reserve_slot (struct svc_i3c_master *master)
@@ -839,6 +864,12 @@ static int svc_i3c_master_do_daa(struct i3c_master_controller *m)unsigned int dev_nb;int ret, i; + ret =pm_runtime_resume_and_get (master->dev); +if (ret <0 ) { +dev_err (master->dev,"<%s> Cannot get runtime PM.\n" , __func__); +return ret; + } +spin_lock_irqsave (&master->xferqueue.lock, flags); ret =svc_i3c_master_do_daa_locked (master, addrs, &dev_nb);spin_unlock_irqrestore (&master->xferqueue.lock, flags);
@@ -849,22 +880,24 @@ static int svc_i3c_master_do_daa(struct i3c_master_controller *m)for (i =0 ; i < dev_nb; i++) { ret =i3c_master_add_i3c_dev_locked (m, addrs[i]);if (ret) -return ret; + goto rpm_out; }/* Configure IBI auto-rules */ ret =svc_i3c_update_ibirules (master); -if (ret) { +if (ret)dev_err (master->dev,"Cannot handle such a list of devices" ); -return ret; - } -return 0 ; + goto rpm_out; emit_stop:svc_i3c_master_emit_stop (master);svc_i3c_master_clear_merrwarn (master); +rpm_out: +pm_runtime_mark_last_busy (master->dev); +pm_runtime_put_autosuspend (master->dev); +return ret; }
@@ -936,6 +969,12 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master,u32 reg;int ret; + ret =pm_runtime_resume_and_get (master->dev); +if (ret <0 ) { +dev_err (master->dev,"<%s> Cannot get runtime PM.\n" , __func__); +return ret; + } + writel(SVC_I3C_MCTRL_REQUEST_START_ADDR | xfer_type | SVC_I3C_MCTRL_IBIRESP_NACK |
@@ -966,12 +1005,18 @@ static int svc_i3c_master_xfer(struct svc_i3c_master *master,if (!continued)svc_i3c_master_emit_stop (master); +pm_runtime_mark_last_busy (master->dev); +pm_runtime_put_autosuspend (master->dev); +return 0 ; emit_stop:svc_i3c_master_emit_stop (master);svc_i3c_master_clear_merrwarn (master); +pm_runtime_mark_last_busy (master->dev); +pm_runtime_put_autosuspend (master->dev); +return ret; }
@@ -1310,6 +1355,14 @@ static void svc_i3c_master_free_ibi(struct i3c_dev_desc *dev)static int svc_i3c_master_enable_ibi (struct i3c_dev_desc *dev) {struct i3c_master_controller *m =i3c_dev_get_master (dev); +struct svc_i3c_master *master =to_svc_i3c_master (m); +int ret; + + ret =pm_runtime_resume_and_get (master->dev); +if (ret <0 ) { +dev_err (master->dev,"<%s> Cannot get runtime PM.\n" , __func__); +return ret; + }return i3c_master_enec_locked (m, dev->info.dyn_addr,I3C_CCC_EVENT_SIR ); }
@@ -1317,8 +1370,15 @@ static int svc_i3c_master_enable_ibi(struct i3c_dev_desc *dev)static int svc_i3c_master_disable_ibi (struct i3c_dev_desc *dev) {struct i3c_master_controller *m =i3c_dev_get_master (dev); +struct svc_i3c_master *master =to_svc_i3c_master (m); +int ret; -return i3c_master_disec_locked (m, dev->info.dyn_addr,I3C_CCC_EVENT_SIR ); + ret =i3c_master_disec_locked (m, dev->info.dyn_addr,I3C_CCC_EVENT_SIR ); + +pm_runtime_mark_last_busy (master->dev); +pm_runtime_put_autosuspend (master->dev); + +return ret; } static void svc_i3c_master_recycle_ibi_slot(struct i3c_dev_desc *dev,
@@ -1405,19 +1465,30 @@ static int svc_i3c_master_probe(struct platform_device *pdev)return ret; ret =clk_prepare_enable (master->fclk); -if (ret) - goto err_disable_pclk; +if (ret) { +clk_disable_unprepare (master->pclk); +return ret; + } ret =clk_prepare_enable (master->sclk); -if (ret) - goto err_disable_fclk; +if (ret) { +clk_disable_unprepare (master->pclk); +clk_disable_unprepare (master->fclk); +return ret; + } + +pm_runtime_set_autosuspend_delay (&pdev->dev,SVC_I3C_PM_TIMEOUT_MS ); +pm_runtime_use_autosuspend (&pdev->dev); +pm_runtime_get_noresume (&pdev->dev); +pm_runtime_set_active (&pdev->dev); +pm_runtime_enable (&pdev->dev);INIT_WORK (&master->hj_work, svc_i3c_master_hj_work);INIT_WORK (&master->ibi_work, svc_i3c_master_ibi_work); ret =devm_request_irq (dev, master->irq, svc_i3c_master_irq_handler,IRQF_NO_SUSPEND ,"svc-i3c-irq" , master);if (ret) - goto err_disable_sclk; + goto rpm_disable; master->free_slots =GENMASK (SVC_I3C_MAX_DEVS -1 ,0 );
@@ -1431,7 +1502,7 @@ static int svc_i3c_master_probe(struct platform_device *pdev) GFP_KERNEL);if (!master->ibi.slots) { ret = -ENOMEM ; - goto err_disable_sclk; + goto rpm_disable; }platform_set_drvdata (pdev, master);
@@ -1442,18 +1513,17 @@ static int svc_i3c_master_probe(struct platform_device *pdev) ret =i3c_master_register (&master->base, &pdev->dev, &svc_i3c_master_ops, false);if (ret) - goto err_disable_sclk; + goto rpm_disable; -return 0 ; - -err_disable_sclk: -clk_disable_unprepare (master->sclk); +pm_runtime_mark_last_busy (&pdev->dev); +pm_runtime_put_autosuspend (&pdev->dev); -err_disable_fclk: -clk_disable_unprepare (master->fclk); +return 0 ; -err_disable_pclk: -clk_disable_unprepare (master->pclk); +rpm_disable: +pm_runtime_dont_use_autosuspend (&pdev->dev); +pm_runtime_put_sync (&pdev->dev); +pm_runtime_disable (&pdev->dev);return ret; }
@@ -1467,13 +1537,57 @@ static int svc_i3c_master_remove(struct platform_device *pdev)if (ret)return ret; +pm_runtime_dont_use_autosuspend (&pdev->dev); +pm_runtime_disable (&pdev->dev); + +return 0 ; +} + +static int __maybe_unused svc_i3c_runtime_suspend (struct device *dev) +{ +struct svc_i3c_master *master =dev_get_drvdata (dev); +clk_disable_unprepare (master->pclk);clk_disable_unprepare (master->fclk);clk_disable_unprepare (master->sclk); +pinctrl_pm_select_sleep_state (dev);return 0 ; } +static int __maybe_unused svc_i3c_runtime_resume (struct device *dev) +{ +struct svc_i3c_master *master =dev_get_drvdata (dev); +int ret =0 ; + +pinctrl_pm_select_default_state (dev); + ret =clk_prepare_enable (master->pclk); +if (ret) +return ret; + + ret =clk_prepare_enable (master->fclk); +if (ret) { +clk_disable_unprepare (master->pclk); +return ret; + } + + ret =clk_prepare_enable (master->sclk); +if (ret) { +clk_disable_unprepare (master->pclk); +clk_disable_unprepare (master->fclk); +return ret; + } + +return ret; +} + +static const struct dev_pm_ops svc_i3c_pm_ops = { + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) +SET_RUNTIME_PM_OPS (svc_i3c_runtime_suspend, + svc_i3c_runtime_resume,NULL ) +}; +static const struct of_device_id svc_i3c_master_of_match_tbl[] = { { .compatible ="silvaco,i3c-master" }, {/* sentinel */ },
@@ -1485,6 +1599,7 @@ static struct platform_driver svc_i3c_master = { .driver = { .name = "silvaco-i3c-master", .of_match_table = svc_i3c_master_of_match_tbl, + .pm = &svc_i3c_pm_ops, }, };module_platform_driver (svc_i3c_master);
Signature · 7 lines
2.25.1 -- linux-i3c mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-i3c
Miquel Raynal
maintainerRe: [PATCH V2 5/5] i3c: master: svc: add runtime pm support
Hi Clark,
Quoted 19 lines
drivers/i3c/master/svc-i3c-master.c +2
-5@@ -1431,7 +1502,7 @@ static int svc_i3c_master_probe(struct platform_device *pdev) GFP_KERNEL);if (!master->ibi.slots) { ret = -ENOMEM ; - goto err_disable_sclk; + goto rpm_disable; }platform_set_drvdata (pdev, master);@@ -1442,18 +1513,17 @@ static int svc_i3c_master_probe(struct platform_device *pdev) ret =i3c_master_register (&master->base, &pdev->dev, &svc_i3c_master_ops, false);if (ret) - goto err_disable_sclk; + goto rpm_disable; -return 0 ; - -err_disable_sclk:
drivers/i3c/master/svc-i3c-master.c static int svc_i3c_master_probe(struct platform_device *pdev) · line 1456
Quoted 10 lines
drivers/i3c/master/svc-i3c-master.c +3
-5-clk_disable_unprepare (master->sclk); +pm_runtime_mark_last_busy (&pdev->dev); +pm_runtime_put_autosuspend (&pdev->dev); -err_disable_fclk: -clk_disable_unprepare (master->fclk); +return 0 ; -err_disable_pclk: -clk_disable_unprepare (master->pclk);
It's not clear to me why you drop the disable_*clk labels to move them back in place? I would rather prefer to keep a clean error path.
Quoted 66 lines
drivers/i3c/master/svc-i3c-master.c +48
-0+rpm_disable: +pm_runtime_dont_use_autosuspend (&pdev->dev); +pm_runtime_put_sync (&pdev->dev); +pm_runtime_disable (&pdev->dev);return ret; }@@ -1467,13 +1537,57 @@ static int svc_i3c_master_remove(struct platform_device *pdev)if (ret)return ret; +pm_runtime_dont_use_autosuspend (&pdev->dev); +pm_runtime_disable (&pdev->dev); + +return 0 ; +} + +static int __maybe_unused svc_i3c_runtime_suspend (struct device *dev) +{ +struct svc_i3c_master *master =dev_get_drvdata (dev); +clk_disable_unprepare (master->pclk);clk_disable_unprepare (master->fclk);clk_disable_unprepare (master->sclk); +pinctrl_pm_select_sleep_state (dev);return 0 ; } +static int __maybe_unused svc_i3c_runtime_resume (struct device *dev) +{ +struct svc_i3c_master *master =dev_get_drvdata (dev); +int ret =0 ; + +pinctrl_pm_select_default_state (dev); + ret =clk_prepare_enable (master->pclk); +if (ret) +return ret; + + ret =clk_prepare_enable (master->fclk); +if (ret) { +clk_disable_unprepare (master->pclk); +return ret; + } + + ret =clk_prepare_enable (master->sclk); +if (ret) { +clk_disable_unprepare (master->pclk); +clk_disable_unprepare (master->fclk); +return ret; + } + +return ret; +} + +static const struct dev_pm_ops svc_i3c_pm_ops = { + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) +SET_RUNTIME_PM_OPS (svc_i3c_runtime_suspend, + svc_i3c_runtime_resume,NULL ) +}; +static const struct of_device_id svc_i3c_master_of_match_tbl[] = { { .compatible ="silvaco,i3c-master" }, {/* sentinel */ },
drivers/i3c/master/svc-i3c-master.c static struct platform_driver svc_i3c_master = { · line 1605
Quoted 7 lines
drivers/i3c/master/svc-i3c-master.c +1
-0@@ -1485,6 +1599,7 @@ static struct platform_driver svc_i3c_master = { .driver = { .name = "silvaco-i3c-master", .of_match_table = svc_i3c_master_of_match_tbl, + .pm = &svc_i3c_pm_ops, }, };module_platform_driver (svc_i3c_master);
Thanks,
Miquèl
Signature · 3 lines
linux-i3c mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-i3c
RE: [PATCH V2 5/5] i3c: master: svc: add runtime pm support
Quoted 41 lines
-----Original Message-----
From: Miquel Raynal <[email protected]>
Sent: Friday, July 16, 2021 16:00
To: Clark Wang <[email protected]>
Cc: [email protected]; [email protected]; linux- [email protected]; [email protected]
Subject: Re: [PATCH V2 5/5] i3c: master: svc: add runtime pm supportHi Clark,
Review static int svc_i3c_master_probe(struct
Quoted 1 line
(quoted diff) +0
-0@@ -1431,7 +1502,7 @@ static int svc_i3c_master_probe(struct
platform_device*pdev)drivers/i3c/master/svc-i3c-master.c static int svc_i3c_master_probe(struct
Quoted 9 lines
drivers/i3c/master/svc-i3c-master.c +1
-1GFP_KERNEL);if (!master->ibi.slots) { ret = -ENOMEM ; - goto err_disable_sclk; + goto rpm_disable; }platform_set_drvdata (pdev, master);@@ -1442,18 +1513,17 @@ static int svc_i3c_master_probe(struct
platform_device*pdev)Quoted 17 lines
drivers/i3c/master/svc-i3c-master.c +4
-7ret =i3c_master_register (&master->base, &pdev->dev, &svc_i3c_master_ops, false);if (ret) - goto err_disable_sclk; + goto rpm_disable; -return 0 ; - -err_disable_sclk: -clk_disable_unprepare (master->sclk); +pm_runtime_mark_last_busy (&pdev->dev); +pm_runtime_put_autosuspend (&pdev->dev); -err_disable_fclk: -clk_disable_unprepare (master->fclk); +return 0 ;
Quoted 5 lines
drivers/i3c/master/svc-i3c-master.c static int svc_i3c_master_probe(struct platform_device *pdev) · line 1456
Quoted 2 lines
drivers/i3c/master/svc-i3c-master.c +0
-2-err_disable_pclk: -clk_disable_unprepare (master->pclk);It's not clear to me why you drop the disable_*clk labels to move them back in place? I would rather prefer to keep a clean error path.
Hi Miquel,
Yes it is. This change is indeed not very clear.
I have restored the error path.
And I found that it is not necessary to enable runtime pm so early.
Please check V3.
Thanks.
Best Regards,
Clark Wang
Quoted 78 lines
drivers/i3c/master/svc-i3c-master.c static int svc_i3c_master_remove(struct
Quoted 9 lines
drivers/i3c/master/svc-i3c-master.c +4
-0+rpm_disable: +pm_runtime_dont_use_autosuspend (&pdev->dev); +pm_runtime_put_sync (&pdev->dev); +pm_runtime_disable (&pdev->dev);return ret; }@@ -1467,13 +1537,57 @@ static int svc_i3c_master_remove(struct
platform_device*pdev)Quoted 58 lines
drivers/i3c/master/svc-i3c-master.c +44
-0if (ret)return ret; +pm_runtime_dont_use_autosuspend (&pdev->dev); +pm_runtime_disable (&pdev->dev); + +return 0 ; +} + +static int __maybe_unused svc_i3c_runtime_suspend (struct device *dev) +{ +struct svc_i3c_master *master =dev_get_drvdata (dev); +clk_disable_unprepare (master->pclk);clk_disable_unprepare (master->fclk);clk_disable_unprepare (master->sclk); +pinctrl_pm_select_sleep_state (dev);return 0 ; } +static int __maybe_unused svc_i3c_runtime_resume (struct device *dev) +{ +struct svc_i3c_master *master =dev_get_drvdata (dev); +int ret =0 ; + +pinctrl_pm_select_default_state (dev); + ret =clk_prepare_enable (master->pclk); +if (ret) +return ret; + + ret =clk_prepare_enable (master->fclk); +if (ret) { +clk_disable_unprepare (master->pclk); +return ret; + } + + ret =clk_prepare_enable (master->sclk); +if (ret) { +clk_disable_unprepare (master->pclk); +clk_disable_unprepare (master->fclk); +return ret; + } + +return ret; +} + +static const struct dev_pm_ops svc_i3c_pm_ops = { + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, + pm_runtime_force_resume) +SET_RUNTIME_PM_OPS (svc_i3c_runtime_suspend, + svc_i3c_runtime_resume,NULL ) +}; +static const struct of_device_id svc_i3c_master_of_match_tbl[] = { { .compatible ="silvaco,i3c-master" }, {/* sentinel */ },drivers/i3c/master/svc-i3c-master.c static struct platform_driver svc_i3c_master = { · line 1605
Quoted 7 lines
drivers/i3c/master/svc-i3c-master.c +1
-0@@ -1485,6 +1599,7 @@ static struct platform_driver svc_i3c_master = { .driver = { .name = "silvaco-i3c-master", .of_match_table = svc_i3c_master_of_match_tbl, + .pm = &svc_i3c_pm_ops, }, };module_platform_driver (svc_i3c_master);Thanks,
Miquèl