Skip to contentSkip to conversation

i2c: busses: tegra: Add suspend-resume support

PATCH Applied Bitan Biswas 4 participants 11 messages Jun 7, 2019 – Jun 17, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 i2c: busses: tegra: Add suspend-resume support

Post suspend I2C registers have power on reset values. Before any transfer initialize I2C registers to prevent I2C transfer timeout and implement suspend and resume callbacks needed. Fix below errors post suspend:

1) Tegra I2C transfer timeout during jetson tx2 resume:

[   27.520613] pca953x 1-0074: calling pca953x_resume+0x0/0x1b0 @ 2939, parent: i2c-1
[   27.633623] tegra-i2c 3160000.i2c: i2c transfer timed out
[   27.639162] pca953x 1-0074: Unable to sync registers 0x3-0x5. -110
[   27.645336] pca953x 1-0074: Failed to sync GPIO dir registers: -110
[   27.651596] PM: dpm_run_callback(): pca953x_resume+0x0/0x1b0 returns -110
[   27.658375] pca953x 1-0074: pca953x_resume+0x0/0x1b0 returned -110 after 127152 usecs
[   27.666194] PM: Device 1-0074 failed to resume: error -110

2) Tegra I2C transfer timeout error on jetson Xavier post resume.

Remove i2c bus lock-unlock calls in resume callback as i2c_mark_adapter_* (suspended-resumed) help ensure i2c core calls from client are not executed before i2c-tegra resume.

---
 drivers/i2c/busses/i2c-tegra.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
drivers/i2c/busses/i2c-tegra.c +24 -0
index ebaa78d..1dbba39 100644
@@ -1687,7 +1687,31 @@ static int tegra_i2c_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM_SLEEP
+static int tegra_i2c_suspend(struct device *dev)
+{
+	struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);
+
+	i2c_mark_adapter_suspended(&i2c_dev->adapter);
+
+	return 0;
+}
+
+static int tegra_i2c_resume(struct device *dev)
+{
+	struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);
+	int err;
+
+	err = tegra_i2c_init(i2c_dev, false);
+	if (err)
+		return err;
+
+	i2c_mark_adapter_resumed(&i2c_dev->adapter);
+
+	return 0;
+}
+
 static const struct dev_pm_ops tegra_i2c_pm = {
+	SET_SYSTEM_SLEEP_PM_OPS(tegra_i2c_suspend, tegra_i2c_resume)
 	SET_RUNTIME_PM_OPS(tegra_i2c_runtime_suspend, tegra_i2c_runtime_resume,
 			   NULL)
 };
Signature · 1 line
2.7.4
reviewer Reviewed-by on v3 1/1
#1 lore raw

07.06.2019 8:37, Bitan Biswas пишет:

Quoted 53 lines

Post suspend I2C registers have power on reset values. Before any transfer initialize I2C registers to prevent I2C transfer timeout and implement suspend and resume callbacks needed. Fix below errors post suspend:

1) Tegra I2C transfer timeout during jetson tx2 resume:

[   27.520613] pca953x 1-0074: calling pca953x_resume+0x0/0x1b0 @ 2939, parent: i2c-1
[   27.633623] tegra-i2c 3160000.i2c: i2c transfer timed out
[   27.639162] pca953x 1-0074: Unable to sync registers 0x3-0x5. -110
[   27.645336] pca953x 1-0074: Failed to sync GPIO dir registers: -110
[   27.651596] PM: dpm_run_callback(): pca953x_resume+0x0/0x1b0 returns -110
[   27.658375] pca953x 1-0074: pca953x_resume+0x0/0x1b0 returned -110 after 127152 usecs
[   27.666194] PM: Device 1-0074 failed to resume: error -110

2) Tegra I2C transfer timeout error on jetson Xavier post resume.

Remove i2c bus lock-unlock calls in resume callback as i2c_mark_adapter_* (suspended-resumed) help ensure i2c core calls from client are not executed before i2c-tegra resume.

---
 drivers/i2c/busses/i2c-tegra.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
