* [PATCH 2/3] i2c: pxa: Add check for clk_enable() and clk_prepare_enable()
2024-11-04 21:43 [PATCH 1/3] i2c: lpc2k: Add check for clk_enable() Jiasheng Jiang
@ 2024-11-04 21:43 ` Jiasheng Jiang
2024-11-05 14:13 ` Andi Shyti
2024-11-04 21:43 ` [PATCH 3/3] i2c: rk3x: Add check for clk_enable() Jiasheng Jiang
1 sibling, 1 reply; 5+ messages in thread
From: Jiasheng Jiang @ 2024-11-04 21:43 UTC (permalink / raw)
To: rmk, max.schwarz, dianders, david.wu, heiko, vz, andi.shyti, wsa,
manabian
Cc: linux-arm-kernel, linux-rockchip, linux-i2c, linux-kernel,
Jiasheng Jiang
Add check for the return values of clk_enable() and clk_prepare_enable()
in order to catch the potential exceptions.
Fixes: e7d48fa2b5fb ("[I2C] pxa: provide late suspend and early resume hooks")
Fixes: c3cef3f3c07b ("[ARM] pxa: update pxa i2c driver to use clk support")
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
---
drivers/i2c/busses/i2c-pxa.c | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 4d76e71cdd4b..1118a7f5c6bf 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -1503,7 +1503,11 @@ static int i2c_pxa_probe(struct platform_device *dev)
i2c->adap.name);
}
- clk_prepare_enable(i2c->clk);
+ ret = clk_prepare_enable(i2c->clk);
+ if (ret) {
+ dev_err(&dev->dev, "failed to enable clock: %d\n", ret);
+ return ret;
+ }
if (i2c->use_pio) {
i2c->adap.algo = &i2c_pxa_pio_algorithm;
@@ -1560,8 +1564,14 @@ static int i2c_pxa_suspend_noirq(struct device *dev)
static int i2c_pxa_resume_noirq(struct device *dev)
{
struct pxa_i2c *i2c = dev_get_drvdata(dev);
+ int ret;
+
+ ret = clk_enable(i2c->clk);
+ if (ret) {
+ dev_err(dev, "failed to enable clock: %d\n", ret);
+ return ret;
+ }
- clk_enable(i2c->clk);
i2c_pxa_reset(i2c);
return 0;
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 3/3] i2c: rk3x: Add check for clk_enable()
2024-11-04 21:43 [PATCH 1/3] i2c: lpc2k: Add check for clk_enable() Jiasheng Jiang
2024-11-04 21:43 ` [PATCH 2/3] i2c: pxa: Add check for clk_enable() and clk_prepare_enable() Jiasheng Jiang
@ 2024-11-04 21:43 ` Jiasheng Jiang
1 sibling, 0 replies; 5+ messages in thread
From: Jiasheng Jiang @ 2024-11-04 21:43 UTC (permalink / raw)
To: rmk, max.schwarz, dianders, david.wu, heiko, vz, andi.shyti, wsa,
manabian
Cc: linux-arm-kernel, linux-rockchip, linux-i2c, linux-kernel,
Jiasheng Jiang
Add check for the return value of clk_enable() in order to catch the
potential exception. Moreover, convert the return type of
rk3x_i2c_adapt_div() into int and add the check.
Fixes: 7e086c3fc2df ("i2c: rk3x: add i2c support for rk3399 soc")
Fixes: 249051f49907 ("i2c: rk3x: handle dynamic clock rate changes correctly")
Fixes: c41aa3ce938b ("i2c: rk3x: add driver for Rockchip RK3xxx SoC I2C adapter")
Signed-off-by: Jiasheng Jiang <jiashengjiangcool@gmail.com>
---
drivers/i2c/busses/i2c-rk3x.c | 55 ++++++++++++++++++++++++++---------
1 file changed, 41 insertions(+), 14 deletions(-)
diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c
index 4ef9bad77b85..a4662b0dbd8c 100644
--- a/drivers/i2c/busses/i2c-rk3x.c
+++ b/drivers/i2c/busses/i2c-rk3x.c
@@ -871,7 +871,7 @@ static int rk3x_i2c_v1_calc_timings(unsigned long clk_rate,
return ret;
}
-static void rk3x_i2c_adapt_div(struct rk3x_i2c *i2c, unsigned long clk_rate)
+static int rk3x_i2c_adapt_div(struct rk3x_i2c *i2c, unsigned long clk_rate)
{
struct i2c_timings *t = &i2c->t;
struct rk3x_i2c_calced_timings calc;
@@ -883,7 +883,11 @@ static void rk3x_i2c_adapt_div(struct rk3x_i2c *i2c, unsigned long clk_rate)
ret = i2c->soc_data->calc_timings(clk_rate, t, &calc);
WARN_ONCE(ret != 0, "Could not reach SCL freq %u", t->bus_freq_hz);
- clk_enable(i2c->pclk);
+ ret = clk_enable(i2c->pclk);
+ if (ret) {
+ dev_err(i2c->dev, "Can't enable bus clk for rk3399: %d\n", ret);
+ return ret;
+ }
spin_lock_irqsave(&i2c->lock, flags);
val = i2c_readl(i2c, REG_CON);
@@ -904,6 +908,8 @@ static void rk3x_i2c_adapt_div(struct rk3x_i2c *i2c, unsigned long clk_rate)
clk_rate / 1000,
1000000000 / t->bus_freq_hz,
t_low_ns, t_high_ns);
+
+ return 0;
}
/**
@@ -942,19 +948,27 @@ static int rk3x_i2c_clk_notifier_cb(struct notifier_block *nb, unsigned long
return NOTIFY_STOP;
/* scale up */
- if (ndata->new_rate > ndata->old_rate)
- rk3x_i2c_adapt_div(i2c, ndata->new_rate);
+ if (ndata->new_rate > ndata->old_rate) {
+ if (rk3x_i2c_adapt_div(i2c, ndata->new_rate))
+ return NOTIFY_STOP;
+ }
return NOTIFY_OK;
case POST_RATE_CHANGE:
/* scale down */
- if (ndata->new_rate < ndata->old_rate)
- rk3x_i2c_adapt_div(i2c, ndata->new_rate);
+ if (ndata->new_rate < ndata->old_rate) {
+ if (rk3x_i2c_adapt_div(i2c, ndata->new_rate))
+ return NOTIFY_STOP;
+ }
+
return NOTIFY_OK;
case ABORT_RATE_CHANGE:
/* scale up */
- if (ndata->new_rate > ndata->old_rate)
- rk3x_i2c_adapt_div(i2c, ndata->old_rate);
+ if (ndata->new_rate > ndata->old_rate) {
+ if (rk3x_i2c_adapt_div(i2c, ndata->old_rate))
+ return NOTIFY_STOP;
+ }
+
return NOTIFY_OK;
default:
return NOTIFY_DONE;
@@ -1068,8 +1082,20 @@ static int rk3x_i2c_xfer_common(struct i2c_adapter *adap,
spin_lock_irqsave(&i2c->lock, flags);
- clk_enable(i2c->clk);
- clk_enable(i2c->pclk);
+ ret = clk_enable(i2c->clk);
+ if (ret) {
+ dev_err(i2c->dev, "Can't enable bus clk: %d\n", ret);
+ spin_unlock_irqrestore(&i2c->lock, flags);
+ return ret;
+ }
+
+ ret = clk_enable(i2c->pclk);
+ if (ret) {
+ dev_err(i2c->dev, "Can't enable bus clk for rk3399: %d\n", ret);
+ clk_disable(i2c->clk);
+ spin_unlock_irqrestore(&i2c->lock, flags);
+ return ret;
+ }
i2c->is_last_msg = false;
@@ -1149,9 +1175,7 @@ static __maybe_unused int rk3x_i2c_resume(struct device *dev)
{
struct rk3x_i2c *i2c = dev_get_drvdata(dev);
- rk3x_i2c_adapt_div(i2c, clk_get_rate(i2c->clk));
-
- return 0;
+ return rk3x_i2c_adapt_div(i2c, clk_get_rate(i2c->clk));
}
static u32 rk3x_i2c_func(struct i2c_adapter *adap)
@@ -1365,9 +1389,12 @@ static int rk3x_i2c_probe(struct platform_device *pdev)
}
clk_rate = clk_get_rate(i2c->clk);
- rk3x_i2c_adapt_div(i2c, clk_rate);
+ ret = rk3x_i2c_adapt_div(i2c, clk_rate);
clk_disable(i2c->clk);
+ if (ret)
+ goto err_clk_notifier;
+
ret = i2c_add_adapter(&i2c->adap);
if (ret < 0)
goto err_clk_notifier;
--
2.25.1
^ permalink raw reply related [flat|nested] 5+ messages in thread