| Message ID | 20200504202243.5476-1-sibis@codeaurora.org |
|---|---|
| Headers | show |
| Series | DDR/L3 Scaling support on SDM845 and SC7180 SoCs | expand |
On 05-05-20, 01:52, Sibi Sankar wrote: > Add support for setting tags on icc paths associated with > the opp_table. > > Signed-off-by: Sibi Sankar <sibis@codeaurora.org> > --- > drivers/opp/of.c | 25 +++++++++++++++++++------ > 1 file changed, 19 insertions(+), 6 deletions(-) Maybe this should be part of Georgi's series ?
On 2020-05-05 10:20, Viresh Kumar wrote: > On 05-05-20, 01:52, Sibi Sankar wrote: >> Add support to parse optional OPP table attached to the cpu node when >> the OPP bandwidth values are populated. This allows for scaling of >> DDR/L3 bandwidth levels with frequency change. >> >> Signed-off-by: Sibi Sankar <sibis@codeaurora.org> > > What about using opp_set_rate instead ? I can't use opp_set_rate since the cpu dev does not have a clock associated with it and the scaling is done through writing on perf state register.
On Tue, May 5, 2020 at 1:54 AM Sibi Sankar <sibis@codeaurora.org> wrote: > > This patch series aims to extend cpu based scaling support to L3/DDR on > SDM845 and SC7180 SoCs. > > Patches [1-3] - Blacklist SDM845 and SC7180 in cpufreq-dt-platdev > Patches [4-8] - Update bw levels based on cpu frequency change > Patches [9-10] - Add tag setting support to OPP > Patches [11-12] - Add the cpu opp tables for SDM845 and SC7180 SoCs. > > Depends on the following series: > https://lore.kernel.org/patchwork/cover/1230626/ Are there any other dependencies for this series? I tried applying this on top of Georgi's series on v5.7-rc3. Patch 12 didn't apply cleanly and needed a manual fixup for the include change. Compilation failed with: Error: /home/amit/work/sources/worktree-review-pipeline/arch/arm64/boot/dts/qcom/sc7180.dtsi:101.30-31 syntax error FATAL ERROR: Unable to parse input tree I've been squinting at the offending lines with no success: interconnects = <&gem_noc MASTER_APPSS_PROC &mc_virt SLAVE_EBI1>, <&osm_l3 MASTER_OSM_L3_APPS &osm_l3 SLAVE_OSM_L3>; > Georgi, > Would it make sense to include tag support patches [9-10] in your next > re-spin? > > V4: > * Migrate to using Georgi's new bindings > * Misc fixups based on Matthias comments > * API fixups based on Bjorn's comments on v2 > * Picked up a few R-bs from Matthias > > v3: > * Migrated to using Saravana's opp-kBps bindings [1] > * Fixed some misc comments from Rajendra > * Added support for SC7180 > > v2: > * Incorporated Viresh's comments from: > https://lore.kernel.org/lkml/20190410102429.r6j6brm5kspmqxc3@vireshk-i7/ > https://lore.kernel.org/lkml/20190410112516.gnh77jcwawvld6et@vireshk-i7/ > * Dropped cpufreq-map passive governor > > Sibi Sankar (12): > arm64: dts: qcom: sdm845: Add SoC compatible to MTP > cpufreq: blacklist SDM845 in cpufreq-dt-platdev > cpufreq: blacklist SC7180 in cpufreq-dt-platdev > OPP: Add and export helper to update voltage > OPP: Add and export helper to set bandwidth > cpufreq: qcom: Update the bandwidth levels on frequency change > OPP: Add and export helper to get icc path count > cpufreq: qcom: Disable fast switch when scaling ddr/l3 > dt-bindings: interconnect: Add interconnect-tags bindings > OPP: Add support for setting interconnect-tags > arm64: dts: qcom: sdm845: Add cpu OPP tables > arm64: dts: qcom: sc7180: Add cpu OPP tables > > .../bindings/interconnect/interconnect.txt | 5 + > arch/arm64/boot/dts/qcom/sc7180.dtsi | 168 ++++++++++++ > arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 2 +- > arch/arm64/boot/dts/qcom/sdm845.dtsi | 258 ++++++++++++++++++ > drivers/cpufreq/cpufreq-dt-platdev.c | 2 + > drivers/cpufreq/qcom-cpufreq-hw.c | 89 +++++- > drivers/opp/core.c | 114 ++++++++ > drivers/opp/of.c | 25 +- > include/linux/pm_opp.h | 22 ++ > 9 files changed, 675 insertions(+), 10 deletions(-) > > -- > The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, > a Linux Foundation Collaborative Project
Hey Amit, Thanks for taking time to review the series! On 2020-05-06 18:08, Amit Kucheria wrote: > On Tue, May 5, 2020 at 1:54 AM Sibi Sankar <sibis@codeaurora.org> > wrote: >> >> This patch series aims to extend cpu based scaling support to L3/DDR >> on >> SDM845 and SC7180 SoCs. >> >> Patches [1-3] - Blacklist SDM845 and SC7180 in cpufreq-dt-platdev >> Patches [4-8] - Update bw levels based on cpu frequency change >> Patches [9-10] - Add tag setting support to OPP >> Patches [11-12] - Add the cpu opp tables for SDM845 and SC7180 SoCs. >> >> Depends on the following series: >> https://lore.kernel.org/patchwork/cover/1230626/ > > Are there any other dependencies for this series? I tried applying > this on top of Georgi's series on v5.7-rc3. Patch 12 didn't apply > cleanly and needed a manual fixup for the include change. > When I posted out it was based on next-20200428 tree, there shouldn't be any other dependency needed. > Compilation failed with: > Error: > /home/amit/work/sources/worktree-review-pipeline/arch/arm64/boot/dts/qcom/sc7180.dtsi:101.30-31 > syntax error > FATAL ERROR: Unable to parse input tree > > I've been squinting at the offending lines with no success: > interconnects = <&gem_noc MASTER_APPSS_PROC > &mc_virt SLAVE_EBI1>, > <&osm_l3 MASTER_OSM_L3_APPS > &osm_l3 SLAVE_OSM_L3>; > #include <dt-bindings/interconnect/qcom,sc7180.h> You are probably missing ^^ which is present in next. >> Georgi, >> Would it make sense to include tag support patches [9-10] in your >> next >> re-spin? >> >> V4: >> * Migrate to using Georgi's new bindings >> * Misc fixups based on Matthias comments >> * API fixups based on Bjorn's comments on v2 >> * Picked up a few R-bs from Matthias >> >> v3: >> * Migrated to using Saravana's opp-kBps bindings [1] >> * Fixed some misc comments from Rajendra >> * Added support for SC7180 >> >> v2: >> * Incorporated Viresh's comments from: >> >> https://lore.kernel.org/lkml/20190410102429.r6j6brm5kspmqxc3@vireshk-i7/ >> >> https://lore.kernel.org/lkml/20190410112516.gnh77jcwawvld6et@vireshk-i7/ >> * Dropped cpufreq-map passive governor >> >> Sibi Sankar (12): >> arm64: dts: qcom: sdm845: Add SoC compatible to MTP >> cpufreq: blacklist SDM845 in cpufreq-dt-platdev >> cpufreq: blacklist SC7180 in cpufreq-dt-platdev >> OPP: Add and export helper to update voltage >> OPP: Add and export helper to set bandwidth >> cpufreq: qcom: Update the bandwidth levels on frequency change >> OPP: Add and export helper to get icc path count >> cpufreq: qcom: Disable fast switch when scaling ddr/l3 >> dt-bindings: interconnect: Add interconnect-tags bindings >> OPP: Add support for setting interconnect-tags >> arm64: dts: qcom: sdm845: Add cpu OPP tables >> arm64: dts: qcom: sc7180: Add cpu OPP tables >> >> .../bindings/interconnect/interconnect.txt | 5 + >> arch/arm64/boot/dts/qcom/sc7180.dtsi | 168 ++++++++++++ >> arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 2 +- >> arch/arm64/boot/dts/qcom/sdm845.dtsi | 258 >> ++++++++++++++++++ >> drivers/cpufreq/cpufreq-dt-platdev.c | 2 + >> drivers/cpufreq/qcom-cpufreq-hw.c | 89 +++++- >> drivers/opp/core.c | 114 ++++++++ >> drivers/opp/of.c | 25 +- >> include/linux/pm_opp.h | 22 ++ >> 9 files changed, 675 insertions(+), 10 deletions(-) >> >> -- >> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora >> Forum, >> a Linux Foundation Collaborative Project
On 2020-05-05 12:49, Sibi Sankar wrote: > On 2020-05-05 10:20, Viresh Kumar wrote: >> On 05-05-20, 01:52, Sibi Sankar wrote: >>> Add support to parse optional OPP table attached to the cpu node when >>> the OPP bandwidth values are populated. This allows for scaling of >>> DDR/L3 bandwidth levels with frequency change. >>> >>> Signed-off-by: Sibi Sankar <sibis@codeaurora.org> >> >> What about using opp_set_rate instead ? > > I can't use opp_set_rate since > the cpu dev does not have a > clock associated with it and the > scaling is done through writing > on perf state register. Viresh, https://patchwork.kernel.org/cover/11548479/ GPU driver uses Georgi's series for scaling and will need a way to remove the icc votes in the suspend path, (this looks like a pattern that might be used by other clients as well) I could probably update opp_set_bw to support removing bw when NULL opp is specified. Similarly opp_set_rate will need to support set bw to 0 when set_rate is passed 0 as target freq for the same use case.
On 27-05-20, 09:23, Viresh Kumar wrote: > On 26-05-20, 23:18, Sibi Sankar wrote: > > https://patchwork.kernel.org/cover/11548479/ > > GPU driver uses Georgi's series > > for scaling and will need a way to > > remove the icc votes in the suspend > > path, (this looks like a pattern > > that might be used by other clients > > as well) I could probably update > > opp_set_bw to support removing bw > > when NULL opp is specified. Similarly > > opp_set_rate will need to support > > set bw to 0 when set_rate is passed > > 0 as target freq for the same use case. > > Sure, please send a patch for that. On a second thought, here is the patch. Please test it. -------------------------8<------------------------- Subject: [PATCH] opp: Remove bandwidth votes when target_freq is zero We already drop several votes when target_freq is set to zero, drop bandwidth votes as well. Reported-by: Sibi Sankar <sibis@codeaurora.org> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/opp/core.c | 47 +++++++++++++++++++++++++++++++++++----------- 1 file changed, 36 insertions(+), 11 deletions(-) diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 56d3022c1ca2..0c259d5ed232 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c @@ -725,6 +725,34 @@ static int _generic_set_opp_regulator(struct opp_table *opp_table, return ret; } +static int _set_opp_bw(const struct opp_table *opp_table, + struct dev_pm_opp *opp, bool remove) +{ + u32 avg, peak; + int i, ret; + + if (!opp_table->paths) + return 0; + + for (i = 0; i < opp_table->path_count; i++) { + if (remove) { + avg = 0; + peak = 0; + } else { + avg = opp->bandwidth[i].avg; + peak = opp->bandwidth[i].peak; + } + ret = icc_set_bw(opp_table->paths[i], avg, peak); + if (ret) { + dev_err(dev, "Failed to %s bandwidth[%d]: %d\n", + remove ? "remove" : "set", i, ret); + retrun ret; + } + } + + return 0; +} + static int _set_opp_custom(const struct opp_table *opp_table, struct device *dev, unsigned long old_freq, unsigned long freq, @@ -837,12 +865,17 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) if (!_get_opp_count(opp_table)) return 0; - if (!opp_table->required_opp_tables && !opp_table->regulators) { + if (!opp_table->required_opp_tables && !opp_table->regulators && + !opp_table->paths) { dev_err(dev, "target frequency can't be 0\n"); ret = -EINVAL; goto put_opp_table; } + ret = _set_opp_bw(opp_table, opp, true); + if (ret) + return ret; + if (opp_table->regulator_enabled) { regulator_disable(opp_table->regulators[0]); opp_table->regulator_enabled = false; @@ -932,16 +965,8 @@ int dev_pm_opp_set_rate(struct device *dev, unsigned long target_freq) dev_err(dev, "Failed to set required opps: %d\n", ret); } - if (!ret && opp_table->paths) { - for (i = 0; i < opp_table->path_count; i++) { - ret = icc_set_bw(opp_table->paths[i], - opp->bandwidth[i].avg, - opp->bandwidth[i].peak); - if (ret) - dev_err(dev, "Failed to set bandwidth[%d]: %d\n", - i, ret); - } - } + if (!ret) + ret = _set_opp_bw(opp_table, opp, false); put_opp: dev_pm_opp_put(opp);