asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "mhi: cntrl: qcom: remove DDR bus scale votes in fast suspends"

Browse source
This commit is contained in:
qctecmdr 2020-05-01 12:54:20 -07:00 committed by Gerrit - the friendly Code Review server
commit c73cb2e397
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/bus/mhi/controllers/mhi_arch_qcom.c
View file

@ -587,12 +587,17 @@ static int mhi_arch_drv_suspend(struct mhi_controller *mhi_cntrl)
if (cur_link_info->target_link_speed != PCI_EXP_LNKSTA_CLS_2_5GB) {
link_info.target_link_speed = PCI_EXP_LNKSTA_CLS_2_5GB;
link_info.target_link_width = cur_link_info->target_link_width;
ret = mhi_arch_pcie_scale_bw(mhi_cntrl, pci_dev, &link_info);
ret = msm_pcie_set_link_bandwidth(pci_dev,
link_info.target_link_speed,
link_info.target_link_width);
if (ret) {
MHI_CNTRL_ERR("Failed to switch Gen1 speed\n");
return -EBUSY;
}
/* no DDR votes when doing a drv suspend */
mhi_arch_set_bus_request(mhi_cntrl, 0);
bw_switched = true;
}
@ -601,9 +606,7 @@ static int mhi_arch_drv_suspend(struct mhi_controller *mhi_cntrl)
pci_dev, NULL, mhi_cntrl->wake_set ?
MSM_PCIE_CONFIG_NO_L1SS_TO : 0);
/*
* we failed to suspend and scaled down pcie bw.. need to scale up again
*/
/* failed to suspend and scaled down pcie bw, need to scale up again */
if (ret && bw_switched) {
mhi_arch_pcie_scale_bw(mhi_cntrl, pci_dev, cur_link_info);
return ret;
@ -723,10 +726,15 @@ int mhi_arch_link_resume(struct mhi_controller *mhi_cntrl)
case MHI_FAST_LINK_OFF:
ret = msm_pcie_pm_control(MSM_PCIE_RESUME, mhi_cntrl->bus,
pci_dev, NULL, 0);
if (ret ||
cur_info->target_link_speed == PCI_EXP_LNKSTA_CLS_2_5GB)
if (ret)
break;
if (cur_info->target_link_speed == PCI_EXP_LNKSTA_CLS_2_5GB) {
mhi_arch_set_bus_request(mhi_cntrl,
cur_info->target_link_speed);
break;
}
/*
* BW request from device isn't for gen 1 link speed, we can
* only print an error here.