android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "icnss2: Check for SSR before SOC Wake request"

Browse Source
This commit is contained in:
qctecmdr 2023-03-16 06:23:17 -07:00 committed by Gerrit - the friendly Code Review server
commit 54c880f0d9
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/soc/qcom/icnss2/main.c
View File

@ -488,8 +488,12 @@ static int icnss_send_smp2p(struct icnss_priv *priv,
return ret;
}
if (test_bit(ICNSS_FW_DOWN, &priv->state))
return -ENODEV;
if (test_bit(ICNSS_FW_DOWN, &priv->state) ||
!test_bit(ICNSS_FW_READY, &priv->state)) {
icnss_pr_smp2p("FW down, ignoring sending SMP2P state: 0x%lx\n",
priv->state);
return -EINVAL;
}
value |= priv->smp2p_info[smp2p_entry].seq++;
value <<= ICNSS_SMEM_SEQ_NO_POS;
@ -3197,6 +3201,13 @@ int icnss_force_wake_request(struct device *dev)
return -EINVAL;
}
if (test_bit(ICNSS_FW_DOWN, &priv->state) ||
!test_bit(ICNSS_FW_READY, &priv->state)) {
icnss_pr_soc_wake("FW down, ignoring SOC Wake request state: 0x%lx\n",
priv->state);
return -EINVAL;
}
if (atomic_inc_not_zero(&priv->soc_wake_ref_count)) {
icnss_pr_soc_wake("SOC already awake, Ref count: %d",
atomic_read(&priv->soc_wake_ref_count));
@ -3226,6 +3237,13 @@ int icnss_force_wake_release(struct device *dev)
return -EINVAL;
}
if (test_bit(ICNSS_FW_DOWN, &priv->state) ||
!test_bit(ICNSS_FW_READY, &priv->state)) {
icnss_pr_soc_wake("FW down, ignoring SOC Wake release state: 0x%lx\n",
priv->state);
return -EINVAL;
}
icnss_pr_soc_wake("Calling SOC Wake response");
if (atomic_read(&priv->soc_wake_ref_count) &&