drivers/i2c/busses/i2c-tegra.c +18 -0
index ebaa78d..1dbba39 100644
@@ -1687,7 +1687,31 @@ static int tegra_i2c_remove(struct platform_device *pdev)
 }
 
 #ifdef CONFIG_PM_SLEEP
+static int tegra_i2c_suspend(struct device *dev)
+{
+	struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);
+
+	i2c_mark_adapter_suspended(&i2c_dev->adapter);
+
+	return 0;
+}
+
+static int tegra_i2c_resume(struct device *dev)
+{
+	struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);
+	int err;
+
+	err = tegra_i2c_init(i2c_dev, false);
+	if (err)
+		return err;
+

drivers/i2c/busses/i2c-tegra.c static int tegra_i2c_remove(struct platform_device *pdev) · line 1717

Quoted 10 lines
drivers/i2c/busses/i2c-tegra.c +6 -0
+	i2c_mark_adapter_resumed(&i2c_dev->adapter);
+
+	return 0;
+}
+
 static const struct dev_pm_ops tegra_i2c_pm = {
+	SET_SYSTEM_SLEEP_PM_OPS(tegra_i2c_suspend, tegra_i2c_resume)
 	SET_RUNTIME_PM_OPS(tegra_i2c_runtime_suspend, tegra_i2c_runtime_resume,
 			   NULL)
 };

Thanks!

Signature · 1 line
Dmitry
#2 lore raw
Quoted 67 lines · Dmitry Osipenko

07.06.2019 8:37, Bitan Biswas пишет:

Quoted 53 lines

Post suspend I2C registers have power on reset values. Before any transfer initialize I2C registers to prevent I2C transfer timeout and implement suspend and resume callbacks needed. Fix below errors post suspend:

1) Tegra I2C transfer timeout during jetson tx2 resume:

[   27.520613] pca953x 1-0074: calling pca953x_resume+0x0/0x1b0 @ 2939, parent: i2c-1
[   27.633623] tegra-i2c 3160000.i2c: i2c transfer timed out
[   27.639162] pca953x 1-0074: Unable to sync registers 0x3-0x5. -110
[   27.645336] pca953x 1-0074: Failed to sync GPIO dir registers: -110
[   27.651596] PM: dpm_run_callback(): pca953x_resume+0x0/0x1b0 returns -110
[   27.658375] pca953x 1-0074: pca953x_resume+0x0/0x1b0 returned -110 after 127152 usecs
[   27.666194] PM: Device 1-0074 failed to resume: error -110

2) Tegra I2C transfer timeout error on jetson Xavier post resume.

Remove i2c bus lock-unlock calls in resume callback as i2c_mark_adapter_* (suspended-resumed) help ensure i2c core calls from client are not executed before i2c-tegra resume.

---
  drivers/i2c/busses/i2c-tegra.c | 24 ++++++++++++++++++++++++
  1 file changed, 24 insertions(+)
drivers/i2c/busses/i2c-tegra.c +18 -0
index ebaa78d..1dbba39 100644
@@ -1687,7 +1687,31 @@ static int tegra_i2c_remove(struct platform_device *pdev)
  }
 
  #ifdef CONFIG_PM_SLEEP
+static int tegra_i2c_suspend(struct device *dev)
+{
+	struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);
+
+	i2c_mark_adapter_suspended(&i2c_dev->adapter);
+
+	return 0;
+}
+
+static int tegra_i2c_resume(struct device *dev)
+{
+	struct tegra_i2c_dev *i2c_dev = dev_get_drvdata(dev);
+	int err;
+
+	err = tegra_i2c_init(i2c_dev, false);
+	if (err)
+		return err;
+

drivers/i2c/busses/i2c-tegra.c static int tegra_i2c_remove(struct platform_device *pdev) · line 1717

Quoted 10 lines
drivers/i2c/busses/i2c-tegra.c +6 -0
+	i2c_mark_adapter_resumed(&i2c_dev->adapter);
+
+	return 0;
+}
+
  static const struct dev_pm_ops tegra_i2c_pm = {
+	SET_SYSTEM_SLEEP_PM_OPS(tegra_i2c_suspend, tegra_i2c_resume)
  	SET_RUNTIME_PM_OPS(tegra_i2c_runtime_suspend, tegra_i2c_runtime_resume,
  			   NULL)
  };

