A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 08:36:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "cnss2: Avoid suspending PCIe after QMI send get is called"

Browse source
This commit is contained in:
qctecmdr 2020-11-17 05:57:29 -08:00 • committed by Gerrit - the friendly Code Review server
commit 704966b60e
2 changed files with 25 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

44
drivers/net/wireless/cnss2/pci.c
View file

@ -2100,6 +2100,9 @@ static int cnss_qca6290_powerup(struct cnss_pci_data *pci_priv)
cnss_pci_deinit_mhi(pci_priv);
}
/* Clear QMI send usage count during every power up */
pci_priv->qmi_send_usage_count = 0;
retry:
ret = cnss_power_on_device(plat_priv);
if (ret) {
@ -3201,10 +3204,12 @@ int cnss_auto_suspend(struct device *dev)
return -ENODEV;
mutex_lock(&pci_priv->bus_lock);
ret = cnss_pci_suspend_bus(pci_priv);
if (ret) {
mutex_unlock(&pci_priv->bus_lock);
return ret;
if (!pci_priv->qmi_send_usage_count) {
ret = cnss_pci_suspend_bus(pci_priv);
if (ret) {
mutex_unlock(&pci_priv->bus_lock);
return ret;
}
}
cnss_pci_set_auto_suspended(pci_priv, 1);
@ -3378,15 +3383,14 @@ int cnss_pci_qmi_send_get(struct cnss_pci_data *pci_priv)
return -ENODEV;
mutex_lock(&pci_priv->bus_lock);
if (!cnss_pci_get_auto_suspended(pci_priv))
goto out;
cnss_pr_vdbg("Starting to handle get info prepare\n");
ret = cnss_pci_resume_bus(pci_priv);
out:
if (cnss_pci_get_auto_suspended(pci_priv) &&
!pci_priv->qmi_send_usage_count)
ret = cnss_pci_resume_bus(pci_priv);
pci_priv->qmi_send_usage_count++;
cnss_pr_vdbg("Increased QMI send usage count to %d\n",
pci_priv->qmi_send_usage_count);
mutex_unlock(&pci_priv->bus_lock);
return ret;
}
@ -3398,15 +3402,15 @@ int cnss_pci_qmi_send_put(struct cnss_pci_data *pci_priv)
return -ENODEV;
mutex_lock(&pci_priv->bus_lock);
if (!cnss_pci_get_auto_suspended(pci_priv))
goto out;
cnss_pr_vdbg("Starting to handle get info done\n");
ret = cnss_pci_suspend_bus(pci_priv);
out:
if (pci_priv->qmi_send_usage_count)
pci_priv->qmi_send_usage_count--;
cnss_pr_vdbg("Decreased QMI send usage count to %d\n",
pci_priv->qmi_send_usage_count);
if (cnss_pci_get_auto_suspended(pci_priv) &&
!pci_priv->qmi_send_usage_count)
ret = cnss_pci_suspend_bus(pci_priv);
mutex_unlock(&pci_priv->bus_lock);
return ret;
}

1
drivers/net/wireless/cnss2/pci.h
View file

@ -90,6 +90,7 @@ struct cnss_pci_data {
atomic_t auto_suspended;
atomic_t drv_connected;
u8 drv_connected_last;
u32 qmi_send_usage_count;
u16 def_link_speed;
u16 def_link_width;
struct completion wake_event;