Add dev_err_probe() to i2c designware platform probing
Subsystems (3)
v2 cover Add dev_err_probe() to i2c designware platform probing
I recently spend some time debugging a case where the i2c controller never showed up. In the end it was caused by a missing reset controller due to a typo in the device tree.
While this has nothing to do with the i2c designware driver, not having any hint about why the device stays in deferred probe state does not help.
The first patch convert dev_err() to dev_err_probe() on request IRQ failure, this simplifies error handling.
The second patch add dev_err_probe() in the error paths that can return -EPROBE_DEFER in dw_i2c_plat_probe() to aid in debugging deferred probe errors.
---
Changes in v2:
- Split the patch in two: one to convert dev_err() to dev_err_probe()
on request IRQ failure and the other adding dev_err_probe() to error
paths in dw_i2c_plat_probe()
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Benoît Monin (2):
i2c: designware: convert to dev_err_probe() on request IRQ error
i2c: designware: use dev_err_probe() when probing platform device
drivers/i2c/busses/i2c-designware-master.c | 9 ++++----- drivers/i2c/busses/i2c-designware-platdrv.c | 10 ++++++---- drivers/i2c/busses/i2c-designware-slave.c | 9 ++++----- 3 files changed, 14 insertions(+), 14 deletions(-)
---
base-commit: b320789d6883cc00ac78ce83bccbfe7ed58afcf0
change-id: 20250822-i2c-dw-dev-err-probe-eaf9bce3ef4c
Best regards,
Signature · 3 lines
Benoît Monin, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
PATCH v2 1/2 i2c: designware: convert to dev_err_probe() on request IRQ error
Simplify the error handling of devm_request_irq() in i2c_dw_probe_master() and i2c_dw_probe_slave() by converting to:
return dev_err_probe();
instead of calling:
dev_err();
return ret;This also handle deferred probe error without spamming the log.
--- drivers/i2c/busses/i2c-designware-master.c | 9 ++++----- drivers/i2c/busses/i2c-designware-slave.c | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-)
drivers/i2c/busses/i2c-designware-master.c +4 -5
@@ -1068,11 +1068,10 @@ int i2c_dw_probe_master(struct dw_i2c_dev *dev)if (!(dev->flags &ACCESS_POLLING )) { ret =devm_request_irq (dev->dev, dev->irq, i2c_dw_isr, irq_flags,dev_name (dev->dev), dev); -if (ret) { -dev_err (dev->dev,"failure requesting irq %i: %d\n" , - dev->irq, ret); -return ret; - } +if (ret) +return dev_err_probe (dev->dev, ret, +"failure requesting irq %i: %d\n" , + dev->irq, ret); } ret =i2c_dw_init_recovery_info (dev);
drivers/i2c/busses/i2c-designware-slave.c +4 -5
@@ -266,11 +266,10 @@ int i2c_dw_probe_slave(struct dw_i2c_dev *dev) ret =devm_request_irq (dev->dev, dev->irq, i2c_dw_isr_slave,IRQF_SHARED ,dev_name (dev->dev), dev); -if (ret) { -dev_err (dev->dev,"failure requesting IRQ %i: %d\n" , - dev->irq, ret); -return ret; - } +if (ret) +return dev_err_probe (dev->dev, ret, +"failure requesting IRQ %i: %d\n" , + dev->irq, ret); ret =i2c_add_numbered_adapter (adap);if (ret)
Signature · 1 line
2.51.0
Re: [PATCH v2 1/2] i2c: designware: convert to dev_err_probe() on request IRQ error
Quoted 11 lines · Benoît Monin
Simplify the error handling of
devm_request_irq()ini2c_dw_probe_master()andi2c_dw_probe_slave()by converting to:return dev_err_probe();instead of calling:
dev_err(); return ret;This also handle deferred probe error without spamming the log.
Signature · 2 lines
With Best Regards, Andy Shevchenko
Jarkko Nikula
Acked-byRe: [PATCH v2 1/2] i2c: designware: convert to dev_err_probe() on request IRQ error
Quoted 6 lines · Andy Shevchenko
Quoted 5 lines · Benoît Monin
Simplify the error handling of
devm_request_irq()ini2c_dw_probe_master()andi2c_dw_probe_slave()by converting to:return dev_err_probe();
Quoted 9 lines
Quoted 6 lines
instead of calling:
dev_err(); return ret;This also handle deferred probe error without spamming the log.
Reviewed-by Andy Shevchenko <[email protected]>
Wolfram Sang
AppliedRe: [PATCH v2 1/2] i2c: designware: convert to dev_err_probe() on request IRQ error
In reply to Benoît MoninQuoted 7 lines · Benoît Monin
Simplify the error handling of
devm_request_irq()ini2c_dw_probe_master()andi2c_dw_probe_slave()by converting to:return dev_err_probe();instead of calling:
Quoted 8 lines
dev_err(); return ret;This also handle deferred probe error without spamming the log.
Signed-off-by Benoît Monin <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>Acked-by Jarkko Nikula <[email protected]>
Applied to for-next, thanks!
PATCH v2 2/2 i2c: designware: use dev_err_probe() when probing platform device
In reply to Benoît MoninAdd calls to dev_err_probe() on error paths that can return -EPROBE_DEFER when probing platform device. Namely when requesting the reset controller, when probing for lock support and when requesting the clocks.
PCI device probing already use dev_err_probe().
--- drivers/i2c/busses/i2c-designware-platdrv.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/i2c/busses/i2c-designware-platdrv.c +6 -4
@@ -238,7 +238,7 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) dev->rst =devm_reset_control_get_optional_exclusive (device,NULL );if (IS_ERR (dev->rst)) -return PTR_ERR (dev->rst); +return dev_err_probe (device,PTR_ERR (dev->rst),"failed to acquire reset\n" );reset_control_deassert (dev->rst);
@@ -247,21 +247,23 @@ static int dw_i2c_plat_probe(struct platform_device *pdev) goto exit_reset; ret =i2c_dw_probe_lock_support (dev); -if (ret) +if (ret) { + ret =dev_err_probe (device, ret,"failed to probe lock support\n" ); goto exit_reset; + }i2c_dw_configure (dev);/* Optional interface clock */ dev->pclk =devm_clk_get_optional (device,"pclk" );if (IS_ERR (dev->pclk)) { - ret =PTR_ERR (dev->pclk); + ret =dev_err_probe (device,PTR_ERR (dev->pclk),"failed to acquire pclk\n" ); goto exit_reset; } dev->clk =devm_clk_get_optional (device,NULL );if (IS_ERR (dev->clk)) { - ret =PTR_ERR (dev->clk); + ret =dev_err_probe (device,PTR_ERR (dev->clk),"failed to acquire clock\n" ); goto exit_reset; }
Signature · 1 line
2.51.0
Re: [PATCH v2 2/2] i2c: designware: use dev_err_probe() when probing platform device
Quoted 6 lines · Benoît Monin
Add calls to
dev_err_probe()on error paths that can return -EPROBE_DEFER when probing platform device. Namely when requesting the reset controller, when probing for lock support and when requesting the clocks.PCI device probing already use
dev_err_probe().
Makes sense by at least two aspects:
1) less log spamming for deferred probes;
2) easier to debug an issue (I assume it's your case).
Signature · 2 lines
With Best Regards, Andy Shevchenko
Jarkko Nikula
Acked-byRe: [PATCH v2 2/2] i2c: designware: use dev_err_probe() when probing platform device
Quoted 6 lines · Andy Shevchenko
Quoted 5 lines · Benoît Monin
Add calls to
dev_err_probe()on error paths that can return -EPROBE_DEFER when probing platform device. Namely when requesting the reset controller, when probing for lock support and when requesting the clocks.
Quoted 8 lines
Quoted 1 line
PCI device probing already use
dev_err_probe().Makes sense by at least two aspects:
1) less log spamming for deferred probes;
2) easier to debug an issue (I assume it's your case).Reviewed-by Andy Shevchenko <[email protected]>
Wolfram Sang
AppliedRe: [PATCH v2 2/2] i2c: designware: use dev_err_probe() when probing platform device
In reply to Benoît MoninQuoted 10 lines · Benoît Monin
Add calls to
dev_err_probe()on error paths that can return -EPROBE_DEFER when probing platform device. Namely when requesting the reset controller, when probing for lock support and when requesting the clocks.PCI device probing already use
dev_err_probe().Signed-off-by Benoît Monin <[email protected]>Reviewed-by Andy Shevchenko <[email protected]>Acked-by Jarkko Nikula <[email protected]>
Applied to for-next, thanks!