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-08 12:58:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "cnss2: Set PCIe link state in proper state during resume"

Browse source
This commit is contained in:
qctecmdr 2020-08-27 04:10:53 -07:00 • committed by Gerrit - the friendly Code Review server
commit 4ac26a7bf5
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -366,19 +366,20 @@ int cnss_pci_check_link_status(struct cnss_pci_data *pci_priv)
u16 device_id;
if (pci_priv->pci_link_state == PCI_LINK_DOWN) {
cnss_pr_dbg("PCIe link is suspended\n");
cnss_pr_dbg("%ps: PCIe link is suspended\n", (void *)_RET_IP_);
return -EACCES;
}
if (pci_priv->pci_link_down_ind) {
cnss_pr_err("PCIe link is down\n");
cnss_pr_err("%ps: PCIe link is down\n", (void *)_RET_IP_);
return -EIO;
}
pci_read_config_word(pci_priv->pci_dev, PCI_DEVICE_ID, &device_id);
if (device_id != pci_priv->device_id) {
cnss_fatal_err("PCI device ID mismatch, link possibly down, current read ID: 0x%x, record ID: 0x%x\n",
device_id, pci_priv->device_id);
cnss_fatal_err("%ps: PCI device ID mismatch, link possibly down, current read ID: 0x%x, record ID: 0x%x\n",
(void *)_RET_IP_, device_id,
pci_priv->device_id);
return -EIO;
}
@ -2587,6 +2588,8 @@ int cnss_pci_resume_bus(struct cnss_pci_data *pci_priv)
goto out;
}
pci_priv->pci_link_state = PCI_LINK_UP;
if (pci_priv->drv_connected_last)
goto skip_enable_pci;
@ -2604,7 +2607,6 @@ int cnss_pci_resume_bus(struct cnss_pci_data *pci_priv)
skip_enable_pci:
cnss_pci_set_mhi_state(pci_priv, CNSS_MHI_RESUME);
pci_priv->pci_link_state = PCI_LINK_UP;
out:
return ret;
}
@ -3976,6 +3978,13 @@ int cnss_pci_force_fw_assert_hdlr(struct cnss_pci_data *pci_priv)
return -EINVAL;
cnss_auto_resume(&pci_priv->pci_dev->dev);
/* If link is still down here, directly trigger link down recovery */
ret = cnss_pci_check_link_status(pci_priv);
if (ret) {
cnss_pci_link_down(&pci_priv->pci_dev->dev);
return 0;
}
cnss_pci_dump_misc_reg(pci_priv);
cnss_pci_dump_shadow_reg(pci_priv);