samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cnss2: Get PM Runtime reference before RDDM trigger

Browse Source 
Host triggered force assert can be called asynchronous.
As part of force assert, CNSS dumps few MHI registers and
trigger RDDM asynchronously. There are chances of race between
force assert and runtime suspend.
To fix that take runtime get reference before MHI operations and
runtime put later.

Change-Id: Icef23910587ff280270bdd7c60ad8eba392822e9
CRs-Fixed: 3464127
This commit is contained in:
Naman Padhiar
2023-05-11 16:21:27 +05:30
committed by Rahul Choudhary
parent 7cd9a66ccc
commit 1f5d4ad661
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
cnss2/pci.c
View File

@@ -5596,8 +5596,13 @@ int cnss_pci_force_fw_assert_hdlr(struct cnss_pci_data *pci_priv)
if (!test_bit(CNSS_MHI_POWER_ON, &pci_priv->mhi_state) ||
test_bit(CNSS_MHI_POWERING_OFF, &pci_priv->mhi_state))
return -EINVAL;
cnss_auto_resume(&pci_priv->pci_dev->dev);
/*
* Call pm_runtime_get_sync insteat of auto_resume to get
* reference and make sure runtime_suspend wont get called.
*/
ret = cnss_pci_pm_runtime_get_sync(pci_priv, RTPM_ID_CNSS);
if (ret < 0)
goto runtime_pm_put;
if (!pci_priv->is_smmu_fault)
cnss_pci_mhi_reg_dump(pci_priv);
@@ -5606,6 +5611,8 @@ int cnss_pci_force_fw_assert_hdlr(struct cnss_pci_data *pci_priv)
ret = cnss_pci_check_link_status(pci_priv);
if (ret) {
cnss_pci_link_down(&pci_priv->pci_dev->dev);
cnss_pci_pm_runtime_mark_last_busy(pci_priv);
cnss_pci_pm_runtime_put_autosuspend(pci_priv, RTPM_ID_CNSS);
return 0;
}
@@ -5618,15 +5625,20 @@ int cnss_pci_force_fw_assert_hdlr(struct cnss_pci_data *pci_priv)
if (!test_bit(CNSS_MHI_POWER_ON, &pci_priv->mhi_state) ||
test_bit(CNSS_MHI_POWERING_OFF, &pci_priv->mhi_state)) {
cnss_pr_dbg("MHI is not powered on, ignore RDDM failure\n");
cnss_pci_pm_runtime_mark_last_busy(pci_priv);
cnss_pci_pm_runtime_put_autosuspend(pci_priv, RTPM_ID_CNSS);
return 0;
}
cnss_fatal_err("Failed to trigger RDDM, err = %d\n", ret);
if (!cnss_pci_assert_host_sol(pci_priv))
if (!cnss_pci_assert_host_sol(pci_priv)) {
cnss_pci_pm_runtime_mark_last_busy(pci_priv);
cnss_pci_pm_runtime_put_autosuspend(pci_priv, RTPM_ID_CNSS);
return 0;
}
cnss_pci_dump_debug_reg(pci_priv);
cnss_schedule_recovery(&pci_priv->pci_dev->dev,
CNSS_REASON_DEFAULT);
return ret;
goto runtime_pm_put;
}
if (pci_priv->is_smmu_fault) {
@@ -5639,7 +5651,10 @@ int cnss_pci_force_fw_assert_hdlr(struct cnss_pci_data *pci_priv)
jiffies + msecs_to_jiffies(DEV_RDDM_TIMEOUT));
}
return 0;
runtime_pm_put:
cnss_pci_pm_runtime_mark_last_busy(pci_priv);
cnss_pci_pm_runtime_put_autosuspend(pci_priv, RTPM_ID_CNSS);
return ret;
}
static void cnss_pci_add_dump_seg(struct cnss_pci_data *pci_priv,