lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "cnss2: Properly send adsp power collapse enable/disable cmds"

Browse Source
This commit is contained in:
qctecmdr 2021-06-07 10:41:39 -07:00 committed by Gerrit - the friendly Code Review server
commit 20fbe1a9a1
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/cnss2/main.c
View File

@ -3053,6 +3053,10 @@ static void cnss_init_control_params(struct cnss_plat_data *plat_priv)
plat_priv->ctrl_params.qmi_timeout = CNSS_QMI_TIMEOUT_DEFAULT;
plat_priv->ctrl_params.bdf_type = CNSS_BDF_TYPE_DEFAULT;
plat_priv->ctrl_params.time_sync_period = CNSS_TIME_SYNC_PERIOD_DEFAULT;
/* Set adsp_pc_enabled default value to true as ADSP pc is always
* enabled by default
*/
plat_priv->adsp_pc_enabled = true;
}
static void cnss_get_pm_domain_info(struct cnss_plat_data *plat_priv)

1
drivers/net/wireless/cnss2/main.h
View File

@ -505,6 +505,7 @@ struct cnss_plat_data {
u32 is_converged_dt;
struct device_node *dev_node;
u64 feature_list;
bool adsp_pc_enabled;
};
#ifdef CONFIG_ARCH_QCOM

8
drivers/net/wireless/cnss2/pci.c
View File

@ -1802,6 +1802,13 @@ static int cnss_wlan_adsp_pc_enable(struct cnss_pci_data *pci_priv,
struct pci_dev *pci_dev = pci_priv->pci_dev;
int ret = 0;
u32 pm_options = PM_OPTIONS_DEFAULT;
struct cnss_plat_data *plat_priv = pci_priv->plat_priv;
if (plat_priv->adsp_pc_enabled == control) {
cnss_pr_dbg("ADSP power collapse already %s\n",
control ? "Enabled" : "Disabled");
return 0;
}
if (control)
pm_options &= ~MSM_PCIE_CONFIG_NO_DRV_PC;
@ -1814,6 +1821,7 @@ static int cnss_wlan_adsp_pc_enable(struct cnss_pci_data *pci_priv,
return ret;
cnss_pr_dbg("%s ADSP power collapse\n", control ? "Enable" : "Disable");
plat_priv->adsp_pc_enabled = control;
return 0;
}
#else