diff options
author | Ben Fennema <fennema@google.com> | 2023-03-06 17:47:56 -0800 |
---|---|---|
committer | Ben Fennema <fennema@google.com> | 2023-03-06 17:47:56 -0800 |
commit | 9ff51fccb8f4275f360ea6e6278a0790be947b10 (patch) | |
tree | 1599f42b7ff3d1692d385d17421b52ae832d0bf3 | |
parent | fa002d384d8fb24a41fa36991df13b3cd952fc89 (diff) | |
download | securemsm-9ff51fccb8f4275f360ea6e6278a0790be947b10.tar.gz |
qseecom: bw_scale_down_timer not setup when support_bus_scaling false
Only modify qseecom.bw_scale_down_timer and qseecom.timer_running when
qseecom.support_bus_scaling is true, since it is only initially setup in
qseecom_init_bus when it is true.
Bug: 271711990
Change-Id: I8fb3c8b6e5ca1a97b5beed22b8da4966a66667c0
Signed-off-by: Ben Fennema <fennema@google.com>
-rw-r--r-- | qseecom/qseecom.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/qseecom/qseecom.c b/qseecom/qseecom.c index 3d32b47..a5b3101 100644 --- a/qseecom/qseecom.c +++ b/qseecom/qseecom.c @@ -9756,8 +9756,10 @@ static int qseecom_suspend(struct platform_device *pdev, pm_message_t state) clk_disable_unprepare(qclk->ce_bus_clk); } - del_timer_sync(&(qseecom.bw_scale_down_timer)); - qseecom.timer_running = false; + if (qseecom.support_bus_scaling) { + del_timer_sync(&(qseecom.bw_scale_down_timer)); + qseecom.timer_running = false; + } mutex_unlock(&clk_access_lock); mutex_unlock(&qsee_bw_mutex); @@ -9820,7 +9822,8 @@ static int qseecom_resume(struct platform_device *pdev) } } - if (qclk->clk_access_cnt || qseecom.cumulative_mode) { + if (qseecom.support_bus_scaling && + (qclk->clk_access_cnt || qseecom.cumulative_mode)) { qseecom.bw_scale_down_timer.expires = jiffies + msecs_to_jiffies(QSEECOM_SEND_CMD_CRYPTO_TIMEOUT); mod_timer(&(qseecom.bw_scale_down_timer), |