Thanks!

Quoted 2 lines

Please get back if there is/are any further review comment(s) for below patch.

http://patchwork.ozlabs.org/patch/1111570/

-Thanks,
Bitan

Applied
#3 lore raw
In reply to Bitan Biswas
Quoted 15 lines · Bitan Biswas

Post suspend I2C registers have power on reset values. Before any transfer initialize I2C registers to prevent I2C transfer timeout and implement suspend and resume callbacks needed. Fix below errors post suspend:

1) Tegra I2C transfer timeout during jetson tx2 resume:

[   27.520613] pca953x 1-0074: calling pca953x_resume+0x0/0x1b0 @ 2939, parent: i2c-1
[   27.633623] tegra-i2c 3160000.i2c: i2c transfer timed out
[   27.639162] pca953x 1-0074: Unable to sync registers 0x3-0x5. -110
[   27.645336] pca953x 1-0074: Failed to sync GPIO dir registers: -110
[   27.651596] PM: dpm_run_callback(): pca953x_resume+0x0/0x1b0 returns -110
[   27.658375] pca953x 1-0074: pca953x_resume+0x0/0x1b0 returned -110 after 127152 usecs
[   27.666194] PM: Device 1-0074 failed to resume: error -110
Quoted 7 lines

2) Tegra I2C transfer timeout error on jetson Xavier post resume.

Remove i2c bus lock-unlock calls in resume callback as i2c_mark_adapter_* (suspended-resumed) help ensure i2c core calls from client are not executed before i2c-tegra resume.

Applied to for-next, thanks!

Without a maintainer ack, this is an exception this time. Should we add Dmitry as another maintainer or reviewer at least?

#4 lore raw
Quoted 22 lines · Wolfram Sang
Quoted 21 lines · Bitan Biswas

Post suspend I2C registers have power on reset values. Before any transfer initialize I2C registers to prevent I2C transfer timeout and implement suspend and resume callbacks needed. Fix below errors post suspend:

1) Tegra I2C transfer timeout during jetson tx2 resume:

[   27.520613] pca953x 1-0074: calling pca953x_resume+0x0/0x1b0 @ 2939, parent: i2c-1
[   27.633623] tegra-i2c 3160000.i2c: i2c transfer timed out
[   27.639162] pca953x 1-0074: Unable to sync registers 0x3-0x5. -110
[   27.645336] pca953x 1-0074: Failed to sync GPIO dir registers: -110
[   27.651596] PM: dpm_run_callback(): pca953x_resume+0x0/0x1b0 returns -110
[   27.658375] pca953x 1-0074: pca953x_resume+0x0/0x1b0 returned -110 after 127152 usecs
[   27.666194] PM: Device 1-0074 failed to resume: error -110

2) Tegra I2C transfer timeout error on jetson Xavier post resume.

Remove i2c bus lock-unlock calls in resume callback as i2c_mark_adapter_* (suspended-resumed) help ensure i2c core calls from client are not executed before i2c-tegra resume.

Quoted 7 lines
Quoted 1 line

Applied to for-next, thanks!

Without a maintainer ack, this is an exception this time. Should we add Dmitry as another maintainer or reviewer at least?

I shall followup with Maintainer for ACK in future I2C tegra patches. Probably maintainers or reviewers should comment here.

#5 lore raw
Quoted 5 lines
Quoted 4 lines

Without a maintainer ack, this is an exception this time. Should we add Dmitry as another maintainer or reviewer at least?

I shall followup with Maintainer for ACK in future I2C tegra patches.

This comment was not directed at you, sorry if that was not clear. It was more for Laxman, Thierry, Jonathan, and Dmitry (if he is interested).

#6 lore raw

15.06.2019 7:54, Wolfram Sang пишет:

Quoted 10 lines
Quoted 5 lines
Quoted 4 lines

