mirror of
https://github.com/torvalds/linux.git
synced 2026-05-28 09:04:39 +02:00
Merge branch 'pci/controller/qcom'
- Look up OPP using both frequency and data rate (not just frequency) so RPMh votes can account for both (Krishna Chaitanya Chundru) * pci/controller/qcom: PCI: qcom: Use frequency and level based OPP lookup
This commit is contained in:
commit
368485218c
|
|
@ -1567,6 +1567,7 @@ static void qcom_pcie_icc_opp_update(struct qcom_pcie *pcie)
|
|||
{
|
||||
u32 offset, status, width, speed;
|
||||
struct dw_pcie *pci = pcie->pci;
|
||||
struct dev_pm_opp_key key = {};
|
||||
unsigned long freq_kbps;
|
||||
struct dev_pm_opp *opp;
|
||||
int ret, freq_mbps;
|
||||
|
|
@ -1594,8 +1595,20 @@ static void qcom_pcie_icc_opp_update(struct qcom_pcie *pcie)
|
|||
return;
|
||||
|
||||
freq_kbps = freq_mbps * KILO;
|
||||
opp = dev_pm_opp_find_freq_exact(pci->dev, freq_kbps * width,
|
||||
true);
|
||||
opp = dev_pm_opp_find_level_exact(pci->dev, speed);
|
||||
if (IS_ERR(opp)) {
|
||||
/* opp-level is not defined use only frequency */
|
||||
opp = dev_pm_opp_find_freq_exact(pci->dev, freq_kbps * width,
|
||||
true);
|
||||
} else {
|
||||
/* put opp-level OPP */
|
||||
dev_pm_opp_put(opp);
|
||||
|
||||
key.freq = freq_kbps * width;
|
||||
key.level = speed;
|
||||
key.bw = 0;
|
||||
opp = dev_pm_opp_find_key_exact(pci->dev, &key, true);
|
||||
}
|
||||
if (!IS_ERR(opp)) {
|
||||
ret = dev_pm_opp_set_opp(pci->dev, opp);
|
||||
if (ret)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user