On 10/01/19 9:29 PM, Tony Lindgren wrote:
> We currently get the following error with pixcir_ts driver during a
> suspend resume cycle:
>
> omap_i2c 4802a000.i2c: controller timed out
> pixcir_ts 1-005c: pixcir_int_enable: can't read reg 0x34 : -110
> pixcir_ts 1-005c: Failed to disable interrupt generation: -110
> pixcir_ts 1-005c: Failed to stop
> dpm_run_callback(): pixcir_i2c_ts_resume+0x0/0x98
> [pixcir_i2c_ts] returns -110
> PM: Device 1-005c failed to resume: error -110
>
> And at least am437x based devices with pixcir_ts will fail to resume
> to a touchscreen that is configured as the wakeup-source in device
> tree for these devices.
>
> This is because pixcir_ts tries to reconfigure it's registers for
> noirq suspend which fails. This also leaves i2c-omap in enabled state
> for suspend.
>
> Let's fix the pixcir_ts issue and make sure i2c-omap is suspended by
> adding SET_NOIRQ_SYSTEM_SLEEP_PM_OPS. In the long run the solution
> seems to be to move the handling of suspended adapters to the i2c
> core, but that still needs some more work.
>
> Let's also get rid of some ifdefs while at it and replace them with
> __maybe_unused as SET_RUNTIME_PM_OPS and SET_NOIRQ_SYSTEM_SLEEP_PM_OPS
> already deal with the various PM Kconfig options.
>
> Cc: Dave Gerlach <d-gerlach@xxxxxx>
> Cc: Grygorii Strashko <grygorii.strashko@xxxxxx>
> Cc: Keerthy <j-keerthy@xxxxxx>
> Cc: Tero Kristo <t-kristo@xxxxxx>
> Reported-by: Keerthy <j-keerthy@xxxxxx>
> Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
> ---
>
Acked-by: Vignesh R <vigneshr@xxxxxx>
Regards
Vignesh
> Wolfram, this is still pending, can you please apply this a fix for
> the -rc series if no objections?
>
> Changes since v1:
>
> - Updated comments with the pixcir_ts related error messages
>
> ---
> drivers/i2c/busses/i2c-omap.c | 13 +++++--------
> 1 file changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
> --- a/drivers/i2c/busses/i2c-omap.c
> +++ b/drivers/i2c/busses/i2c-omap.c
> @@ -1500,8 +1500,7 @@ static int omap_i2c_remove(struct platform_device *pdev)
> return 0;
> }
>
> -#ifdef CONFIG_PM
> -static int omap_i2c_runtime_suspend(struct device *dev)
> +static int __maybe_unused omap_i2c_runtime_suspend(struct device *dev)
> {
> struct omap_i2c_dev *omap = dev_get_drvdata(dev);
>
> @@ -1527,7 +1526,7 @@ static int omap_i2c_runtime_suspend(struct device *dev)
> return 0;
> }
>
> -static int omap_i2c_runtime_resume(struct device *dev)
> +static int __maybe_unused omap_i2c_runtime_resume(struct device *dev)
> {
> struct omap_i2c_dev *omap = dev_get_drvdata(dev);
>
> @@ -1542,20 +1541,18 @@ static int omap_i2c_runtime_resume(struct device *dev)
> }
>
> static const struct dev_pm_ops omap_i2c_pm_ops = {
> + SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
> + pm_runtime_force_resume)
> SET_RUNTIME_PM_OPS(omap_i2c_runtime_suspend,
> omap_i2c_runtime_resume, NULL)
> };
> -#define OMAP_I2C_PM_OPS (&omap_i2c_pm_ops)
> -#else
> -#define OMAP_I2C_PM_OPS NULL
> -#endif /* CONFIG_PM */
>
> static struct platform_driver omap_i2c_driver = {
> .probe = omap_i2c_probe,
> .remove = omap_i2c_remove,
> .driver = {
> .name = "omap_i2c",
> - .pm = OMAP_I2C_PM_OPS,
> + .pm = &omap_i2c_pm_ops,
> .of_match_table = of_match_ptr(omap_i2c_of_match),
> },
> };
>
--
Regards
Vignesh