Without a maintainer ack, this is an exception this time. Should we add Dmitry as another maintainer or reviewer at least?

I shall followup with Maintainer for ACK in future I2C tegra patches.

This comment was not directed at you, sorry if that was not clear. It was more for Laxman, Thierry, Jonathan, and Dmitry (if he is interested).

I don't mind at all to review and test patches for the driver and can propose myself as a reviewer if that helps and if there are no objections from the Tegra maintainers. My primary interest is to have my devices working after next kernel update, but I also like to review patches in general if they are touching area that I'm familiar with.

#7 lore raw
Quoted 12 lines · Dmitry Osipenko

15.06.2019 7:54, Wolfram Sang пишет:

Quoted 10 lines
Quoted 5 lines
Quoted 4 lines

Without a maintainer ack, this is an exception this time. Should we add Dmitry as another maintainer or reviewer at least?

I shall followup with Maintainer for ACK in future I2C tegra patches.

This comment was not directed at you, sorry if that was not clear. It was more for Laxman, Thierry, Jonathan, and Dmitry (if he is interested).

Quoted 4 lines

I don't mind at all to review and test patches for the driver and can propose myself as a reviewer if that helps and if there are no objections from the Tegra maintainers. My primary interest is to have my devices working after next kernel update, but I also like to review patches in general if they are touching area that I'm familiar with.

No objection from me.

Thierry

#8 lore raw

17.06.2019 10:02, Thierry Reding пишет:

Quoted 13 lines · Dmitry Osipenko
Quoted 12 lines

15.06.2019 7:54, Wolfram Sang пишет:

Quoted 10 lines
Quoted 5 lines
Quoted 4 lines

Without a maintainer ack, this is an exception this time. Should we add Dmitry as another maintainer or reviewer at least?

I shall followup with Maintainer for ACK in future I2C tegra patches.

This comment was not directed at you, sorry if that was not clear. It was more for Laxman, Thierry, Jonathan, and Dmitry (if he is interested).

Quoted 6 lines
Quoted 4 lines

I don't mind at all to review and test patches for the driver and can propose myself as a reviewer if that helps and if there are no objections from the Tegra maintainers. My primary interest is to have my devices working after next kernel update, but I also like to review patches in general if they are touching area that I'm familiar with.

No objection from me.

Thanks! I guess the same from Laxman and Jon?

I'll prepare the patch to add myself as a reviewer.

Tested-by Acked-by
#9 lore raw
In reply to Wolfram Sang
Quoted 9 lines · Wolfram Sang
Quoted 5 lines
Quoted 4 lines

Without a maintainer ack, this is an exception this time. Should we add Dmitry as another maintainer or reviewer at least?

I shall followup with Maintainer for ACK in future I2C tegra patches.

This comment was not directed at you, sorry if that was not clear. It was more for Laxman, Thierry, Jonathan, and Dmitry (if he is interested).

I thought I had already acked this. I've certainly been testing this since I carry it in a local tree. So for what it's worth:

Bitan, I don't mind getting the patches to the corporate email address, but please make sure to also always include the gmail address when sending patches to the public mailing lists. My workflow is somewhat quirky that way because I work remotely and for historical reasons.

Thierry

#10 lore raw
Quoted 14 lines · Thierry Reding
Quoted 9 lines · Wolfram Sang
Quoted 5 lines
Quoted 4 lines

Without a maintainer ack, this is an exception this time. Should we add Dmitry as another maintainer or reviewer at least?

I shall followup with Maintainer for ACK in future I2C tegra patches.

This comment was not directed at you, sorry if that was not clear. It was more for Laxman, Thierry, Jonathan, and Dmitry (if he is interested).

I thought I had already acked this. I've certainly been testing this since I carry it in a local tree. So for what it's worth:

Quoted 7 lines

Bitan, I don't mind getting the patches to the corporate email address, but please make sure to also always include the gmail address when sending patches to the public mailing lists. My workflow is somewhat quirky that way because I work remotely and for historical reasons.

I shall put both email addresses going forward.

-regards,
Bitan