evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "cnss2: Deinit MHI before device power on during SSR"

Browse source
This commit is contained in:
Linux Build Service Account 2017-07-21 11:08:23 -07:00 • committed by Gerrit - the friendly Code Review server
commit e3ec219ea1
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/net/wireless/cnss2/main.c
View file

@ -1100,7 +1100,8 @@ static int cnss_qca6290_powerup(struct cnss_plat_data *plat_priv)
return -ENODEV; return -ENODEV;
} }
if (plat_priv->ramdump_info_v2.dump_data_valid) { if (plat_priv->ramdump_info_v2.dump_data_valid ||
test_bit(CNSS_DRIVER_RECOVERY, &plat_priv->driver_state)) {
cnss_pci_set_mhi_state(pci_priv, CNSS_MHI_DEINIT); cnss_pci_set_mhi_state(pci_priv, CNSS_MHI_DEINIT);
cnss_pci_clear_dump_info(pci_priv); cnss_pci_clear_dump_info(pci_priv);
} }

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

@ -1392,8 +1392,12 @@ void cnss_pci_stop_mhi(struct cnss_pci_data *pci_priv)
cnss_pci_set_mhi_state_bit(pci_priv, CNSS_MHI_RESUME); cnss_pci_set_mhi_state_bit(pci_priv, CNSS_MHI_RESUME);
cnss_pci_set_mhi_state(pci_priv, CNSS_MHI_POWER_OFF); cnss_pci_set_mhi_state(pci_priv, CNSS_MHI_POWER_OFF);
if (!plat_priv->ramdump_info_v2.dump_data_valid)
cnss_pci_set_mhi_state(pci_priv, CNSS_MHI_DEINIT); if (plat_priv->ramdump_info_v2.dump_data_valid ||
test_bit(CNSS_DRIVER_RECOVERY, &plat_priv->driver_state))
return;
cnss_pci_set_mhi_state(pci_priv, CNSS_MHI_DEINIT);
} }
static int cnss_pci_probe(struct pci_dev *pci_dev, static int cnss_pci_probe(struct pci_dev *pci_dev,