From f9a5c3b12e28273368f1521ce1e4bd0645c47e17 Mon Sep 17 00:00:00 2001 From: davidycchen Date: Thu, 31 Mar 2022 09:35:09 +0800 Subject: synaptics: trigger reset and retry when the suspend process fails Trigger reset and retry when the suspend process fails to make sure touch can enter low power mode. Bug: 227139770 Test: Suspend successfully after reset. Signed-off-by: davidycchen Change-Id: Ib13b7483272ea10e4589417ce6f0561f3d66de6a --- syna_tcm2.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'syna_tcm2.c') diff --git a/syna_tcm2.c b/syna_tcm2.c index c1ab34e..8330701 100644 --- a/syna_tcm2.c +++ b/syna_tcm2.c @@ -2016,6 +2016,7 @@ static int syna_dev_suspend(struct device *dev) struct syna_tcm *tcm = dev_get_drvdata(dev); struct syna_hw_interface *hw_if = tcm->hw_if; bool irq_disabled = true; + unsigned char status; /* exit directly if device is already in suspend state */ if (tcm->pwr_state != PWR_ON) @@ -2032,8 +2033,22 @@ static int syna_dev_suspend(struct device *dev) /* enter power saved mode if power is not off */ retval = syna_dev_enter_lowpwr_sensing(tcm); if (retval < 0) { - LOGE("Fail to enter suspended power mode\n"); - return retval; + LOGE("Fail to enter suspended power mode, reset and retry.\n"); + if (hw_if->ops_hw_reset) { + hw_if->ops_hw_reset(hw_if); + retval = syna_tcm_get_event_data(tcm->tcm_dev, + &status, NULL); + if ((retval < 0) || (status != REPORT_IDENTIFY)) { + LOGE("Fail to complete hw reset, ret = %d, status = %d\n", + retval, status); + } + return retval; + } + retval = syna_dev_enter_lowpwr_sensing(tcm); + if (retval < 0) { + LOGE("Fail to enter suspended power mode after reset.\n"); + return retval; + } } tcm->pwr_state = LOW_PWR; #else -- cgit v1.2.3