diff options
| author | Ravi Jain <raviajain@google.com> | 2022-12-01 13:14:26 +0800 |
|---|---|---|
| committer | Ravi Jain <raviajain@google.com> | 2022-12-06 14:28:55 +0800 |
| commit | bc74187e4a8dec8eb34e6ebd660c424edc0f31cd (patch) | |
| tree | d3f28218759d639fd7da9e64a48b535a02af9d20 /goodix_ts_core.c | |
| parent | 33d4c9c4c1891b77ba052926a7b9fb0971080b36 (diff) | |
| download | goodix_touch-bc74187e4a8dec8eb34e6ebd660c424edc0f31cd.tar.gz | |
touch: goodix: Fix deadlock between irq and wakelock
1. Use of disable_irq_nosync instead of disable_irq.
2. Add Error handling while obtaining irq_wakelock.
Test: Flashed locally to test resume/suspend operations.
Bug: 230827813
Change-Id: Icf0e6ce80c9b5e9e3b95c9f8d4debf1163b69843
Signed-off-by: Ravi Jain <raviajain@google.com>
Diffstat (limited to 'goodix_ts_core.c')
| -rw-r--r-- | goodix_ts_core.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/goodix_ts_core.c b/goodix_ts_core.c index 44291c8..ce66b48 100644 --- a/goodix_ts_core.c +++ b/goodix_ts_core.c @@ -1871,7 +1871,11 @@ static irqreturn_t goodix_ts_threadirq_func(int irq, void *data) int ret; #if IS_ENABLED(CONFIG_GOOG_TOUCH_INTERFACE) && IS_ENABLED(CONFIG_GTI_PM) - goog_pm_wake_lock(core_data->gti, GTI_PM_WAKELOCK_TYPE_IRQ, true); + ret = goog_pm_wake_lock(core_data->gti, GTI_PM_WAKELOCK_TYPE_IRQ, true); + if(ret < 0) { + GOOG_INFO("Error while obtaing IRQ wakelock: %d!\n", ret); + return IRQ_HANDLED; + } #endif ts_esd->irq_status = true; @@ -1886,7 +1890,7 @@ static irqreturn_t goodix_ts_threadirq_func(int irq, void *data) if (ret == EVT_CANCEL_IRQEVT) { mutex_unlock(&goodix_modules.mutex); #if IS_ENABLED(CONFIG_GOOG_TOUCH_INTERFACE) && IS_ENABLED(CONFIG_GTI_PM) - goog_pm_wake_unlock(core_data->gti, GTI_PM_WAKELOCK_TYPE_IRQ); + goog_pm_wake_unlock_nosync(core_data->gti, GTI_PM_WAKELOCK_TYPE_IRQ); #endif return IRQ_HANDLED; } @@ -1925,7 +1929,7 @@ static irqreturn_t goodix_ts_threadirq_func(int irq, void *data) } #if IS_ENABLED(CONFIG_GOOG_TOUCH_INTERFACE) && IS_ENABLED(CONFIG_GTI_PM) - goog_pm_wake_unlock(core_data->gti, GTI_PM_WAKELOCK_TYPE_IRQ); + goog_pm_wake_unlock_nosync(core_data->gti, GTI_PM_WAKELOCK_TYPE_IRQ); #endif return IRQ_HANDLED; |