DVFS for IO devices on sdm845 and sc7180
Subsystems (13)
v3 cover DVFS for IO devices on sdm845 and sc7180
Changes in v3:
1. Added better error handling for dev_pm_opp_of_add_table()
2. Some minor changes and fixes in PATCH 12/17 as compared to v2
3. Dropped the mmc patch since its picked up by Ulf
1. Added error handling for dev_pm_opp_set_clkname() and dev_pm_opp_of_add_table()
2. Used dev_pm_opp_put_clkname() in the cleanup path
3. Dropped the OPP patch pulled in by Viresh [1]
4. Dropped the UFS patches since they had some major rework needed because of changes that were merged in the merge window and I don't have a UFS device currently to validate the changes.
We have had support added in the OPP core for a while now to support DVFS for IO devices, and this series uses that infrastructure to add DVFS support for various IO devices in sdm845 and sc7180 SoCs.
[1] https://lkml.org/lkml/2020/4/14/98
Rajendra Nayak (17):
tty: serial: qcom_geni_serial: Use OPP API to set clk/perf state
spi: spi-geni-qcom: Use OPP API to set clk/perf state
arm64: dts: sdm845: Add OPP table for all qup devices
arm64: dts: sc7180: Add OPP table for all qup devices drm/msm/dpu: Use OPP API to set clk/perf state drm/msm: dsi: Use OPP API to set clk/perf state
arm64: dts: sdm845: Add DSI and MDP OPP tables and power-domains
arm64: dts: sc7180: Add DSI and MDP OPP tables and power-domains
mmc: sdhci-msm: Fix error handling for dev_pm_opp_of_add_table()
arm64: dts: sdm845: Add sdhc opps and power-domains
arm64: dts: sc7180: Add sdhc opps and power-domains
media: venus: core: Add support for opp tables/perf voting
arm64: dts: sdm845: Add OPP tables and power-domains for venus
arm64: dts: sc7180: Add OPP tables and power-domains for venus
spi: spi-qcom-qspi: Use OPP API to set clk/perf state
arm64: dts: sdm845: Add qspi opps and power-domains
arm64: dts: sc7180: Add qspi opps and power-domains
arch/arm64/boot/dts/qcom/sc7180.dtsi | 199 +++++++++++++++++- arch/arm64/boot/dts/qcom/sdm845.dtsi | 266 ++++++++++++++++++++++++- drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 3 +- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 25 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 + drivers/gpu/drm/msm/dsi/dsi.h | 2 + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 4 +- drivers/gpu/drm/msm/dsi/dsi_host.c | 58 ++++++ drivers/media/platform/qcom/venus/core.c | 28 +++ drivers/media/platform/qcom/venus/core.h | 5 + drivers/media/platform/qcom/venus/pm_helpers.c | 37 +++- drivers/mmc/host/sdhci-msm.c | 27 ++- drivers/spi/spi-geni-qcom.c | 26 ++- drivers/spi/spi-qcom-qspi.c | 29 ++- drivers/tty/serial/qcom_geni_serial.c | 34 +++- include/linux/qcom-geni-se.h | 4 + 16 files changed, 719 insertions(+), 32 deletions(-)
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 2/17 spi: spi-geni-qcom: Use OPP API to set clk/perf state
geni spi needs to express a perforamnce state requirement on CX depending on the frequency of the clock rates. Use OPP table from DT to register with OPP framework and use dev_pm_opp_set_rate() to set the clk/perf state.
---
This patch has a dependency on the 'PATCH 01/17' in this series, due to the changes in include/linux/qcom-geni-se.h
Its ideal if this and the previous patch gets merged via the msm tree (once reviewed and ack'ed)
Greg has already responded he is fine with it for serial.
drivers/spi/spi-geni-qcom.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)
drivers/spi/spi-geni-qcom.c +23 -3
@@ -7,6 +7,7 @@#include <linux/log2.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/pm_opp.h> #include <linux/pm_runtime.h> #include <linux/qcom-geni-se.h> #include <linux/spi/spi.h>
@@ -95,7 +96,6 @@ static int get_spi_clk_cfg(unsigned int speed_hz, {unsigned long sclk_freq;unsigned int actual_hz; -struct geni_se *se = &mas->se;int ret; ret = geni_se_clk_freq_match(&mas->se,
@@ -112,9 +112,9 @@ static int get_spi_clk_cfg(unsigned int speed_hz,dev_dbg (mas->dev,"req %u=>%u sclk %lu, idx %d, div %d\n" , speed_hz, actual_hz, sclk_freq, *clk_idx, *clk_div); - ret =clk_set_rate (se->clk, sclk_freq); + ret =dev_pm_opp_set_rate (mas->dev, sclk_freq);if (ret) -dev_err (mas->dev,"clk_set_rate failed %d\n" , ret); +dev_err (mas->dev,"dev_pm_opp_set_rate failed %d\n" , ret);return ret; }
@@ -561,6 +561,17 @@ static int spi_geni_probe(struct platform_device *pdev) mas->se.wrapper =dev_get_drvdata (dev->parent); mas->se.base = base; mas->se.clk = clk; + mas->se.opp_table =dev_pm_opp_set_clkname (&pdev->dev,"se" ); +if (IS_ERR (mas->se.opp_table)) +return PTR_ERR (mas->se.opp_table); +/* OPP table is optional */ + ret =dev_pm_opp_of_add_table (&pdev->dev); +if (!ret) { + mas->se.has_opp_table = true; + }else if (ret != -ENODEV ) { +dev_err (&pdev->dev,"Invalid OPP table in Device tree\n" ); +return ret; + } spi->bus_num =-1 ; spi->dev.of_node = dev->of_node;
@@ -596,6 +607,9 @@ static int spi_geni_probe(struct platform_device *pdev) spi_geni_probe_runtime_disable:pm_runtime_disable (dev);spi_master_put (spi); +if (mas->se.has_opp_table) +dev_pm_opp_of_remove_table (&pdev->dev); +dev_pm_opp_put_clkname (mas->se.opp_table);return ret; }
@@ -604,6 +618,9 @@ static int spi_geni_remove(struct platform_device *pdev)struct spi_master *spi =platform_get_drvdata (pdev);struct spi_geni_master *mas =spi_master_get_devdata (spi); +if (mas->se.has_opp_table) +dev_pm_opp_of_remove_table (&pdev->dev); +dev_pm_opp_put_clkname (mas->se.opp_table);/* Unregister _before_ disabling pm_runtime() so we stop transfers */ spi_unregister_master (spi);
@@ -617,6 +634,9 @@ static int __maybe_unused spi_geni_runtime_suspend(struct device *dev)struct spi_master *spi =dev_get_drvdata (dev);struct spi_geni_master *mas =spi_master_get_devdata (spi); +/* Drop the performance state vote */ +dev_pm_opp_set_rate (dev,0 ); +return geni_se_resources_off (&mas->se); }
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 1/17 tty: serial: qcom_geni_serial: Use OPP API to set clk/perf state
In reply to Rajendra Nayakgeni serial needs to express a perforamnce state requirement on CX powerdomain depending on the frequency of the clock rates. Use OPP table from DT to register with OPP framework and use dev_pm_opp_set_rate() to set the clk/perf state.
--- drivers/tty/serial/qcom_geni_serial.c | 34 +++++++++++++++++++++++++++++----- include/linux/qcom-geni-se.h | 4 ++++ 2 files changed, 33 insertions(+), 5 deletions(-)
drivers/tty/serial/qcom_geni_serial.c +29 -5
@@ -9,6 +9,7 @@#include <linux/module.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/pm_opp.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/pm_wakeirq.h>
@@ -961,7 +962,7 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport, goto out_restart_rx; uport->uartclk = clk_rate; -clk_set_rate (port->se.clk, clk_rate); +dev_pm_opp_set_rate (uport->dev, clk_rate); ser_clk_cfg =SER_CLK_EN ; ser_clk_cfg |= clk_div <<CLK_DIV_SHFT ;
@@ -1198,8 +1199,11 @@ static void qcom_geni_serial_pm(struct uart_port *uport,if (new_state ==UART_PM_STATE_ON && old_state ==UART_PM_STATE_OFF )geni_se_resources_on (&port->se);else if (new_state ==UART_PM_STATE_OFF && - old_state ==UART_PM_STATE_ON ) + old_state ==UART_PM_STATE_ON ) { +/* Drop the performance state vote */ +dev_pm_opp_set_rate (uport->dev,0 );geni_se_resources_off (&port->se); + } }static const struct uart_ops qcom_geni_console_pops = {
@@ -1318,13 +1322,25 @@ static int qcom_geni_serial_probe(struct platform_device *pdev)if (of_property_read_bool (pdev->dev.of_node,"cts-rts-swap" )) port->cts_rts_swap = true; + port->se.opp_table =dev_pm_opp_set_clkname (&pdev->dev,"se" ); +if (IS_ERR (port->se.opp_table)) +return PTR_ERR (port->se.opp_table); +/* OPP table is optional */ + ret =dev_pm_opp_of_add_table (&pdev->dev); +if (!ret) { + port->se.has_opp_table = true; + }else if (ret != -ENODEV ) { +dev_err (&pdev->dev,"Invalid OPP table in Device tree\n" ); +return ret; + } + uport->private_data = drv;platform_set_drvdata (pdev, port); port->handle_rx = console ? handle_rx_console : handle_rx_uart; ret =uart_add_one_port (drv, uport);if (ret) -return ret; + goto err;irq_set_status_flags (uport->irq,IRQ_NOAUTOEN ); ret = devm_request_irq(uport->dev, uport->irq, qcom_geni_serial_isr,
@@ -1332,7 +1348,7 @@ static int qcom_geni_serial_probe(struct platform_device *pdev)if (ret) {dev_err (uport->dev,"Failed to get IRQ ret %d\n" , ret);uart_remove_one_port (drv, uport); -return ret; + goto err; }/*
@@ -1349,11 +1365,16 @@ static int qcom_geni_serial_probe(struct platform_device *pdev)if (ret) {device_init_wakeup (&pdev->dev, false);uart_remove_one_port (drv, uport); -return ret; + goto err; } }return 0 ; +err: +if (port->se.has_opp_table) +dev_pm_opp_of_remove_table (&pdev->dev); +dev_pm_opp_put_clkname (port->se.opp_table); +return ret; }static int qcom_geni_serial_remove (struct platform_device *pdev)
@@ -1361,6 +1382,9 @@ static int qcom_geni_serial_remove(struct platform_device *pdev)struct qcom_geni_serial_port *port =platform_get_drvdata (pdev);struct uart_driver *drv = port->uport.private_data; +if (port->se.has_opp_table) +dev_pm_opp_of_remove_table (&pdev->dev); +dev_pm_opp_put_clkname (port->se.opp_table);dev_pm_clear_wake_irq (&pdev->dev);device_init_wakeup (&pdev->dev, false);uart_remove_one_port (drv, &port->uport);
include/linux/qcom-geni-se.h +4 -0
@@ -33,6 +33,8 @@ struct clk;* @clk: Handle to the core serial engine clock * @num_clk_levels: Number of valid clock levels in clk_perf_tbl * @clk_perf_tbl: Table of clock frequency input to serial engine clock +* @opp_table: Pointer to the OPP table +* @has_opp_table: Specifies if the SE has an OPP table */ struct geni_se {void __iomem *base;
@@ -41,6 +43,8 @@ struct geni_se {struct clk *clk;unsigned int num_clk_levels;unsigned long *clk_perf_tbl; +struct opp_table *opp_table; +bool has_opp_table; };/* Common SE registers */
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 3/17 arm64: dts: sdm845: Add OPP table for all qup devices
In reply to Rajendra Nayakqup has a requirement to vote on the performance state of the CX domain in sdm845 devices. Add OPP tables for these and also add power-domains property for all qup instances.
--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 115 +++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+)
arch/arm64/boot/dts/qcom/sdm845.dtsi +115 -0
@@ -804,6 +804,25 @@ clock-names = "core"; }; + qup_opp_table: qup-opp-table { + compatible = "operating-points-v2"; + + opp-19200000 { + opp-hz = /bits/ 64 <19200000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-75000000 { + opp-hz = /bits/ 64 <75000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-100000000 { + opp-hz = /bits/ 64 <100000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + }; + qupv3_id_0: geniqup@8c0000 { compatible = "qcom,geni-se-qup"; reg = <0 0x008c0000 0 0x6000>;
@@ -825,6 +844,8 @@ interrupts = <GIC_SPI 601 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -838,6 +859,8 @@ interrupts = <GIC_SPI 601 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -849,6 +872,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart0_default>; interrupts = <GIC_SPI 601 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -862,6 +887,8 @@ interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -875,6 +902,8 @@ interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -886,6 +915,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart1_default>; interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -899,6 +930,8 @@ interrupts = <GIC_SPI 603 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -912,6 +945,8 @@ interrupts = <GIC_SPI 603 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -923,6 +958,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart2_default>; interrupts = <GIC_SPI 603 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -936,6 +973,8 @@ interrupts = <GIC_SPI 604 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -949,6 +988,8 @@ interrupts = <GIC_SPI 604 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -960,6 +1001,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart3_default>; interrupts = <GIC_SPI 604 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -973,6 +1016,8 @@ interrupts = <GIC_SPI 605 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -986,6 +1031,8 @@ interrupts = <GIC_SPI 605 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -997,6 +1044,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart4_default>; interrupts = <GIC_SPI 605 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1010,6 +1059,8 @@ interrupts = <GIC_SPI 606 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1023,6 +1074,8 @@ interrupts = <GIC_SPI 606 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1034,6 +1087,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart5_default>; interrupts = <GIC_SPI 606 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1047,6 +1102,8 @@ interrupts = <GIC_SPI 607 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1060,6 +1117,8 @@ interrupts = <GIC_SPI 607 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1071,6 +1130,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart6_default>; interrupts = <GIC_SPI 607 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1084,6 +1145,8 @@ interrupts = <GIC_SPI 608 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1097,6 +1160,8 @@ interrupts = <GIC_SPI 608 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1108,6 +1173,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart7_default>; interrupts = <GIC_SPI 608 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; }; };
@@ -1133,6 +1200,8 @@ interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1146,6 +1215,8 @@ interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1157,6 +1228,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart8_default>; interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1170,6 +1243,8 @@ interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1183,6 +1258,8 @@ interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1194,6 +1271,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart9_default>; interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1207,6 +1286,8 @@ interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1220,6 +1301,8 @@ interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1231,6 +1314,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart10_default>; interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1244,6 +1329,8 @@ interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1257,6 +1344,8 @@ interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1268,6 +1357,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart11_default>; interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1281,6 +1372,8 @@ interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1294,6 +1387,8 @@ interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1305,6 +1400,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart12_default>; interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1318,6 +1415,8 @@ interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1331,6 +1430,8 @@ interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1342,6 +1443,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart13_default>; interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1355,6 +1458,8 @@ interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1368,6 +1473,8 @@ interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1379,6 +1486,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart14_default>; interrupts = <GIC_SPI 359 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1392,6 +1501,8 @@ interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1405,6 +1516,8 @@ interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -1416,6 +1529,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart15_default>; interrupts = <GIC_SPI 360 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; }; };
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 4/17 arm64: dts: sc7180: Add OPP table for all qup devices
In reply to Rajendra Nayakqup has a requirement to vote on the performance state of the CX domain in sc7180 devices. Add OPP tables for these and also add power-domains property for all qup instances.
--- arch/arm64/boot/dts/qcom/sc7180.dtsi | 79 ++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+)
arch/arm64/boot/dts/qcom/sc7180.dtsi +79 -0
@@ -417,6 +417,25 @@ status = "disabled"; }; + qup_opp_table: qup-opp-table { + compatible = "operating-points-v2"; + + opp-75000000 { + opp-hz = /bits/ 64 <75000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-100000000 { + opp-hz = /bits/ 64 <100000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-128000000 { + opp-hz = /bits/ 64 <128000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + }; + qupv3_id_0: geniqup@8c0000 { compatible = "qcom,geni-se-qup"; reg = <0 0x008c0000 0 0x6000>;
@@ -452,6 +471,8 @@ interrupts = <GIC_SPI 601 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -463,6 +484,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart0_default>; interrupts = <GIC_SPI 601 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -476,6 +499,8 @@ interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -489,6 +514,8 @@ interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -500,6 +527,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart1_default>; interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -513,6 +542,8 @@ interrupts = <GIC_SPI 603 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -524,6 +555,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart2_default>; interrupts = <GIC_SPI 603 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -537,6 +570,8 @@ interrupts = <GIC_SPI 604 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -550,6 +585,8 @@ interrupts = <GIC_SPI 604 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -561,6 +598,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart3_default>; interrupts = <GIC_SPI 604 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -574,6 +613,8 @@ interrupts = <GIC_SPI 605 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -585,6 +626,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart4_default>; interrupts = <GIC_SPI 605 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -598,6 +641,8 @@ interrupts = <GIC_SPI 606 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -611,6 +656,8 @@ interrupts = <GIC_SPI 606 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -622,6 +669,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart5_default>; interrupts = <GIC_SPI 606 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; }; };
@@ -661,6 +710,8 @@ interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -672,6 +723,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart6_default>; interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -685,6 +738,8 @@ interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -696,6 +751,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart7_default>; interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -709,6 +766,8 @@ interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -722,6 +781,8 @@ interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -733,6 +794,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart8_default>; interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -746,6 +809,8 @@ interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -757,6 +822,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart9_default>; interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -770,6 +837,8 @@ interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -783,6 +852,8 @@ interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -794,6 +865,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart10_default>; interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -807,6 +880,8 @@ interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -820,6 +895,8 @@ interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
@@ -831,6 +908,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart11_default>; interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; }; };
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 5/17 drm/msm/dpu: Use OPP API to set clk/perf state
In reply to Rajendra NayakOn some qualcomm platforms DPU needs to express a perforamnce state requirement on a power domain depennding on the clock rates. Use OPP table from DT to register with OPP framework and use dev_pm_opp_set_rate() to set the clk/perf state.
--- drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 3 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 25 ++++++++++++++++++++++++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 ++++ 3 files changed, 30 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +2 -1
@@ -7,6 +7,7 @@#include <linux/debugfs.h> #include <linux/errno.h> #include <linux/mutex.h> +#include <linux/pm_opp.h> #include <linux/sort.h> #include <linux/clk.h> #include <linux/bitmap.h>
@@ -239,7 +240,7 @@ static int _dpu_core_perf_set_core_clk_rate(struct dpu_kms *kms, u64 rate) rate = core_clk->max_rate; core_clk->rate = rate; -return msm_dss_clk_set_rate (core_clk,1 ); +return dev_pm_opp_set_rate (&kms->pdev->dev, core_clk->rate); }static u64 _dpu_core_perf_get_core_clk_rate (struct dpu_kms *kms)
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +24 -1
@@ -10,6 +10,7 @@#include <linux/debugfs.h> #include <linux/dma-buf.h> #include <linux/of_irq.h> +#include <linux/pm_opp.h> #include <drm/drm_crtc.h> #include <drm/drm_file.h>
@@ -1033,11 +1034,23 @@ static int dpu_bind(struct device *dev, struct device *master, void *data)if (!dpu_kms)return -ENOMEM ; + dpu_kms->opp_table =dev_pm_opp_set_clkname (dev,"core" ); +if (IS_ERR (dpu_kms->opp_table)) +return PTR_ERR (dpu_kms->opp_table); +/* OPP table is optional */ + ret =dev_pm_opp_of_add_table (dev); +if (!ret) { + dpu_kms->has_opp_table = true; + }else if (ret != -ENODEV ) { +dev_err (dev,"Invalid OPP table in Device tree\n" ); +return ret; + } + mp = &dpu_kms->mp; ret =msm_dss_parse_clock (pdev, mp);if (ret) {DPU_ERROR ("failed to parse clocks, ret=%d\n" , ret); -return ret; + goto err; }platform_set_drvdata (pdev, dpu_kms);
@@ -1051,6 +1064,11 @@ static int dpu_bind(struct device *dev, struct device *master, void *data) priv->kms = &dpu_kms->base;return ret; +err: +if (dpu_kms->has_opp_table) +dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (dpu_kms->opp_table); +return ret; }static void dpu_unbind (struct device *dev,struct device *master,void *data)
@@ -1059,6 +1077,9 @@ static void dpu_unbind(struct device *dev, struct device *master, void *data)struct dpu_kms *dpu_kms =platform_get_drvdata (pdev);struct dss_module_power *mp = &dpu_kms->mp; +if (dpu_kms->has_opp_table) +dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (dpu_kms->opp_table);msm_dss_put_clk (mp->clk_config, mp->num_clk);devm_kfree (&pdev->dev, mp->clk_config); mp->num_clk =0 ;
@@ -1090,6 +1111,8 @@ static int __maybe_unused dpu_runtime_suspend(struct device *dev)struct dpu_kms *dpu_kms =platform_get_drvdata (pdev);struct dss_module_power *mp = &dpu_kms->mp; +/* Drop the performance state vote */ +dev_pm_opp_set_rate (dev,0 ); rc =msm_dss_enable_clk (mp->clk_config, mp->num_clk, false);if (rc)DPU_ERROR ("clock disable failed rc:%d\n" , rc);
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +4 -0
@@ -128,6 +128,10 @@ struct dpu_kms {struct platform_device *pdev;bool rpm_enabled; + +struct opp_table *opp_table; +bool has_opp_table; +struct dss_module_power mp;/* reference count bandwidth requests, so we know when we can
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 6/17 drm/msm: dsi: Use OPP API to set clk/perf state
In reply to Rajendra NayakOn SDM845 DSI needs to express a perforamnce state requirement on a power domain depending on the clock rates. Use OPP table from DT to register with OPP framework and use dev_pm_opp_set_rate() to set the clk/perf state.
--- drivers/gpu/drm/msm/dsi/dsi.h | 2 ++ drivers/gpu/drm/msm/dsi/dsi_cfg.c | 4 +-- drivers/gpu/drm/msm/dsi/dsi_host.c | 58 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 2 deletions(-)
drivers/gpu/drm/msm/dsi/dsi.h +2 -0
@@ -180,10 +180,12 @@ int msm_dsi_runtime_suspend(struct device *dev);int msm_dsi_runtime_resume (struct device *dev);int dsi_link_clk_set_rate_6g (struct msm_dsi_host *msm_host);int dsi_link_clk_set_rate_v2 (struct msm_dsi_host *msm_host); +int dsi_link_clk_set_rate_6g_v2 (struct msm_dsi_host *msm_host);int dsi_link_clk_enable_6g (struct msm_dsi_host *msm_host);int dsi_link_clk_enable_v2 (struct msm_dsi_host *msm_host);void dsi_link_clk_disable_6g (struct msm_dsi_host *msm_host);void dsi_link_clk_disable_v2 (struct msm_dsi_host *msm_host); +void dsi_link_clk_disable_6g_v2 (struct msm_dsi_host *msm_host);int dsi_tx_buf_alloc_6g (struct msm_dsi_host *msm_host,int size);int dsi_tx_buf_alloc_v2 (struct msm_dsi_host *msm_host,int size);void *dsi_tx_buf_get_6g (struct msm_dsi_host *msm_host);
drivers/gpu/drm/msm/dsi/dsi_cfg.c +2 -2
@@ -210,9 +210,9 @@ static const struct msm_dsi_host_cfg_ops msm_dsi_6g_host_ops = { };static const struct msm_dsi_host_cfg_ops msm_dsi_6g_v2_host_ops = { - .link_clk_set_rate = dsi_link_clk_set_rate_6g, + .link_clk_set_rate = dsi_link_clk_set_rate_6g_v2, .link_clk_enable = dsi_link_clk_enable_6g, - .link_clk_disable = dsi_link_clk_disable_6g, + .link_clk_disable = dsi_link_clk_disable_6g_v2, .clk_init_ver = dsi_clk_init_6g_v2, .tx_buf_alloc = dsi_tx_buf_alloc_6g, .tx_buf_get = dsi_tx_buf_get_6g,
drivers/gpu/drm/msm/dsi/dsi_host.c +58 -0
94 lines not on this page · raw message
Signature · 6 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 7/17 arm64: dts: sdm845: Add DSI and MDP OPP tables and power-domains
In reply to Rajendra NayakAdd the OPP tables for DSI and MDP based on the perf state/clk requirements, and add the power-domains property to specify the scalable power domain.
--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 59 ++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+)
arch/arm64/boot/dts/qcom/sdm845.dtsi +59 -0
@@ -3309,6 +3309,59 @@ #reset-cells = <1>; }; + mdp_opp_table: mdp-opp-table { + compatible = "operating-points-v2"; + + opp-19200000 { + opp-hz = /bits/ 64 <19200000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-171428571 { + opp-hz = /bits/ 64 <171428571>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-344000000 { + opp-hz = /bits/ 64 <344000000>; + required-opps = <&rpmhpd_opp_svs_l1>; + }; + + opp-430000000 { + opp-hz = /bits/ 64 <430000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + }; + + dsi_opp_table: dsi-opp-table { + compatible = "operating-points-v2"; + + opp-19200000 { + opp-hz = /bits/ 64 <19200000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-180000000 { + opp-hz = /bits/ 64 <180000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-275000000 { + opp-hz = /bits/ 64 <275000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-328580000 { + opp-hz = /bits/ 64 <328580000>; + required-opps = <&rpmhpd_opp_svs_l1>; + }; + + opp-358000000 { + opp-hz = /bits/ 64 <358000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + }; + mdss: mdss@ae00000 { compatible = "qcom,sdm845-mdss"; reg = <0 0x0ae00000 0 0x1000>;
@@ -3353,6 +3406,8 @@ <&dispcc DISP_CC_MDSS_VSYNC_CLK>; assigned-clock-rates = <300000000>, <19200000>; + operating-points-v2 = <&mdp_opp_table>; + power-domains = <&rpmhpd SDM845_CX>; interrupt-parent = <&mdss>; interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
@@ -3399,6 +3454,8 @@ "core", "iface", "bus"; + operating-points-v2 = <&dsi_opp_table>; + power-domains = <&rpmhpd SDM845_CX>; phys = <&dsi0_phy>; phy-names = "dsi";
@@ -3463,6 +3520,8 @@ "core", "iface", "bus"; + operating-points-v2 = <&dsi_opp_table>; + power-domains = <&rpmhpd SDM845_CX>; phys = <&dsi1_phy>; phy-names = "dsi";
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 9/17 mmc: sdhci-msm: Fix error handling for dev_pm_opp_of_add_table()
In reply to Rajendra NayakEven though specifying OPP's in device tree is optional, ignoring all errors reported by dev_pm_opp_of_add_table() means we can't distinguish between a missing OPP table and a wrong/buggy OPP table. While missing OPP table (dev_pm_opp_of_add_table() returns a -ENODEV in such case) can be ignored, a wrong/buggy OPP table in device tree should make the driver error out.
while we fix that, lets also fix the variable names for opp/opp_table to avoid confusion and name them opp_table/has_opp_table instead.
--- drivers/mmc/host/sdhci-msm.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-)
drivers/mmc/host/sdhci-msm.c +16 -11
@@ -244,8 +244,8 @@ struct sdhci_msm_host {struct clk_bulk_data bulk_clks[4 ];/* core, iface, cal, sleep clocks */ unsigned long clk_rate;struct mmc_host *mmc; -struct opp_table *opp; -bool opp_table; +struct opp_table *opp_table; +bool has_opp_table;bool use_14lpp_dll_reset;bool tuning_done;bool calibration_done;
@@ -1967,15 +1967,20 @@ static int sdhci_msm_probe(struct platform_device *pdev) } msm_host->bulk_clks[0 ].clk = clk; - msm_host->opp =dev_pm_opp_set_clkname (&pdev->dev,"core" ); -if (IS_ERR (msm_host->opp)) { - ret =PTR_ERR (msm_host->opp); + msm_host->opp_table =dev_pm_opp_set_clkname (&pdev->dev,"core" ); +if (IS_ERR (msm_host->opp_table)) { + ret =PTR_ERR (msm_host->opp_table); goto bus_clk_disable; }/* OPP table is optional */ -if (!dev_pm_opp_of_add_table (&pdev->dev)) - msm_host->opp_table = true; + ret =dev_pm_opp_of_add_table (&pdev->dev); +if (!ret) { + msm_host->has_opp_table = true; + }else if (ret != -ENODEV ) { +dev_err (&pdev->dev,"Invalid OPP table in Device tree\n" ); + goto opp_cleanup; + }/* Vote for maximum clock rate for maximum performance */ ret =dev_pm_opp_set_rate (&pdev->dev,INT_MAX );
@@ -2133,9 +2138,9 @@ static int sdhci_msm_probe(struct platform_device *pdev)clk_bulk_disable_unprepare (ARRAY_SIZE (msm_host->bulk_clks), msm_host->bulk_clks); opp_cleanup: -if (msm_host->opp_table) +if (msm_host->has_opp_table)dev_pm_opp_of_remove_table (&pdev->dev); -dev_pm_opp_put_clkname (msm_host->opp); +dev_pm_opp_put_clkname (msm_host->opp_table); bus_clk_disable:if (!IS_ERR (msm_host->bus_clk))clk_disable_unprepare (msm_host->bus_clk);
@@ -2154,9 +2159,9 @@ static int sdhci_msm_remove(struct platform_device *pdev)sdhci_remove_host (host, dead); -if (msm_host->opp_table) +if (msm_host->has_opp_table)dev_pm_opp_of_remove_table (&pdev->dev); -dev_pm_opp_put_clkname (msm_host->opp); +dev_pm_opp_put_clkname (msm_host->opp_table);pm_runtime_get_sync (&pdev->dev);pm_runtime_disable (&pdev->dev);pm_runtime_put_noidle (&pdev->dev);
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 8/17 arm64: dts: sc7180: Add DSI and MDP OPP tables and power-domains
In reply to Rajendra NayakAdd the OPP tables for DSI and MDP based on the perf state/clk requirements, and add the power-domains property to specify the scalable power domain.
--- arch/arm64/boot/dts/qcom/sc7180.dtsi | 48 ++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+)
arch/arm64/boot/dts/qcom/sc7180.dtsi +48 -0
@@ -1581,6 +1581,49 @@ qcom,bcm-voters = <&apps_bcm_voter>; }; + mdp_opp_table: mdp-opp-table { + compatible = "operating-points-v2"; + + opp-200000000 { + opp-hz = /bits/ 64 <200000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-300000000 { + opp-hz = /bits/ 64 <300000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-345000000 { + opp-hz = /bits/ 64 <345000000>; + required-opps = <&rpmhpd_opp_svs_l1>; + }; + + opp-460000000 { + opp-hz = /bits/ 64 <460000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + }; + + dsi_opp_table: dsi-opp-table { + compatible = "operating-points-v2"; + + opp-187500000 { + opp-hz = /bits/ 64 <187500000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-300000000 { + opp-hz = /bits/ 64 <300000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-358000000 { + opp-hz = /bits/ 64 <358000000>; + required-opps = <&rpmhpd_opp_svs_l1>; + }; + }; + mdss: mdss@ae00000 { compatible = "qcom,sc7180-mdss"; reg = <0 0x0ae00000 0 0x1000>;
@@ -1626,6 +1669,8 @@ <&dispcc DISP_CC_MDSS_VSYNC_CLK>; assigned-clock-rates = <300000000>, <19200000>; + operating-points-v2 = <&mdp_opp_table>; + power-domains = <&rpmhpd SC7180_CX>; interrupt-parent = <&mdss>; interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
@@ -1666,6 +1711,9 @@ "iface", "bus"; + operating-points-v2 = <&dsi_opp_table>; + power-domains = <&rpmhpd SC7180_CX>; + phys = <&dsi_phy>; phy-names = "dsi";
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 11/17 arm64: dts: sc7180: Add sdhc opps and power-domains
In reply to Rajendra NayakAdd the power domain supporting performance state and the corresponding OPP tables for the sdhc device on sdm845.
--- arch/arm64/boot/dts/qcom/sc7180.dtsi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/arm64/boot/dts/qcom/sc7180.dtsi +16 -0
@@ -390,6 +390,20 @@ }; }; + sdhc1_opp_table: sdhc1-opp-table { + compatible = "operating-points-v2"; + + opp-100000000 { + opp-hz = /bits/ 64 <100000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-384000000 { + opp-hz = /bits/ 64 <384000000>; + required-opps = <&rpmhpd_opp_svs_l1>; + }; + }; + sdhc_1: sdhci@7c4000 { compatible = "qcom,sc7180-sdhci", "qcom,sdhci-msm-v5"; reg = <0 0x7c4000 0 0x1000>,
@@ -404,6 +418,8 @@ clocks = <&gcc GCC_SDCC1_APPS_CLK>, <&gcc GCC_SDCC1_AHB_CLK>; clock-names = "core", "iface"; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&sdhc1_opp_table>; bus-width = <8>; non-removable;
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 12/17 media: venus: core: Add support for opp tables/perf voting
In reply to Rajendra NayakAdd support to add OPP tables and perf voting on the OPP powerdomain. This is needed so venus votes on the corresponding performance state for the OPP powerdomain along with setting the core clock rate.
--- drivers/media/platform/qcom/venus/core.c | 28 +++++++++++++++++++ drivers/media/platform/qcom/venus/core.h | 5 ++++ drivers/media/platform/qcom/venus/pm_helpers.c | 37 +++++++++++++++++++++++--- 3 files changed, 66 insertions(+), 4 deletions(-)
drivers/media/platform/qcom/venus/core.c +28 -0
@@ -12,6 +12,7 @@#include <linux/platform_device.h> #include <linux/slab.h> #include <linux/types.h> +#include <linux/pm_opp.h> #include <linux/pm_runtime.h> #include <media/videobuf2-v4l2.h> #include <media/v4l2-mem2mem.h>
@@ -214,6 +215,20 @@ static int venus_probe(struct platform_device *pdev)if (!core->pm_ops)return -ENODEV ; + core->opp_table =dev_pm_opp_set_clkname (dev,"core" ); +if (IS_ERR (core->opp_table)) +return PTR_ERR (core->opp_table); + +if (core->res->opp_pmdomain) { + ret =dev_pm_opp_of_add_table (dev); +if (!ret) { + core->has_opp_table = true; + }else if (ret != -ENODEV ) { +dev_err (dev,"Invalid OPP table in Device tree\n" ); +return ret; + } + } +if (core->pm_ops->core_get) { ret = core->pm_ops->core_get (dev);if (ret)
@@ -301,6 +316,9 @@ static int venus_probe(struct platform_device *pdev) err_venus_shutdown:venus_shutdown (core); err_runtime_disable: +if (core->res->opp_pmdomain && core->has_opp_table) +dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (core->opp_table);pm_runtime_set_suspended (dev);pm_runtime_disable (dev);hfi_destroy (core);
@@ -326,6 +344,10 @@ static int venus_remove(struct platform_device *pdev)venus_firmware_deinit (core); +if (core->res->opp_pmdomain && core->has_opp_table) +dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (core->opp_table); +pm_runtime_put_sync (dev);pm_runtime_disable (dev);
@@ -350,6 +372,10 @@ static __maybe_unused int venus_runtime_suspend(struct device *dev)if (ret)return ret; +/* Drop the performance state vote */ +if (core->opp_pmdomain) +dev_pm_opp_set_rate (dev,0 ); +if (pm_ops->core_power) ret = pm_ops->core_power (dev,POWER_OFF );
@@ -511,6 +537,7 @@ static const struct venus_resources sdm845_res_v2 = { .vcodec_clks_num = 2, .vcodec_pmdomains = { "venus", "vcodec0", "vcodec1" }, .vcodec_pmdomains_num = 3, + .opp_pmdomain = (const char *[]) { "opp-pd", NULL }, .vcodec_num = 2, .max_load = 3110400, /* 4096x2160@90 */ .hfi_version = HFI_VERSION_4XX,
@@ -556,6 +583,7 @@ static const struct venus_resources sc7180_res = { .vcodec_clks_num = 2, .vcodec_pmdomains = { "venus", "vcodec0" }, .vcodec_pmdomains_num = 2, + .opp_pmdomain = (const char *[]) { "opp-pd", NULL }, .vcodec_num = 1, .hfi_version = HFI_VERSION_4XX, .vmem_id = VIDC_RESOURCE_NONE,
drivers/media/platform/qcom/venus/core.h +5 -0
@@ -62,6 +62,7 @@ struct venus_resources {unsigned int vcodec_clks_num;const char *const vcodec_pmdomains[VIDC_PMDOMAINS_NUM_MAX ];unsigned int vcodec_pmdomains_num; +const char **opp_pmdomain;unsigned int vcodec_num;enum hfi_version hfi_version;u32 max_load;
@@ -144,8 +145,12 @@ struct venus_core {struct clk *vcodec1_clks[VIDC_VCODEC_CLKS_NUM_MAX ];struct icc_path *video_path;struct icc_path *cpucfg_path; +struct opp_table *opp_table; +bool has_opp_table;struct device_link *pd_dl_venus;struct device *pmdomains[VIDC_PMDOMAINS_NUM_MAX ]; +struct device_link *opp_dl_venus; +struct device *opp_pmdomain;struct video_device *vdev_dec;struct video_device *vdev_enc;struct v4l2_device v4l2_dev;
drivers/media/platform/qcom/venus/pm_helpers.c +33 -4
@@ -9,6 +9,7 @@#include <linux/iopoll.h> #include <linux/kernel.h> #include <linux/pm_domain.h> +#include <linux/pm_opp.h> #include <linux/pm_runtime.h> #include <linux/types.h> #include <media/v4l2-mem2mem.h>
@@ -66,10 +67,9 @@ static void core_clks_disable(struct venus_core *core)static int core_clks_set_rate (struct venus_core *core,unsigned long freq) { -struct clk *clk = core->clks[0 ];int ret; - ret =clk_set_rate (clk, freq); + ret =dev_pm_opp_set_rate (core->dev, freq);if (ret)return ret;
@@ -740,13 +740,15 @@ static int venc_power_v4(struct device *dev, int on)static int vcodec_domains_get (struct device *dev) { +struct opp_table *opp_table; +struct device **opp_virt_dev;struct venus_core *core =dev_get_drvdata (dev);const struct venus_resources *res = core->res;struct device *pd;unsigned int i;if (!res->vcodec_pmdomains_num) -return -ENODEV ; + goto skip_pmdomains;for (i =0 ; i < res->vcodec_pmdomains_num; i++) { pd = dev_pm_domain_attach_by_name(dev,
@@ -763,6 +765,24 @@ static int vcodec_domains_get(struct device *dev)if (!core->pd_dl_venus)return -ENODEV ; +skip_pmdomains: +if (!res->opp_pmdomain || !core->has_opp_table) +return 0 ; + +/* Attach the power domain for setting performance state */ + opp_table =dev_pm_opp_attach_genpd (dev, res->opp_pmdomain, &opp_virt_dev); +if (IS_ERR (opp_table)) { +return PTR_ERR (opp_table); + }else if (opp_virt_dev) { + core->opp_pmdomain = *opp_virt_dev; + core->opp_dl_venus =device_link_add (dev, core->opp_pmdomain, +DL_FLAG_RPM_ACTIVE | +DL_FLAG_PM_RUNTIME | +DL_FLAG_STATELESS ); +if (!core->opp_dl_venus) +return -ENODEV ; + } +return 0 ; }
@@ -773,7 +793,7 @@ static void vcodec_domains_put(struct device *dev)unsigned int i;if (!res->vcodec_pmdomains_num) -return ; + goto skip_pmdomains;if (core->pd_dl_venus)device_link_del (core->pd_dl_venus);
@@ -783,6 +803,15 @@ static void vcodec_domains_put(struct device *dev)continue ;dev_pm_domain_detach (core->pmdomains[i], true); } + +skip_pmdomains: +if (!res->opp_pmdomain) +return ; + +if (core->opp_dl_venus) +device_link_del (core->opp_dl_venus); + +dev_pm_domain_detach (core->opp_pmdomain, true); }static int core_get_v4 (struct device *dev)
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 13/17 arm64: dts: sdm845: Add OPP tables and power-domains for venus
In reply to Rajendra NayakAdd the OPP tables in order to be able to vote on the performance state of a power-domain.
--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 40 ++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sdm845.dtsi +38 -2
@@ -3294,14 +3294,50 @@ }; }; + venus_opp_table: venus-opp-table { + compatible = "operating-points-v2"; + + opp-100000000 { + opp-hz = /bits/ 64 <100000000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-200000000 { + opp-hz = /bits/ 64 <200000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-320000000 { + opp-hz = /bits/ 64 <320000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-380000000 { + opp-hz = /bits/ 64 <380000000>; + required-opps = <&rpmhpd_opp_svs_l1>; + }; + + opp-444000000 { + opp-hz = /bits/ 64 <444000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + + opp-533000000 { + opp-hz = /bits/ 64 <533000000>; + required-opps = <&rpmhpd_opp_turbo>; + }; + }; + venus: video-codec@aa00000 { compatible = "qcom,sdm845-venus-v2"; reg = <0 0x0aa00000 0 0xff000>; interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; power-domains = <&videocc VENUS_GDSC>, <&videocc VCODEC0_GDSC>, - <&videocc VCODEC1_GDSC>; - power-domain-names = "venus", "vcodec0", "vcodec1"; + <&videocc VCODEC1_GDSC>, + <&rpmhpd SDM845_CX>; + power-domain-names = "venus", "vcodec0", "vcodec1", "opp-pd"; + operating-points-v2 = <&venus_opp_table>; clocks = <&videocc VIDEO_CC_VENUS_CTL_CORE_CLK>, <&videocc VIDEO_CC_VENUS_AHB_CLK>, <&videocc VIDEO_CC_VENUS_CTL_AXI_CLK>,
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 14/17 arm64: dts: sc7180: Add OPP tables and power-domains for venus
In reply to Rajendra NayakAdd the OPP tables in order to be able to vote on the performance state of a power-domain
--- arch/arm64/boot/dts/qcom/sc7180.dtsi | 35 +++++++++++++++++++++++++++++++++-- 1 file changed, 33 insertions(+), 2 deletions(-)
arch/arm64/boot/dts/qcom/sc7180.dtsi +33 -2
@@ -1554,13 +1554,44 @@ }; }; + venus_opp_table: venus-opp-table { + compatible = "operating-points-v2"; + + opp-200000000 { + opp-hz = /bits/ 64 <150000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-320000000 { + opp-hz = /bits/ 64 <270000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-380000000 { + opp-hz = /bits/ 64 <340000000>; + required-opps = <&rpmhpd_opp_svs_l1>; + }; + + opp-444000000 { + opp-hz = /bits/ 64 <434000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + + opp-533000000 { + opp-hz = /bits/ 64 <500000000>; + required-opps = <&rpmhpd_opp_turbo>; + }; + }; + venus: video-codec@aa00000 { compatible = "qcom,sc7180-venus"; reg = <0 0x0aa00000 0 0xff000>; interrupts = <GIC_SPI 174 IRQ_TYPE_LEVEL_HIGH>; power-domains = <&videocc VENUS_GDSC>, - <&videocc VCODEC0_GDSC>; - power-domain-names = "venus", "vcodec0"; + <&videocc VCODEC0_GDSC>, + <&rpmhpd SC7180_CX>; + power-domain-names = "venus", "vcodec0", "opp-pd"; + operating-points-v2 = <&venus_opp_table>; clocks = <&videocc VIDEO_CC_VENUS_CTL_CORE_CLK>, <&videocc VIDEO_CC_VENUS_AHB_CLK>, <&videocc VIDEO_CC_VENUS_CTL_AXI_CLK>,
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 15/17 spi: spi-qcom-qspi: Use OPP API to set clk/perf state
In reply to Rajendra NayakQSPI needs to vote on a performance state of a power domain depending on the clock rate. Add support for it by specifying the perf state/clock rate as an OPP table in device tree.
--- drivers/spi/spi-qcom-qspi.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-)
drivers/spi/spi-qcom-qspi.c +28 -1
@@ -8,6 +8,7 @@#include <linux/of.h> #include <linux/of_platform.h> #include <linux/pm_runtime.h> +#include <linux/pm_opp.h> #include <linux/spi/spi.h> #include <linux/spi/spi-mem.h>
@@ -139,6 +140,8 @@ struct qcom_qspi {struct device *dev;struct clk_bulk_data *clks;struct qspi_xfer xfer; +struct opp_table *opp_table; +bool has_opp_table;/* Lock to protect xfer and IRQ accessed registers */ spinlock_t lock; };
@@ -235,7 +238,7 @@ static int qcom_qspi_transfer_one(struct spi_master *master, speed_hz = xfer->speed_hz;/* In regular operation (SBL_EN=1) core must be 4x transfer clock */ - ret =clk_set_rate (ctrl->clks[QSPI_CLK_CORE ].clk, speed_hz *4 ); + ret =dev_pm_opp_set_rate (ctrl->dev, speed_hz *4 );if (ret) {dev_err (ctrl->dev,"Failed to set core clk %d\n" , ret);return ret;
@@ -481,6 +484,20 @@ static int qcom_qspi_probe(struct platform_device *pdev) master->handle_err = qcom_qspi_handle_err; master->auto_runtime_pm = true; + ctrl->opp_table =dev_pm_opp_set_clkname (&pdev->dev,"core" ); +if (IS_ERR (ctrl->opp_table)) { + ret =PTR_ERR (ctrl->opp_table); + goto exit_probe_master_put; + } +/* OPP table is optional */ + ret =dev_pm_opp_of_add_table (&pdev->dev); +if (!ret) { + ctrl->has_opp_table = true; + }else if (ret != -ENODEV ) { +dev_err (&pdev->dev,"Invalid OPP table in Device tree\n" ); +return ret; + } +pm_runtime_enable (dev); ret =spi_register_master (master);
@@ -488,6 +505,9 @@ static int qcom_qspi_probe(struct platform_device *pdev)return 0 ;pm_runtime_disable (dev); +if (ctrl->has_opp_table) +dev_pm_opp_of_remove_table (&pdev->dev); +dev_pm_opp_put_clkname (ctrl->opp_table); exit_probe_master_put:spi_master_put (master);
@@ -498,6 +518,11 @@ static int qcom_qspi_probe(struct platform_device *pdev)static int qcom_qspi_remove (struct platform_device *pdev) {struct spi_master *master =platform_get_drvdata (pdev); +struct qcom_qspi *ctrl =spi_master_get_devdata (master); + +if (ctrl->has_opp_table) +dev_pm_opp_of_remove_table (&pdev->dev); +dev_pm_opp_put_clkname (ctrl->opp_table);/* Unregister _before_ disabling pm_runtime() so we stop transfers */ spi_unregister_master (master);
@@ -512,6 +537,8 @@ static int __maybe_unused qcom_qspi_runtime_suspend(struct device *dev)struct spi_master *master =dev_get_drvdata (dev);struct qcom_qspi *ctrl =spi_master_get_devdata (master); +/* Drop the performance state vote */ +dev_pm_opp_set_rate (dev,0 );clk_bulk_disable_unprepare (QSPI_NUM_CLKS , ctrl->clks);return 0 ;
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 16/17 arm64: dts: sdm845: Add qspi opps and power-domains
In reply to Rajendra NayakAdd the power domain supporting performance state and the corresponding OPP tables for the qspi device on sdm845
--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
arch/arm64/boot/dts/qcom/sdm845.dtsi +26 -0
@@ -3017,6 +3017,30 @@ status = "disabled"; }; + qspi_opp_table: qspi-opp-table { + compatible = "operating-points-v2"; + + opp-19200000 { + opp-hz = /bits/ 64 <19200000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-100000000 { + opp-hz = /bits/ 64 <100000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-150000000 { + opp-hz = /bits/ 64 <150000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-300000000 { + opp-hz = /bits/ 64 <300000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + }; + qspi: spi@88df000 { compatible = "qcom,sdm845-qspi", "qcom,qspi-v1"; reg = <0 0x088df000 0 0x600>;
@@ -3026,6 +3050,8 @@ clocks = <&gcc GCC_QSPI_CNOC_PERIPH_AHB_CLK>, <&gcc GCC_QSPI_CORE_CLK>; clock-names = "iface", "core"; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&qspi_opp_table>; status = "disabled"; };
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 17/17 arm64: dts: sc7180: Add qspi opps and power-domains
In reply to Rajendra NayakAdd the power domain supporting performance state and the corresponding OPP tables for the qspi device on sc7180
--- arch/arm64/boot/dts/qcom/sc7180.dtsi | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+)
arch/arm64/boot/dts/qcom/sc7180.dtsi +21 -0
@@ -1421,6 +1421,25 @@ #power-domain-cells = <1>; }; + qspi_opp_table: qspi-opp-table { + compatible = "operating-points-v2"; + + opp-75000000 { + opp-hz = /bits/ 64 <75000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-150000000 { + opp-hz = /bits/ 64 <150000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-300000000 { + opp-hz = /bits/ 64 <300000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + }; + qspi: spi@88dc000 { compatible = "qcom,qspi-v1"; reg = <0 0x088dc000 0 0x600>;
@@ -1430,6 +1449,8 @@ clocks = <&gcc GCC_QSPI_CNOC_PERIPH_AHB_CLK>, <&gcc GCC_QSPI_CORE_CLK>; clock-names = "iface", "core"; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qspi_opp_table>; status = "disabled"; };
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
PATCH v3 10/17 arm64: dts: sdm845: Add sdhc opps and power-domains
In reply to Rajendra NayakAdd the power domain supporting performance state and the corresponding OPP tables for the sdhc device on sdm845.
--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
arch/arm64/boot/dts/qcom/sdm845.dtsi +26 -0
@@ -2975,6 +2975,30 @@ }; }; + sdhc2_opp_table: sdhc2-opp-table { + compatible = "operating-points-v2"; + + opp-9600000 { + opp-hz = /bits/ 64 <9600000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-19200000 { + opp-hz = /bits/ 64 <19200000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-100000000 { + opp-hz = /bits/ 64 <100000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-201500000 { + opp-hz = /bits/ 64 <201500000>; + required-opps = <&rpmhpd_opp_svs_l1>; + }; + }; + sdhc_2: sdhci@8804000 { compatible = "qcom,sdm845-sdhci", "qcom,sdhci-msm-v5"; reg = <0 0x08804000 0 0x1000>;
@@ -2987,6 +3011,8 @@ <&gcc GCC_SDCC2_APPS_CLK>; clock-names = "iface", "core"; iommus = <&apps_smmu 0xa0 0xf>; + power-domains = <&rpmhpd SDM845_CX>; + operating-points-v2 = <&sdhc2_opp_table>; status = "disabled"; };
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 05/17] drm/msm/dpu: Use OPP API to set clk/perf state
In reply to Rajendra NayakQuoted 2 lines · Rajendra Nayak
On some qualcomm platforms DPU needs to express a perforamnce state
s/perforamnce/performance/
Quoted 1 line
requirement on a power domain depennding on the clock rates.
s/depennding/depending/
Quoted 26 lines
Use OPP table from DT to register with OPP framework and use
dev_pm_opp_set_rate()to set the clk/perf state.Signed-off-by Rajendra Nayak <[email protected]>Cc Rob Clark <[email protected]>Cc Sean Paul <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 3 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 25 ++++++++++++++++++++++++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 ++++ 3 files changed, 30 insertions(+), 2 deletions(-)drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +1
-0@@ -7,6 +7,7 @@#include <linux/debugfs.h> #include <linux/errno.h> #include <linux/mutex.h> +#include <linux/pm_opp.h> #include <linux/sort.h> #include <linux/clk.h> #include <linux/bitmap.h>
drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c static int _dpu_core_perf_set_core_clk_rate(struct dpu_kms *kms, u64 rate) · line 243
Quoted 5 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +1
-1@@ -239,7 +240,7 @@ static int _dpu_core_perf_set_core_clk_rate(struct dpu_kms *kms, u64 rate) rate = core_clk->max_rate; core_clk->rate = rate; -return msm_dss_clk_set_rate (core_clk,1 ); +return dev_pm_opp_set_rate (&kms->pdev->dev, core_clk->rate);
I think this leaves msm_dss_clk_set_rate() unused now?
Other than that,
Quoted 89 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +0
-0}static u64 _dpu_core_perf_get_core_clk_rate (struct dpu_kms *kms)drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +24
-1@@ -10,6 +10,7 @@#include <linux/debugfs.h> #include <linux/dma-buf.h> #include <linux/of_irq.h> +#include <linux/pm_opp.h> #include <drm/drm_crtc.h> #include <drm/drm_file.h> @@ -1033,11 +1034,23 @@ static int dpu_bind(struct device *dev, struct device *master, void *data)if (!dpu_kms)return -ENOMEM ; + dpu_kms->opp_table =dev_pm_opp_set_clkname (dev,"core" ); +if (IS_ERR (dpu_kms->opp_table)) +return PTR_ERR (dpu_kms->opp_table); +/* OPP table is optional */ + ret =dev_pm_opp_of_add_table (dev); +if (!ret) { + dpu_kms->has_opp_table = true; + }else if (ret != -ENODEV ) { +dev_err (dev,"Invalid OPP table in Device tree\n" ); +return ret; + } + mp = &dpu_kms->mp; ret =msm_dss_parse_clock (pdev, mp);if (ret) {DPU_ERROR ("failed to parse clocks, ret=%d\n" , ret); -return ret; + goto err; }platform_set_drvdata (pdev, dpu_kms);@@ -1051,6 +1064,11 @@ static int dpu_bind(struct device *dev, struct device *master, void *data) priv->kms = &dpu_kms->base;return ret; +err: +if (dpu_kms->has_opp_table) +dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (dpu_kms->opp_table); +return ret; }static void dpu_unbind (struct device *dev,struct device *master,void *data)@@ -1059,6 +1077,9 @@ static void dpu_unbind(struct device *dev, struct device *master, void *data)struct dpu_kms *dpu_kms =platform_get_drvdata (pdev);struct dss_module_power *mp = &dpu_kms->mp; +if (dpu_kms->has_opp_table) +dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (dpu_kms->opp_table);msm_dss_put_clk (mp->clk_config, mp->num_clk);devm_kfree (&pdev->dev, mp->clk_config); mp->num_clk =0 ;@@ -1090,6 +1111,8 @@ static int __maybe_unused dpu_runtime_suspend(struct device *dev)struct dpu_kms *dpu_kms =platform_get_drvdata (pdev);struct dss_module_power *mp = &dpu_kms->mp; +/* Drop the performance state vote */ +dev_pm_opp_set_rate (dev,0 ); rc =msm_dss_enable_clk (mp->clk_config, mp->num_clk, false);if (rc)DPU_ERROR ("clock disable failed rc:%d\n" , rc);drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +4
-1@@ -128,6 +128,10 @@ struct dpu_kms {struct platform_device *pdev;bool rpm_enabled; + +struct opp_table *opp_table; +bool has_opp_table; +struct dss_module_power mp;/* reference count bandwidth requests, so we know when we can -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 09/17] mmc: sdhci-msm: Fix error handling for dev_pm_opp_of_add_table()
In reply to Rajendra NayakQuoted 10 lines · Rajendra Nayak
Even though specifying OPP's in device tree is optional, ignoring all errors reported by
dev_pm_opp_of_add_table()means we can't distinguish between a missing OPP table and a wrong/buggy OPP table. While missing OPP table (dev_pm_opp_of_add_table()returns a-ENODEVin such case) can be ignored, a wrong/buggy OPP table in device tree should make the driver error out.while we fix that, lets also fix the variable names for opp/opp_table to avoid confusion and name them opp_table/has_opp_table instead.
Quoted 6 lines
Suggested-by Matthias Kaehlcke <[email protected]>Signed-off-by Rajendra Nayak <[email protected]>Cc Ulf Hansson <[email protected]>Cc Pradeep P V K <[email protected]>Cc Veerabhadrarao Badiganti <[email protected]>
Is this a standalone patch that I queue up via my mmc tree?
Kind regards
Uffe
Quoted 72 lines
--- drivers/mmc/host/sdhci-msm.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-)drivers/mmc/host/sdhci-msm.c +16
-12@@ -244,8 +244,8 @@ struct sdhci_msm_host {struct clk_bulk_data bulk_clks[4 ];/* core, iface, cal, sleep clocks */ unsigned long clk_rate;struct mmc_host *mmc; -struct opp_table *opp; -bool opp_table; +struct opp_table *opp_table; +bool has_opp_table;bool use_14lpp_dll_reset;bool tuning_done;bool calibration_done;@@ -1967,15 +1967,20 @@ static int sdhci_msm_probe(struct platform_device *pdev) } msm_host->bulk_clks[0 ].clk = clk; - msm_host->opp =dev_pm_opp_set_clkname (&pdev->dev,"core" ); -if (IS_ERR (msm_host->opp)) { - ret =PTR_ERR (msm_host->opp); + msm_host->opp_table =dev_pm_opp_set_clkname (&pdev->dev,"core" ); +if (IS_ERR (msm_host->opp_table)) { + ret =PTR_ERR (msm_host->opp_table); goto bus_clk_disable; }/* OPP table is optional */ -if (!dev_pm_opp_of_add_table (&pdev->dev)) - msm_host->opp_table = true; + ret =dev_pm_opp_of_add_table (&pdev->dev); +if (!ret) { + msm_host->has_opp_table = true; + }else if (ret != -ENODEV ) { +dev_err (&pdev->dev,"Invalid OPP table in Device tree\n" ); + goto opp_cleanup; + }/* Vote for maximum clock rate for maximum performance */ ret =dev_pm_opp_set_rate (&pdev->dev,INT_MAX );@@ -2133,9 +2138,9 @@ static int sdhci_msm_probe(struct platform_device *pdev)clk_bulk_disable_unprepare (ARRAY_SIZE (msm_host->bulk_clks), msm_host->bulk_clks); opp_cleanup: -if (msm_host->opp_table) +if (msm_host->has_opp_table)dev_pm_opp_of_remove_table (&pdev->dev); -dev_pm_opp_put_clkname (msm_host->opp); +dev_pm_opp_put_clkname (msm_host->opp_table); bus_clk_disable:if (!IS_ERR (msm_host->bus_clk))clk_disable_unprepare (msm_host->bus_clk);@@ -2154,9 +2159,9 @@ static int sdhci_msm_remove(struct platform_device *pdev)sdhci_remove_host (host, dead); -if (msm_host->opp_table) +if (msm_host->has_opp_table)dev_pm_opp_of_remove_table (&pdev->dev); -dev_pm_opp_put_clkname (msm_host->opp); +dev_pm_opp_put_clkname (msm_host->opp_table);pm_runtime_get_sync (&pdev->dev);pm_runtime_disable (&pdev->dev);pm_runtime_put_noidle (&pdev->dev); --QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 01/17] tty: serial: qcom_geni_serial: Use OPP API to set clk/perf state
In reply to Rajendra NayakQuoted 137 lines · Rajendra Nayak
geni serial needs to express a perforamnce state requirement on CX powerdomain depending on the frequency of the clock rates. Use OPP table from DT to register with OPP framework and use
dev_pm_opp_set_rate()to set the clk/perf state.Signed-off-by Rajendra Nayak <[email protected]>Cc Greg Kroah-Hartman <[email protected]>Cc Akash Asthana <[email protected]>--- drivers/tty/serial/qcom_geni_serial.c | 34 +++++++++++++++++++++++++++++----- include/linux/qcom-geni-se.h | 4 ++++ 2 files changed, 33 insertions(+), 5 deletions(-)drivers/tty/serial/qcom_geni_serial.c +29
-5@@ -9,6 +9,7 @@#include <linux/module.h> #include <linux/of.h> #include <linux/of_device.h> +#include <linux/pm_opp.h> #include <linux/platform_device.h> #include <linux/pm_runtime.h> #include <linux/pm_wakeirq.h> @@ -961,7 +962,7 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport, goto out_restart_rx; uport->uartclk = clk_rate; -clk_set_rate (port->se.clk, clk_rate); +dev_pm_opp_set_rate (uport->dev, clk_rate); ser_clk_cfg =SER_CLK_EN ; ser_clk_cfg |= clk_div <<CLK_DIV_SHFT ;@@ -1198,8 +1199,11 @@ static void qcom_geni_serial_pm(struct uart_port *uport,if (new_state ==UART_PM_STATE_ON && old_state ==UART_PM_STATE_OFF )geni_se_resources_on (&port->se);else if (new_state ==UART_PM_STATE_OFF && - old_state ==UART_PM_STATE_ON ) + old_state ==UART_PM_STATE_ON ) { +/* Drop the performance state vote */ +dev_pm_opp_set_rate (uport->dev,0 );geni_se_resources_off (&port->se); + } }static const struct uart_ops qcom_geni_console_pops = {@@ -1318,13 +1322,25 @@ static int qcom_geni_serial_probe(struct platform_device *pdev)if (of_property_read_bool (pdev->dev.of_node,"cts-rts-swap" )) port->cts_rts_swap = true; + port->se.opp_table =dev_pm_opp_set_clkname (&pdev->dev,"se" ); +if (IS_ERR (port->se.opp_table)) +return PTR_ERR (port->se.opp_table); +/* OPP table is optional */ + ret =dev_pm_opp_of_add_table (&pdev->dev); +if (!ret) { + port->se.has_opp_table = true; + }else if (ret != -ENODEV ) { +dev_err (&pdev->dev,"Invalid OPP table in Device tree\n" ); +return ret; + } + uport->private_data = drv;platform_set_drvdata (pdev, port); port->handle_rx = console ? handle_rx_console : handle_rx_uart; ret =uart_add_one_port (drv, uport);if (ret) -return ret; + goto err;irq_set_status_flags (uport->irq,IRQ_NOAUTOEN ); ret = devm_request_irq(uport->dev, uport->irq, qcom_geni_serial_isr,@@ -1332,7 +1348,7 @@ static int qcom_geni_serial_probe(struct platform_device *pdev)if (ret) {dev_err (uport->dev,"Failed to get IRQ ret %d\n" , ret);uart_remove_one_port (drv, uport); -return ret; + goto err; }/* @@ -1349,11 +1365,16 @@ static int qcom_geni_serial_probe(struct platform_device *pdev)if (ret) {device_init_wakeup (&pdev->dev, false);uart_remove_one_port (drv, uport); -return ret; + goto err; } }return 0 ; +err: +if (port->se.has_opp_table) +dev_pm_opp_of_remove_table (&pdev->dev); +dev_pm_opp_put_clkname (port->se.opp_table); +return ret; }static int qcom_geni_serial_remove (struct platform_device *pdev)@@ -1361,6 +1382,9 @@ static int qcom_geni_serial_remove(struct platform_device *pdev)struct qcom_geni_serial_port *port =platform_get_drvdata (pdev);struct uart_driver *drv = port->uport.private_data; +if (port->se.has_opp_table) +dev_pm_opp_of_remove_table (&pdev->dev); +dev_pm_opp_put_clkname (port->se.opp_table);dev_pm_clear_wake_irq (&pdev->dev);device_init_wakeup (&pdev->dev, false);uart_remove_one_port (drv, &port->uport);include/linux/qcom-geni-se.h +4
-0@@ -33,6 +33,8 @@ struct clk;* @clk: Handle to the core serial engine clock * @num_clk_levels: Number of valid clock levels in clk_perf_tbl * @clk_perf_tbl: Table of clock frequency input to serial engine clock +* @opp_table: Pointer to the OPP table +* @has_opp_table: Specifies if the SE has an OPP table */ struct geni_se {void __iomem *base;@@ -41,6 +43,8 @@ struct geni_se {struct clk *clk;unsigned int num_clk_levels;unsigned long *clk_perf_tbl; +struct opp_table *opp_table; +bool has_opp_table; };/* Common SE registers */ Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 02/17] spi: spi-geni-qcom: Use OPP API to set clk/perf state
In reply to Rajendra NayakQuoted 91 lines · Rajendra Nayak
geni spi needs to express a perforamnce state requirement on CX depending on the frequency of the clock rates. Use OPP table from DT to register with OPP framework and use
dev_pm_opp_set_rate()to set the clk/perf state.Signed-off-by Rajendra Nayak <[email protected]>Cc Mark Brown <[email protected]>Cc Alok Chauhan <[email protected]>Cc Akash Asthana <[email protected]>---
This patch has a dependency on the 'PATCH 01/17' in this series, due to the changes ininclude/linux/qcom-geni-se.h
Its ideal if this and the previous patch gets merged via the msm tree (once reviewed and ack'ed)
Greg has already responded he is fine with it for serial.drivers/spi/spi-geni-qcom.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)drivers/spi/spi-geni-qcom.c +20
-3@@ -7,6 +7,7 @@#include <linux/log2.h> #include <linux/module.h> #include <linux/platform_device.h> +#include <linux/pm_opp.h> #include <linux/pm_runtime.h> #include <linux/qcom-geni-se.h> #include <linux/spi/spi.h> @@ -95,7 +96,6 @@ static int get_spi_clk_cfg(unsigned int speed_hz, {unsigned long sclk_freq;unsigned int actual_hz; -struct geni_se *se = &mas->se;int ret; ret = geni_se_clk_freq_match(&mas->se,@@ -112,9 +112,9 @@ static int get_spi_clk_cfg(unsigned int speed_hz,dev_dbg (mas->dev,"req %u=>%u sclk %lu, idx %d, div %d\n" , speed_hz, actual_hz, sclk_freq, *clk_idx, *clk_div); - ret =clk_set_rate (se->clk, sclk_freq); + ret =dev_pm_opp_set_rate (mas->dev, sclk_freq);if (ret) -dev_err (mas->dev,"clk_set_rate failed %d\n" , ret); +dev_err (mas->dev,"dev_pm_opp_set_rate failed %d\n" , ret);return ret; }@@ -561,6 +561,17 @@ static int spi_geni_probe(struct platform_device *pdev) mas->se.wrapper =dev_get_drvdata (dev->parent); mas->se.base = base; mas->se.clk = clk; + mas->se.opp_table =dev_pm_opp_set_clkname (&pdev->dev,"se" ); +if (IS_ERR (mas->se.opp_table)) +return PTR_ERR (mas->se.opp_table); +/* OPP table is optional */ + ret =dev_pm_opp_of_add_table (&pdev->dev); +if (!ret) { + mas->se.has_opp_table = true; + }else if (ret != -ENODEV ) { +dev_err (&pdev->dev,"Invalid OPP table in Device tree\n" ); +return ret; + } spi->bus_num =-1 ; spi->dev.of_node = dev->of_node;@@ -596,6 +607,9 @@ static int spi_geni_probe(struct platform_device *pdev) spi_geni_probe_runtime_disable:pm_runtime_disable (dev);spi_master_put (spi); +if (mas->se.has_opp_table) +dev_pm_opp_of_remove_table (&pdev->dev); +dev_pm_opp_put_clkname (mas->se.opp_table);return ret; }@@ -604,6 +618,9 @@ static int spi_geni_remove(struct platform_device *pdev)struct spi_master *spi =platform_get_drvdata (pdev);struct spi_geni_master *mas =spi_master_get_devdata (spi); +if (mas->se.has_opp_table) +dev_pm_opp_of_remove_table (&pdev->dev); +dev_pm_opp_put_clkname (mas->se.opp_table);/* Unregister _before_ disabling pm_runtime() so we stop transfers */ spi_unregister_master (spi);
drivers/spi/spi-geni-qcom.c static int __maybe_unused spi_geni_runtime_suspend(struct device *dev) · line 641
Quoted 8 lines
drivers/spi/spi-geni-qcom.c +3
-0@@ -617,6 +634,9 @@ static int __maybe_unused spi_geni_runtime_suspend(struct device *dev)struct spi_master *spi =dev_get_drvdata (dev);struct spi_geni_master *mas =spi_master_get_devdata (spi); +/* Drop the performance state vote */ +dev_pm_opp_set_rate (dev,0 ); +return geni_se_resources_off (&mas->se); }
Re: [PATCH v3 03/17] arm64: dts: sdm845: Add OPP table for all qup devices
In reply to Rajendra NayakHi Rajendra,
Quoted 27 lines · Rajendra Nayak
qup has a requirement to vote on the performance state of the CX domain in sdm845 devices. Add OPP tables for these and also add power-domains property for all qup instances.
Signed-off-by Rajendra Nayak <[email protected]>Signed-off-by Stephen Boyd <[email protected]>--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 115 +++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+)arch/arm64/boot/dts/qcom/sdm845.dtsi +9
-0@@ -804,6 +804,25 @@ clock-names = "core"; }; + qup_opp_table: qup-opp-table { + compatible = "operating-points-v2"; + + opp-19200000 { + opp-hz = /bits/ 64 <19200000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-75000000 {
arch/arm64/boot/dts/qcom/sdm845.dtsi line 825
Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +10
-0+ opp-hz = /bits/ 64 <75000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-100000000 { + opp-hz = /bits/ 64 <100000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + }; +
Judging from SDM845 (which has more OPP tables) the convention seems to be to add OPP tables to the nodes that use them, which seems reasonable and keeps them out of the device list.
Unfortunately this convention isn't completely suitable for cases like this (and the DSI OPPs later in this series), where the same OPP table is used by multiple devices. A possible compromise would be to add the table to the node of the first device that uses them.
Re: [PATCH v3 05/17] drm/msm/dpu: Use OPP API to set clk/perf state
In reply to Rajendra NayakQuoted 51 lines · Rajendra Nayak
On some qualcomm platforms DPU needs to express a perforamnce state requirement on a power domain depennding on the clock rates. Use OPP table from DT to register with OPP framework and use
dev_pm_opp_set_rate()to set the clk/perf state.Signed-off-by Rajendra Nayak <[email protected]>Cc Rob Clark <[email protected]>Cc Sean Paul <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 3 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 25 ++++++++++++++++++++++++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 ++++ 3 files changed, 30 insertions(+), 2 deletions(-)drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +2
-1@@ -7,6 +7,7 @@#include <linux/debugfs.h> #include <linux/errno.h> #include <linux/mutex.h> +#include <linux/pm_opp.h> #include <linux/sort.h> #include <linux/clk.h> #include <linux/bitmap.h> @@ -239,7 +240,7 @@ static int _dpu_core_perf_set_core_clk_rate(struct dpu_kms *kms, u64 rate) rate = core_clk->max_rate; core_clk->rate = rate; -return msm_dss_clk_set_rate (core_clk,1 ); +return dev_pm_opp_set_rate (&kms->pdev->dev, core_clk->rate); }static u64 _dpu_core_perf_get_core_clk_rate (struct dpu_kms *kms)drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1
-0@@ -10,6 +10,7 @@#include <linux/debugfs.h> #include <linux/dma-buf.h> #include <linux/of_irq.h> +#include <linux/pm_opp.h> #include <drm/drm_crtc.h> #include <drm/drm_file.h> @@ -1033,11 +1034,23 @@ static int dpu_bind(struct device *dev, struct device *master, void *data)if (!dpu_kms)return -ENOMEM ;
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int dpu_bind(struct device *dev, struct device *master, void *data) · line 1045
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +9
-0+ dpu_kms->opp_table =dev_pm_opp_set_clkname (dev,"core" ); +if (IS_ERR (dpu_kms->opp_table)) +return PTR_ERR (dpu_kms->opp_table); +/* OPP table is optional */ + ret =dev_pm_opp_of_add_table (dev); +if (!ret) { + dpu_kms->has_opp_table = true; + }else if (ret != -ENODEV ) { +dev_err (dev,"Invalid OPP table in Device tree\n" );
nit: s/Device/device/ ?
uber-nit: s/Invalid/invalid/
most log messages in this file start with a lower case letter, except for acronyms/register names
please also change it in the other drivers unless you disagree.
Quoted 48 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +14
-1+return ret; + } + mp = &dpu_kms->mp; ret =msm_dss_parse_clock (pdev, mp);if (ret) {DPU_ERROR ("failed to parse clocks, ret=%d\n" , ret); -return ret; + goto err; }platform_set_drvdata (pdev, dpu_kms);@@ -1051,6 +1064,11 @@ static int dpu_bind(struct device *dev, struct device *master, void *data) priv->kms = &dpu_kms->base;return ret; +err: +if (dpu_kms->has_opp_table) +dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (dpu_kms->opp_table); +return ret; }static void dpu_unbind (struct device *dev,struct device *master,void *data)@@ -1059,6 +1077,9 @@ static void dpu_unbind(struct device *dev, struct device *master, void *data)struct dpu_kms *dpu_kms =platform_get_drvdata (pdev);struct dss_module_power *mp = &dpu_kms->mp; +if (dpu_kms->has_opp_table) +dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (dpu_kms->opp_table);msm_dss_put_clk (mp->clk_config, mp->num_clk);devm_kfree (&pdev->dev, mp->clk_config); mp->num_clk =0 ;@@ -1090,6 +1111,8 @@ static int __maybe_unused dpu_runtime_suspend(struct device *dev)struct dpu_kms *dpu_kms =platform_get_drvdata (pdev);struct dss_module_power *mp = &dpu_kms->mp; +/* Drop the performance state vote */ +dev_pm_opp_set_rate (dev,0 ); rc =msm_dss_enable_clk (mp->clk_config, mp->num_clk, false);if (rc)DPU_ERROR ("clock disable failed rc:%d\n" , rc);drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +0
-0
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h struct dpu_kms { · line 137
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +4
-0@@ -128,6 +128,10 @@ struct dpu_kms {struct platform_device *pdev;bool rpm_enabled; + +struct opp_table *opp_table; +bool has_opp_table; +struct dss_module_power mp;/* reference count bandwidth requests, so we know when we can
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 07/17] arm64: dts: sdm845: Add DSI and MDP OPP tables and power-domains
In reply to Rajendra NayakQuoted 30 lines · Rajendra Nayak
Add the OPP tables for DSI and MDP based on the perf state/clk requirements, and add the power-domains property to specify the scalable power domain.
Signed-off-by Rajendra Nayak <[email protected]>--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 59 ++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+)arch/arm64/boot/dts/qcom/sdm845.dtsi +13
-0@@ -3309,6 +3309,59 @@ #reset-cells = <1>; }; + mdp_opp_table: mdp-opp-table { + compatible = "operating-points-v2"; + + opp-19200000 { + opp-hz = /bits/ 64 <19200000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-171428571 { + opp-hz = /bits/ 64 <171428571>; + required-opps = <&rpmhpd_opp_low_svs>; + }; +
arch/arm64/boot/dts/qcom/sdm845.dtsi line 3334
Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +10
-0+ opp-344000000 { + opp-hz = /bits/ 64 <344000000>; + required-opps = <&rpmhpd_opp_svs_l1>; + }; + + opp-430000000 { + opp-hz = /bits/ 64 <430000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + };
as commented on "[v3,03/17] arm64: dts: sdm845: Add OPP table for all qup devices" (https://patchwork.kernel.org/patch/11514693/) this table should probably be inside the 'mdp' node.
Quoted 20 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +20
-0+ + dsi_opp_table: dsi-opp-table { + compatible = "operating-points-v2"; + + opp-19200000 { + opp-hz = /bits/ 64 <19200000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-180000000 { + opp-hz = /bits/ 64 <180000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-275000000 { + opp-hz = /bits/ 64 <275000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-328580000 {
arch/arm64/boot/dts/qcom/sdm845.dtsi line 3364
Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +10
-0+ opp-hz = /bits/ 64 <328580000>; + required-opps = <&rpmhpd_opp_svs_l1>; + }; + + opp-358000000 { + opp-hz = /bits/ 64 <358000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + }; +
depending on the outcome of the discussion mentioned above this might have to move into the 'dsi0' node.
Re: [PATCH v3 12/17] media: venus: core: Add support for opp tables/perf voting
In reply to Rajendra NayakQuoted 47 lines · Rajendra Nayak
Add support to add OPP tables and perf voting on the OPP powerdomain. This is needed so venus votes on the corresponding performance state for the OPP powerdomain along with setting the core clock rate.
Signed-off-by Rajendra Nayak <[email protected]>Cc Stanimir Varbanov <[email protected]>--- drivers/media/platform/qcom/venus/core.c | 28 +++++++++++++++++++ drivers/media/platform/qcom/venus/core.h | 5 ++++ drivers/media/platform/qcom/venus/pm_helpers.c | 37 +++++++++++++++++++++++--- 3 files changed, 66 insertions(+), 4 deletions(-)drivers/media/platform/qcom/venus/core.c +15
-0@@ -12,6 +12,7 @@#include <linux/platform_device.h> #include <linux/slab.h> #include <linux/types.h> +#include <linux/pm_opp.h> #include <linux/pm_runtime.h> #include <media/videobuf2-v4l2.h> #include <media/v4l2-mem2mem.h> @@ -214,6 +215,20 @@ static int venus_probe(struct platform_device *pdev)if (!core->pm_ops)return -ENODEV ; + core->opp_table =dev_pm_opp_set_clkname (dev,"core" ); +if (IS_ERR (core->opp_table)) +return PTR_ERR (core->opp_table); + +if (core->res->opp_pmdomain) { + ret =dev_pm_opp_of_add_table (dev); +if (!ret) { + core->has_opp_table = true; + }else if (ret != -ENODEV ) { +dev_err (dev,"Invalid OPP table in Device tree\n" ); +return ret; + } + } +if (core->pm_ops->core_get) { ret = core->pm_ops->core_get (dev);if (ret)
drivers/media/platform/qcom/venus/core.c static int venus_probe(struct platform_device *pdev) · line 319
Quoted 4 lines
drivers/media/platform/qcom/venus/core.c +1
-0@@ -301,6 +316,9 @@ static int venus_probe(struct platform_device *pdev) err_venus_shutdown:venus_shutdown (core); err_runtime_disable: +if (core->res->opp_pmdomain && core->has_opp_table)
the check for 'core->res->opp_pmdomain' is not needed, 'core->has_opp_table' can only be true when 'core->res->opp_pmdomain' is not NULL.
drivers/media/platform/qcom/venus/core.c static int venus_remove(struct platform_device *pdev) · line 347
Quoted 10 lines
drivers/media/platform/qcom/venus/core.c +3
-0+dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (core->opp_table);pm_runtime_set_suspended (dev);pm_runtime_disable (dev);hfi_destroy (core);@@ -326,6 +344,10 @@ static int venus_remove(struct platform_device *pdev)venus_firmware_deinit (core); +if (core->res->opp_pmdomain && core->has_opp_table)
ditto
Re: [PATCH v3 13/17] arm64: dts: sdm845: Add OPP tables and power-domains for venus
In reply to Rajendra NayakQuoted 39 lines · Rajendra Nayak
Add the OPP tables in order to be able to vote on the performance state of a power-domain.
Signed-off-by Rajendra Nayak <[email protected]>--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 40 ++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-)arch/arm64/boot/dts/qcom/sdm845.dtsi +23
-0@@ -3294,14 +3294,50 @@ }; }; + venus_opp_table: venus-opp-table { + compatible = "operating-points-v2"; + + opp-100000000 { + opp-hz = /bits/ 64 <100000000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-200000000 { + opp-hz = /bits/ 64 <200000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-320000000 { + opp-hz = /bits/ 64 <320000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-380000000 { + opp-hz = /bits/ 64 <380000000>; + required-opps = <&rpmhpd_opp_svs_l1>; + }; +
arch/arm64/boot/dts/qcom/sdm845.dtsi line 3329
Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +10
-0+ opp-444000000 { + opp-hz = /bits/ 64 <444000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + + opp-533000000 { + opp-hz = /bits/ 64 <533000000>; + required-opps = <&rpmhpd_opp_turbo>; + }; + };
move OPP table inside the 'venus' node (like 'rpmhpd_opp_table', 'gpu_opp_table' or 'gmu_opp_table').
Re: [PATCH v3 15/17] spi: spi-qcom-qspi: Use OPP API to set clk/perf state
In reply to Rajendra NayakHi,
Quoted 49 lines · Rajendra Nayak
QSPI needs to vote on a performance state of a power domain depending on the clock rate. Add support for it by specifying the perf state/clock rate as an OPP table in device tree.
Signed-off-by Rajendra Nayak <[email protected]>Cc Mark Brown <[email protected]>Cc Alok Chauhan <[email protected]>Cc Akash Asthana <[email protected]>--- drivers/spi/spi-qcom-qspi.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-)drivers/spi/spi-qcom-qspi.c +6
-1@@ -8,6 +8,7 @@#include <linux/of.h> #include <linux/of_platform.h> #include <linux/pm_runtime.h> +#include <linux/pm_opp.h> #include <linux/spi/spi.h> #include <linux/spi/spi-mem.h> @@ -139,6 +140,8 @@ struct qcom_qspi {struct device *dev;struct clk_bulk_data *clks;struct qspi_xfer xfer; +struct opp_table *opp_table; +bool has_opp_table;/* Lock to protect xfer and IRQ accessed registers */ spinlock_t lock; };@@ -235,7 +238,7 @@ static int qcom_qspi_transfer_one(struct spi_master *master, speed_hz = xfer->speed_hz;/* In regular operation (SBL_EN=1) core must be 4x transfer clock */ - ret =clk_set_rate (ctrl->clks[QSPI_CLK_CORE ].clk, speed_hz *4 ); + ret =dev_pm_opp_set_rate (ctrl->dev, speed_hz *4 );if (ret) {dev_err (ctrl->dev,"Failed to set core clk %d\n" , ret);return ret;@@ -481,6 +484,20 @@ static int qcom_qspi_probe(struct platform_device *pdev) master->handle_err = qcom_qspi_handle_err; master->auto_runtime_pm = true; + ctrl->opp_table =dev_pm_opp_set_clkname (&pdev->dev,"core" ); +if (IS_ERR (ctrl->opp_table)) {
drivers/spi/spi-qcom-qspi.c static int qcom_qspi_probe(struct platform_device *pdev) · line 498
Quoted 10 lines
drivers/spi/spi-qcom-qspi.c +10
-0+ ret =PTR_ERR (ctrl->opp_table); + goto exit_probe_master_put; + } +/* OPP table is optional */ + ret =dev_pm_opp_of_add_table (&pdev->dev); +if (!ret) { + ctrl->has_opp_table = true; + }else if (ret != -ENODEV ) { +dev_err (&pdev->dev,"Invalid OPP table in Device tree\n" ); +return ret;
goto exit_probe_master_put;
Re: [PATCH v3 16/17] arm64: dts: sdm845: Add qspi opps and power-domains
In reply to Rajendra NayakHi,
Quoted 29 lines · Rajendra Nayak
Add the power domain supporting performance state and the corresponding OPP tables for the qspi device on sdm845
Signed-off-by Rajendra Nayak <[email protected]>--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)arch/arm64/boot/dts/qcom/sdm845.dtsi +13
-0@@ -3017,6 +3017,30 @@ status = "disabled"; }; + qspi_opp_table: qspi-opp-table { + compatible = "operating-points-v2"; + + opp-19200000 { + opp-hz = /bits/ 64 <19200000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-100000000 { + opp-hz = /bits/ 64 <100000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; +
arch/arm64/boot/dts/qcom/sdm845.dtsi line 3042
Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +10
-0+ opp-150000000 { + opp-hz = /bits/ 64 <150000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-300000000 { + opp-hz = /bits/ 64 <300000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + };
move OPP table inside the 'qspi' node (like 'rpmhpd_opp_table', 'gpu_opp_table' or 'gmu_opp_table').
Re: [PATCH v3 05/17] drm/msm/dpu: Use OPP API to set clk/perf state
In reply to Rob ClarkQuoted 38 lines · Rob Clark
Quoted 2 lines · Rajendra Nayak
On some qualcomm platforms DPU needs to express a perforamnce state
s/perforamnce/performance/
Quoted 1 line
requirement on a power domain depennding on the clock rates.
s/depennding/depending/
Quoted 28 lines
Use OPP table from DT to register with OPP framework and use
dev_pm_opp_set_rate()to set the clk/perf state.Signed-off-by Rajendra Nayak <[email protected]>Cc Rob Clark <[email protected]>Cc Sean Paul <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 3 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 25 ++++++++++++++++++++++++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 ++++ 3 files changed, 30 insertions(+), 2 deletions(-)drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +1
-0@@ -7,6 +7,7 @@#include <linux/debugfs.h> #include <linux/errno.h> #include <linux/mutex.h> +#include <linux/pm_opp.h> #include <linux/sort.h> #include <linux/clk.h> #include <linux/bitmap.h> @@ -239,7 +240,7 @@ static int _dpu_core_perf_set_core_clk_rate(struct dpu_kms *kms, u64 rate) rate = core_clk->max_rate;
Quoted 5 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c static int _dpu_core_perf_set_core_clk_rate(struct dpu_kms *kms, u64 rate) · line 243
Quoted 3 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +1
-1core_clk->rate = rate; -return msm_dss_clk_set_rate (core_clk,1 ); +return dev_pm_opp_set_rate (&kms->pdev->dev, core_clk->rate);I think this leaves
msm_dss_clk_set_rate()unused now?
yup, I didn't realise, I will get rid of it when I respin.
Quoted 4 lines
Other than that,
Reviewed-by Rob Clark <[email protected]>
Thanks.
Quoted 90 lines
Quoted 90 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +0
-0}static u64 _dpu_core_perf_get_core_clk_rate (struct dpu_kms *kms)drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +24
-1@@ -10,6 +10,7 @@#include <linux/debugfs.h> #include <linux/dma-buf.h> #include <linux/of_irq.h> +#include <linux/pm_opp.h> #include <drm/drm_crtc.h> #include <drm/drm_file.h> @@ -1033,11 +1034,23 @@ static int dpu_bind(struct device *dev, struct device *master, void *data)if (!dpu_kms)return -ENOMEM ; + dpu_kms->opp_table =dev_pm_opp_set_clkname (dev,"core" ); +if (IS_ERR (dpu_kms->opp_table)) +return PTR_ERR (dpu_kms->opp_table); +/* OPP table is optional */ + ret =dev_pm_opp_of_add_table (dev); +if (!ret) { + dpu_kms->has_opp_table = true; + }else if (ret != -ENODEV ) { +dev_err (dev,"Invalid OPP table in Device tree\n" ); +return ret; + } + mp = &dpu_kms->mp; ret =msm_dss_parse_clock (pdev, mp);if (ret) {DPU_ERROR ("failed to parse clocks, ret=%d\n" , ret); -return ret; + goto err; }platform_set_drvdata (pdev, dpu_kms);@@ -1051,6 +1064,11 @@ static int dpu_bind(struct device *dev, struct device *master, void *data) priv->kms = &dpu_kms->base;return ret; +err: +if (dpu_kms->has_opp_table) +dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (dpu_kms->opp_table); +return ret; }static void dpu_unbind (struct device *dev,struct device *master,void *data)@@ -1059,6 +1077,9 @@ static void dpu_unbind(struct device *dev, struct device *master, void *data)struct dpu_kms *dpu_kms =platform_get_drvdata (pdev);struct dss_module_power *mp = &dpu_kms->mp; +if (dpu_kms->has_opp_table) +dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (dpu_kms->opp_table);msm_dss_put_clk (mp->clk_config, mp->num_clk);devm_kfree (&pdev->dev, mp->clk_config); mp->num_clk =0 ;@@ -1090,6 +1111,8 @@ static int __maybe_unused dpu_runtime_suspend(struct device *dev)struct dpu_kms *dpu_kms =platform_get_drvdata (pdev);struct dss_module_power *mp = &dpu_kms->mp; +/* Drop the performance state vote */ +dev_pm_opp_set_rate (dev,0 ); rc =msm_dss_enable_clk (mp->clk_config, mp->num_clk, false);if (rc)DPU_ERROR ("clock disable failed rc:%d\n" , rc);drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +4
-1@@ -128,6 +128,10 @@ struct dpu_kms {struct platform_device *pdev;bool rpm_enabled; + +struct opp_table *opp_table; +bool has_opp_table; +struct dss_module_power mp;/* reference count bandwidth requests, so we know when we can -- QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 09/17] mmc: sdhci-msm: Fix error handling for dev_pm_opp_of_add_table()
In reply to Ulf HanssonQuoted 11 lines · Ulf Hansson
Quoted 10 lines · Rajendra Nayak
Even though specifying OPP's in device tree is optional, ignoring all errors reported by
dev_pm_opp_of_add_table()means we can't distinguish between a missing OPP table and a wrong/buggy OPP table. While missing OPP table (dev_pm_opp_of_add_table()returns a-ENODEVin such case) can be ignored, a wrong/buggy OPP table in device tree should make the driver error out.while we fix that, lets also fix the variable names for opp/opp_table to avoid confusion and name them opp_table/has_opp_table instead.
Quoted 8 lines
Quoted 6 lines
Suggested-by Matthias Kaehlcke <[email protected]>Signed-off-by Rajendra Nayak <[email protected]>Cc Ulf Hansson <[email protected]>Cc Pradeep P V K <[email protected]>Cc Veerabhadrarao Badiganti <[email protected]>Is this a standalone patch that I queue up via my mmc tree?
Hi Ulf, yes, its a standalone patch which applies on top of the one you already have in your tree. No other dependencies.
Quoted 76 lines
Kind regards
UffeQuoted 72 lines
--- drivers/mmc/host/sdhci-msm.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-)drivers/mmc/host/sdhci-msm.c +16
-12@@ -244,8 +244,8 @@ struct sdhci_msm_host {struct clk_bulk_data bulk_clks[4 ];/* core, iface, cal, sleep clocks */ unsigned long clk_rate;struct mmc_host *mmc; -struct opp_table *opp; -bool opp_table; +struct opp_table *opp_table; +bool has_opp_table;bool use_14lpp_dll_reset;bool tuning_done;bool calibration_done;@@ -1967,15 +1967,20 @@ static int sdhci_msm_probe(struct platform_device *pdev) } msm_host->bulk_clks[0 ].clk = clk; - msm_host->opp =dev_pm_opp_set_clkname (&pdev->dev,"core" ); -if (IS_ERR (msm_host->opp)) { - ret =PTR_ERR (msm_host->opp); + msm_host->opp_table =dev_pm_opp_set_clkname (&pdev->dev,"core" ); +if (IS_ERR (msm_host->opp_table)) { + ret =PTR_ERR (msm_host->opp_table); goto bus_clk_disable; }/* OPP table is optional */ -if (!dev_pm_opp_of_add_table (&pdev->dev)) - msm_host->opp_table = true; + ret =dev_pm_opp_of_add_table (&pdev->dev); +if (!ret) { + msm_host->has_opp_table = true; + }else if (ret != -ENODEV ) { +dev_err (&pdev->dev,"Invalid OPP table in Device tree\n" ); + goto opp_cleanup; + }/* Vote for maximum clock rate for maximum performance */ ret =dev_pm_opp_set_rate (&pdev->dev,INT_MAX );@@ -2133,9 +2138,9 @@ static int sdhci_msm_probe(struct platform_device *pdev)clk_bulk_disable_unprepare (ARRAY_SIZE (msm_host->bulk_clks), msm_host->bulk_clks); opp_cleanup: -if (msm_host->opp_table) +if (msm_host->has_opp_table)dev_pm_opp_of_remove_table (&pdev->dev); -dev_pm_opp_put_clkname (msm_host->opp); +dev_pm_opp_put_clkname (msm_host->opp_table); bus_clk_disable:if (!IS_ERR (msm_host->bus_clk))clk_disable_unprepare (msm_host->bus_clk);@@ -2154,9 +2159,9 @@ static int sdhci_msm_remove(struct platform_device *pdev)sdhci_remove_host (host, dead); -if (msm_host->opp_table) +if (msm_host->has_opp_table)dev_pm_opp_of_remove_table (&pdev->dev); -dev_pm_opp_put_clkname (msm_host->opp); +dev_pm_opp_put_clkname (msm_host->opp_table);pm_runtime_get_sync (&pdev->dev);pm_runtime_disable (&pdev->dev);pm_runtime_put_noidle (&pdev->dev); --QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 03/17] arm64: dts: sdm845: Add OPP table for all qup devices
In reply to Matthias KaehlckeQuoted 45 lines · Matthias Kaehlcke
Hi Rajendra,
Quoted 27 lines · Rajendra Nayak
qup has a requirement to vote on the performance state of the CX domain in sdm845 devices. Add OPP tables for these and also add power-domains property for all qup instances.
Signed-off-by Rajendra Nayak <[email protected]>Signed-off-by Stephen Boyd <[email protected]>--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 115 +++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+)arch/arm64/boot/dts/qcom/sdm845.dtsi +9
-0@@ -804,6 +804,25 @@ clock-names = "core"; }; + qup_opp_table: qup-opp-table { + compatible = "operating-points-v2"; + + opp-19200000 { + opp-hz = /bits/ 64 <19200000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-75000000 {arch/arm64/boot/dts/qcom/sdm845.dtsi line 825
Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +10
-0+ opp-hz = /bits/ 64 <75000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-100000000 { + opp-hz = /bits/ 64 <100000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + }; +Judging from SDM845 (which has more OPP tables) the convention seems to be to add OPP tables to the nodes that use them, which seems reasonable and keeps them out of the device list.
Quoted 4 lines
Unfortunately this convention isn't completely suitable for cases like this (and the DSI OPPs later in this series), where the same OPP table is used by multiple devices. A possible compromise would be to add the table to the node of the first device that uses them.
Sounds fair, I will do that and respin. Thanks.
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 05/17] drm/msm/dpu: Use OPP API to set clk/perf state
In reply to Matthias KaehlckeQuoted 65 lines · Matthias Kaehlcke
Quoted 51 lines · Rajendra Nayak
On some qualcomm platforms DPU needs to express a perforamnce state requirement on a power domain depennding on the clock rates. Use OPP table from DT to register with OPP framework and use
dev_pm_opp_set_rate()to set the clk/perf state.Signed-off-by Rajendra Nayak <[email protected]>Cc Rob Clark <[email protected]>Cc Sean Paul <[email protected]>--- drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 3 ++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 25 ++++++++++++++++++++++++- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 4 ++++ 3 files changed, 30 insertions(+), 2 deletions(-)drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c +2
-1@@ -7,6 +7,7 @@#include <linux/debugfs.h> #include <linux/errno.h> #include <linux/mutex.h> +#include <linux/pm_opp.h> #include <linux/sort.h> #include <linux/clk.h> #include <linux/bitmap.h> @@ -239,7 +240,7 @@ static int _dpu_core_perf_set_core_clk_rate(struct dpu_kms *kms, u64 rate) rate = core_clk->max_rate; core_clk->rate = rate; -return msm_dss_clk_set_rate (core_clk,1 ); +return dev_pm_opp_set_rate (&kms->pdev->dev, core_clk->rate); }static u64 _dpu_core_perf_get_core_clk_rate (struct dpu_kms *kms)drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +1
-0@@ -10,6 +10,7 @@#include <linux/debugfs.h> #include <linux/dma-buf.h> #include <linux/of_irq.h> +#include <linux/pm_opp.h> #include <drm/drm_crtc.h> #include <drm/drm_file.h> @@ -1033,11 +1034,23 @@ static int dpu_bind(struct device *dev, struct device *master, void *data)if (!dpu_kms)return -ENOMEM ;drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c static int dpu_bind(struct device *dev, struct device *master, void *data) · line 1045
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +9
-0+ dpu_kms->opp_table =dev_pm_opp_set_clkname (dev,"core" ); +if (IS_ERR (dpu_kms->opp_table)) +return PTR_ERR (dpu_kms->opp_table); +/* OPP table is optional */ + ret =dev_pm_opp_of_add_table (dev); +if (!ret) { + dpu_kms->has_opp_table = true; + }else if (ret != -ENODEV ) { +dev_err (dev,"Invalid OPP table in Device tree\n" );nit: s/Device/device/ ?
Quoted 6 lines
uber-nit: s/Invalid/invalid/
most log messages in this file start with a lower case letter, except for acronyms/register names
please also change it in the other drivers unless you disagree.
Sure, will do. Thanks.
Quoted 62 lines
Quoted 49 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +14
-1+return ret; + } + mp = &dpu_kms->mp; ret =msm_dss_parse_clock (pdev, mp);if (ret) {DPU_ERROR ("failed to parse clocks, ret=%d\n" , ret); -return ret; + goto err; }platform_set_drvdata (pdev, dpu_kms);@@ -1051,6 +1064,11 @@ static int dpu_bind(struct device *dev, struct device *master, void *data) priv->kms = &dpu_kms->base;return ret; +err: +if (dpu_kms->has_opp_table) +dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (dpu_kms->opp_table); +return ret; }static void dpu_unbind (struct device *dev,struct device *master,void *data)@@ -1059,6 +1077,9 @@ static void dpu_unbind(struct device *dev, struct device *master, void *data)struct dpu_kms *dpu_kms =platform_get_drvdata (pdev);struct dss_module_power *mp = &dpu_kms->mp; +if (dpu_kms->has_opp_table) +dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (dpu_kms->opp_table);msm_dss_put_clk (mp->clk_config, mp->num_clk);devm_kfree (&pdev->dev, mp->clk_config); mp->num_clk =0 ;@@ -1090,6 +1111,8 @@ static int __maybe_unused dpu_runtime_suspend(struct device *dev)struct dpu_kms *dpu_kms =platform_get_drvdata (pdev);struct dss_module_power *mp = &dpu_kms->mp; +/* Drop the performance state vote */ +dev_pm_opp_set_rate (dev,0 ); rc =msm_dss_enable_clk (mp->clk_config, mp->num_clk, false);if (rc)DPU_ERROR ("clock disable failed rc:%d\n" , rc);drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +0
-0drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h struct dpu_kms { · line 137
Quoted 10 lines
drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h +4
-0@@ -128,6 +128,10 @@ struct dpu_kms {struct platform_device *pdev;bool rpm_enabled; + +struct opp_table *opp_table; +bool has_opp_table; +struct dss_module_power mp;/* reference count bandwidth requests, so we know when we can Reviewed-by Matthias Kaehlcke <[email protected]>
Signature · 6 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 07/17] arm64: dts: sdm845: Add DSI and MDP OPP tables and power-domains
In reply to Matthias KaehlckeQuoted 37 lines · Matthias Kaehlcke
Quoted 36 lines · Rajendra Nayak
Add the OPP tables for DSI and MDP based on the perf state/clk requirements, and add the power-domains property to specify the scalable power domain.
Signed-off-by Rajendra Nayak <[email protected]>--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 59 ++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+)arch/arm64/boot/dts/qcom/sdm845.dtsi +19
-0@@ -3309,6 +3309,59 @@ #reset-cells = <1>; }; + mdp_opp_table: mdp-opp-table { + compatible = "operating-points-v2"; + + opp-19200000 { + opp-hz = /bits/ 64 <19200000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-171428571 { + opp-hz = /bits/ 64 <171428571>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-344000000 { + opp-hz = /bits/ 64 <344000000>; + required-opps = <&rpmhpd_opp_svs_l1>; + }; + + opp-430000000 {
Quoted 8 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi line 3334
Quoted 4 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +4
-0+ opp-hz = /bits/ 64 <430000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + };as commented on "[v3,03/17] arm64: dts: sdm845: Add OPP table for all qup devices" (https://patchwork.kernel.org/patch/11514693/) this table should probably be inside the 'mdp' node.
right, I will move this and the below table inside the device nodes.
Quoted 35 lines
Quoted 21 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +20
-0+ + dsi_opp_table: dsi-opp-table { + compatible = "operating-points-v2"; + + opp-19200000 { + opp-hz = /bits/ 64 <19200000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-180000000 { + opp-hz = /bits/ 64 <180000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-275000000 { + opp-hz = /bits/ 64 <275000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-328580000 {arch/arm64/boot/dts/qcom/sdm845.dtsi line 3364
Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +10
-0+ opp-hz = /bits/ 64 <328580000>; + required-opps = <&rpmhpd_opp_svs_l1>; + }; + + opp-358000000 { + opp-hz = /bits/ 64 <358000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + }; +depending on the outcome of the discussion mentioned above this might have to move into the 'dsi0' node.
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 12/17] media: venus: core: Add support for opp tables/perf voting
In reply to Matthias KaehlckeQuoted 47 lines · Matthias Kaehlcke
Quoted 46 lines · Rajendra Nayak
Add support to add OPP tables and perf voting on the OPP powerdomain. This is needed so venus votes on the corresponding performance state for the OPP powerdomain along with setting the core clock rate.
Signed-off-by Rajendra Nayak <[email protected]>Cc Stanimir Varbanov <[email protected]>--- drivers/media/platform/qcom/venus/core.c | 28 +++++++++++++++++++ drivers/media/platform/qcom/venus/core.h | 5 ++++ drivers/media/platform/qcom/venus/pm_helpers.c | 37 +++++++++++++++++++++++--- 3 files changed, 66 insertions(+), 4 deletions(-)drivers/media/platform/qcom/venus/core.c +15
-0@@ -12,6 +12,7 @@#include <linux/platform_device.h> #include <linux/slab.h> #include <linux/types.h> +#include <linux/pm_opp.h> #include <linux/pm_runtime.h> #include <media/videobuf2-v4l2.h> #include <media/v4l2-mem2mem.h> @@ -214,6 +215,20 @@ static int venus_probe(struct platform_device *pdev)if (!core->pm_ops)return -ENODEV ; + core->opp_table =dev_pm_opp_set_clkname (dev,"core" ); +if (IS_ERR (core->opp_table)) +return PTR_ERR (core->opp_table); + +if (core->res->opp_pmdomain) { + ret =dev_pm_opp_of_add_table (dev); +if (!ret) { + core->has_opp_table = true; + }else if (ret != -ENODEV ) { +dev_err (dev,"Invalid OPP table in Device tree\n" ); +return ret; + } + } +if (core->pm_ops->core_get) { ret = core->pm_ops->core_get (dev);if (ret)
Quoted 8 lines
drivers/media/platform/qcom/venus/core.c static int venus_probe(struct platform_device *pdev) · line 319
Quoted 5 lines
drivers/media/platform/qcom/venus/core.c +1
-0@@ -301,6 +316,9 @@ static int venus_probe(struct platform_device *pdev) err_venus_shutdown:venus_shutdown (core); err_runtime_disable: +if (core->res->opp_pmdomain && core->has_opp_table)the check for '
core->res->opp_pmdomain' is not needed, 'core->has_opp_table' can only be true when 'core->res->opp_pmdomain' is not NULL.
ah, that's right, will fix. Thanks.
Quoted 14 lines
drivers/media/platform/qcom/venus/core.c static int venus_remove(struct platform_device *pdev) · line 347
Quoted 11 lines
drivers/media/platform/qcom/venus/core.c +3
-0+dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (core->opp_table);pm_runtime_set_suspended (dev);pm_runtime_disable (dev);hfi_destroy (core);@@ -326,6 +344,10 @@ static int venus_remove(struct platform_device *pdev)venus_firmware_deinit (core); +if (core->res->opp_pmdomain && core->has_opp_table)ditto
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 15/17] spi: spi-qcom-qspi: Use OPP API to set clk/perf state
In reply to Matthias KaehlckeQuoted 50 lines · Matthias Kaehlcke
Hi,
Quoted 47 lines · Rajendra Nayak
QSPI needs to vote on a performance state of a power domain depending on the clock rate. Add support for it by specifying the perf state/clock rate as an OPP table in device tree.
Signed-off-by Rajendra Nayak <[email protected]>Cc Mark Brown <[email protected]>Cc Alok Chauhan <[email protected]>Cc Akash Asthana <[email protected]>--- drivers/spi/spi-qcom-qspi.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-)drivers/spi/spi-qcom-qspi.c +4
-1@@ -8,6 +8,7 @@#include <linux/of.h> #include <linux/of_platform.h> #include <linux/pm_runtime.h> +#include <linux/pm_opp.h> #include <linux/spi/spi.h> #include <linux/spi/spi-mem.h> @@ -139,6 +140,8 @@ struct qcom_qspi {struct device *dev;struct clk_bulk_data *clks;struct qspi_xfer xfer; +struct opp_table *opp_table; +bool has_opp_table;/* Lock to protect xfer and IRQ accessed registers */ spinlock_t lock; };@@ -235,7 +238,7 @@ static int qcom_qspi_transfer_one(struct spi_master *master, speed_hz = xfer->speed_hz;/* In regular operation (SBL_EN=1) core must be 4x transfer clock */ - ret =clk_set_rate (ctrl->clks[QSPI_CLK_CORE ].clk, speed_hz *4 ); + ret =dev_pm_opp_set_rate (ctrl->dev, speed_hz *4 );if (ret) {dev_err (ctrl->dev,"Failed to set core clk %d\n" , ret);return ret;@@ -481,6 +484,20 @@ static int qcom_qspi_probe(struct platform_device *pdev) master->handle_err = qcom_qspi_handle_err; master->auto_runtime_pm = true;
Quoted 14 lines
drivers/spi/spi-qcom-qspi.c static int qcom_qspi_probe(struct platform_device *pdev) · line 498
Quoted 12 lines
drivers/spi/spi-qcom-qspi.c +12
-0+ ctrl->opp_table =dev_pm_opp_set_clkname (&pdev->dev,"core" ); +if (IS_ERR (ctrl->opp_table)) { + ret =PTR_ERR (ctrl->opp_table); + goto exit_probe_master_put; + } +/* OPP table is optional */ + ret =dev_pm_opp_of_add_table (&pdev->dev); +if (!ret) { + ctrl->has_opp_table = true; + }else if (ret != -ENODEV ) { +dev_err (&pdev->dev,"Invalid OPP table in Device tree\n" ); +return ret;goto exit_probe_master_put;
thanks for catching this. will fix and respin.
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 12/17] media: venus: core: Add support for opp tables/perf voting
In reply to Rajendra NayakHi Rajendra,
Thanks for the patch!
Quoted 26 lines · Rajendra Nayak
Add support to add OPP tables and perf voting on the OPP powerdomain. This is needed so venus votes on the corresponding performance state for the OPP powerdomain along with setting the core clock rate.
Signed-off-by Rajendra Nayak <[email protected]>Cc Stanimir Varbanov <[email protected]>--- drivers/media/platform/qcom/venus/core.c | 28 +++++++++++++++++++ drivers/media/platform/qcom/venus/core.h | 5 ++++ drivers/media/platform/qcom/venus/pm_helpers.c | 37 +++++++++++++++++++++++--- 3 files changed, 66 insertions(+), 4 deletions(-)drivers/media/platform/qcom/venus/core.c +1
-0@@ -12,6 +12,7 @@#include <linux/platform_device.h> #include <linux/slab.h> #include <linux/types.h> +#include <linux/pm_opp.h> #include <linux/pm_runtime.h> #include <media/videobuf2-v4l2.h> #include <media/v4l2-mem2mem.h>
drivers/media/platform/qcom/venus/core.c static int venus_probe(struct platform_device *pdev) · line 218
Quoted 4 lines
drivers/media/platform/qcom/venus/core.c +1
-0@@ -214,6 +215,20 @@ static int venus_probe(struct platform_device *pdev)if (!core->pm_ops)return -ENODEV ; + core->opp_table =dev_pm_opp_set_clkname (dev,"core" );
Should we set opp clkname if opp_of_add_table fails? We have platforms which don't have opp tables in Venus DT node. We have to be backward compatible for them.
drivers/media/platform/qcom/venus/core.c static int venus_probe(struct platform_device *pdev) · line 226
Quoted 8 lines
drivers/media/platform/qcom/venus/core.c +8
-0+if (IS_ERR (core->opp_table)) +return PTR_ERR (core->opp_table); + +if (core->res->opp_pmdomain) { + ret =dev_pm_opp_of_add_table (dev); +if (!ret) { + core->has_opp_table = true; + }else if (ret != -ENODEV ) {
Is it possible dev_pm_opp_of_add_table() to return EPROBE_DEFER?
drivers/media/platform/qcom/venus/core.c static int venus_probe(struct platform_device *pdev) · line 227
Quoted 1 line
drivers/media/platform/qcom/venus/core.c +1
-0+dev_err (dev,"Invalid OPP table in Device tree\n" );
... if so, please drop dev_err.
Quoted 93 lines
drivers/media/platform/qcom/venus/core.c +17
-0+return ret; + } + } +if (core->pm_ops->core_get) { ret = core->pm_ops->core_get (dev);if (ret)@@ -301,6 +316,9 @@ static int venus_probe(struct platform_device *pdev) err_venus_shutdown:venus_shutdown (core); err_runtime_disable: +if (core->res->opp_pmdomain && core->has_opp_table) +dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (core->opp_table);pm_runtime_set_suspended (dev);pm_runtime_disable (dev);hfi_destroy (core);@@ -326,6 +344,10 @@ static int venus_remove(struct platform_device *pdev)venus_firmware_deinit (core); +if (core->res->opp_pmdomain && core->has_opp_table) +dev_pm_opp_of_remove_table (dev); +dev_pm_opp_put_clkname (core->opp_table); +pm_runtime_put_sync (dev);pm_runtime_disable (dev);@@ -350,6 +372,10 @@ static __maybe_unused int venus_runtime_suspend(struct device *dev)if (ret)return ret; +/* Drop the performance state vote */ +if (core->opp_pmdomain) +dev_pm_opp_set_rate (dev,0 ); +if (pm_ops->core_power) ret = pm_ops->core_power (dev,POWER_OFF );@@ -511,6 +537,7 @@ static const struct venus_resources sdm845_res_v2 = { .vcodec_clks_num = 2, .vcodec_pmdomains = { "venus", "vcodec0", "vcodec1" }, .vcodec_pmdomains_num = 3, + .opp_pmdomain = (const char *[]) { "opp-pd", NULL }, .vcodec_num = 2, .max_load = 3110400, /* 4096x2160@90 */ .hfi_version = HFI_VERSION_4XX,@@ -556,6 +583,7 @@ static const struct venus_resources sc7180_res = { .vcodec_clks_num = 2, .vcodec_pmdomains = { "venus", "vcodec0" }, .vcodec_pmdomains_num = 2, + .opp_pmdomain = (const char *[]) { "opp-pd", NULL }, .vcodec_num = 1, .hfi_version = HFI_VERSION_4XX, .vmem_id = VIDC_RESOURCE_NONE,drivers/media/platform/qcom/venus/core.h +5
-0@@ -62,6 +62,7 @@ struct venus_resources {unsigned int vcodec_clks_num;const char *const vcodec_pmdomains[VIDC_PMDOMAINS_NUM_MAX ];unsigned int vcodec_pmdomains_num; +const char **opp_pmdomain;unsigned int vcodec_num;enum hfi_version hfi_version;u32 max_load;@@ -144,8 +145,12 @@ struct venus_core {struct clk *vcodec1_clks[VIDC_VCODEC_CLKS_NUM_MAX ];struct icc_path *video_path;struct icc_path *cpucfg_path; +struct opp_table *opp_table; +bool has_opp_table;struct device_link *pd_dl_venus;struct device *pmdomains[VIDC_PMDOMAINS_NUM_MAX ]; +struct device_link *opp_dl_venus; +struct device *opp_pmdomain;struct video_device *vdev_dec;struct video_device *vdev_enc;struct v4l2_device v4l2_dev;drivers/media/platform/qcom/venus/pm_helpers.c +1
-0@@ -9,6 +9,7 @@#include <linux/iopoll.h> #include <linux/kernel.h> #include <linux/pm_domain.h> +#include <linux/pm_opp.h> #include <linux/pm_runtime.h> #include <linux/types.h> #include <media/v4l2-mem2mem.h>
drivers/media/platform/qcom/venus/pm_helpers.c static void core_clks_disable(struct venus_core *core) · line 72
Quoted 8 lines
drivers/media/platform/qcom/venus/pm_helpers.c +1
-2@@ -66,10 +67,9 @@ static void core_clks_disable(struct venus_core *core)static int core_clks_set_rate (struct venus_core *core,unsigned long freq) { -struct clk *clk = core->clks[0 ];int ret; - ret =clk_set_rate (clk, freq); + ret =dev_pm_opp_set_rate (core->dev, freq);
Is this will work for legacy platforms without OPP tables?
Also what about the other clocks (vicodec0,1) in this function.
Quoted 30 lines
drivers/media/platform/qcom/venus/pm_helpers.c +9
-1if (ret)return ret;@@ -740,13 +740,15 @@ static int venc_power_v4(struct device *dev, int on)static int vcodec_domains_get (struct device *dev) { +struct opp_table *opp_table; +struct device **opp_virt_dev;struct venus_core *core =dev_get_drvdata (dev);const struct venus_resources *res = core->res;struct device *pd;unsigned int i;if (!res->vcodec_pmdomains_num) -return -ENODEV ; + goto skip_pmdomains;for (i =0 ; i < res->vcodec_pmdomains_num; i++) { pd = dev_pm_domain_attach_by_name(dev,@@ -763,6 +765,24 @@ static int vcodec_domains_get(struct device *dev)if (!core->pd_dl_venus)return -ENODEV ; +skip_pmdomains: +if (!res->opp_pmdomain || !core->has_opp_table) +return 0 ; + +/* Attach the power domain for setting performance state */ + opp_table =dev_pm_opp_attach_genpd (dev, res->opp_pmdomain, &opp_virt_dev);
drivers/media/platform/qcom/venus/pm_helpers.c static int vcodec_domains_get(struct device *dev) · line 783
Quoted 10 lines
drivers/media/platform/qcom/venus/pm_helpers.c +10
-0+if (IS_ERR (opp_table)) { +return PTR_ERR (opp_table); + }else if (opp_virt_dev) { + core->opp_pmdomain = *opp_virt_dev; + core->opp_dl_venus =device_link_add (dev, core->opp_pmdomain, +DL_FLAG_RPM_ACTIVE | +DL_FLAG_PM_RUNTIME | +DL_FLAG_STATELESS ); +if (!core->opp_dl_venus) +return -ENODEV ;
I think as you return ENODEV you have to detach opp domain here because vcodec_domains_put() is not called in error path.
Quoted 31 lines
drivers/media/platform/qcom/venus/pm_helpers.c +12
-1+ } +return 0 ; }@@ -773,7 +793,7 @@ static void vcodec_domains_put(struct device *dev)unsigned int i;if (!res->vcodec_pmdomains_num) -return ; + goto skip_pmdomains;if (core->pd_dl_venus)device_link_del (core->pd_dl_venus);@@ -783,6 +803,15 @@ static void vcodec_domains_put(struct device *dev)continue ;dev_pm_domain_detach (core->pmdomains[i], true); } + +skip_pmdomains: +if (!res->opp_pmdomain) +return ; + +if (core->opp_dl_venus) +device_link_del (core->opp_dl_venus); + +dev_pm_domain_detach (core->opp_pmdomain, true); }static int core_get_v4 (struct device *dev)
Signature · 2 lines
regards, Stan
Re: [PATCH v3 03/17] arm64: dts: sdm845: Add OPP table for all qup devices
In reply to Rajendra NayakQuoted 46 lines · Rajendra Nayak
Quoted 44 lines · Matthias Kaehlcke
Hi Rajendra,
Quoted 26 lines · Rajendra Nayak
qup has a requirement to vote on the performance state of the CX domain in sdm845 devices. Add OPP tables for these and also add power-domains property for all qup instances.
Signed-off-by Rajendra Nayak <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
arch/arm64/boot/dts/qcom/sdm845.dtsi| 115 +++++++++++++++++++++++++++++++++++1 file changed, 115 insertions(+)arch/arm64/boot/dts/qcom/sdm845.dtsi +9
-0@@ -804,6 +804,25 @@ clock-names = "core"; }; + qup_opp_table: qup-opp-table { + compatible = "operating-points-v2"; + + opp-19200000 { + opp-hz = /bits/ 64 <19200000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-75000000 {arch/arm64/boot/dts/qcom/sdm845.dtsi line 824
Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +10
-0+ opp-hz = /bits/ 64 <75000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-100000000 { + opp-hz = /bits/ 64 <100000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + }; +Judging from SDM845 (which has more OPP tables) the convention seems to be to add OPP tables to the nodes that use them, which seems reasonable and keeps them out of the device list.
Quoted 6 lines
Quoted 4 lines
Unfortunately this convention isn't completely suitable for cases like this (and the DSI OPPs later in this series), where the same OPP table is used by multiple devices. A possible compromise would be to add the table to the node of the first device that uses them.
Sounds fair, I will do that and respin. Thanks.
Looking into this some more, I see we do have..
static const struct of_device_id of_skipped_node_table[] = {
{ .compatible = "operating-points-v2", }, {} /* Empty terminated list */
};
..in drivers/of/platform.c, so its not being added to the device list.
And atleast in case of qup, I am having to duplicate the OPP tables once for each qup instance. Not to mention, having them inside the first qup device just makes it a little confusing to read who the OPP table belongs to.
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 12/17] media: venus: core: Add support for opp tables/perf voting
In reply to Stanimir VarbanovHey Stan,
Quoted 4 lines · Stanimir Varbanov
Hi Rajendra,
Thanks for the patch!
[]..
Quoted 7 lines
Quoted 7 lines
#include <linux/pm_runtime.h> #include <media/videobuf2-v4l2.h> #include <media/v4l2-mem2mem.h>drivers/media/platform/qcom/venus/core.c +0
-0@@ -214,6 +215,20 @@ static int venus_probe(struct platform_device *pdev)if (!core->pm_ops)return -ENODEV ;
Quoted 5 lines
drivers/media/platform/qcom/venus/core.c static int venus_probe(struct platform_device *pdev) · line 218
Quoted 1 line
drivers/media/platform/qcom/venus/core.c +1
-0+ core->opp_table =dev_pm_opp_set_clkname (dev,"core" );Should we set opp clkname if
opp_of_add_tablefails? We have platforms which don't have opp tables in Venus DT node. We have to be backward compatible for them.
so the way its designed, you are expected to call dev_pm_opp_set_clkname() *before* adding any OPPs from the OPP table.
As for backward compatibility its already handled by the OPP core now [1] which makes sure dev_pm_opp_set_rate() is equivalent to a clk_set_rate() in case of a missing OPP table.
Quoted 10 lines
drivers/media/platform/qcom/venus/core.c static int venus_probe(struct platform_device *pdev) · line 226
Quoted 8 lines
drivers/media/platform/qcom/venus/core.c +8
-0+if (IS_ERR (core->opp_table)) +return PTR_ERR (core->opp_table); + +if (core->res->opp_pmdomain) { + ret =dev_pm_opp_of_add_table (dev); +if (!ret) { + core->has_opp_table = true; + }else if (ret != -ENODEV ) {Is it possible
dev_pm_opp_of_add_table()to returnEPROBE_DEFER?
Nope, it does not, I had checked.
Quoted 7 lines
drivers/media/platform/qcom/venus/core.c static int venus_probe(struct platform_device *pdev) · line 227
Quoted 1 line
drivers/media/platform/qcom/venus/core.c +1
-0+dev_err (dev,"Invalid OPP table in Device tree\n" );... if so, please drop
dev_err.drivers/media/platform/qcom/venus/core.c static int venus_probe(struct platform_device *pdev) · line 230
Quoted 3 lines
drivers/media/platform/qcom/venus/core.c +3
-0+return ret; + } + }
[]..
Quoted 17 lines
Quoted 17 lines
drivers/media/platform/qcom/venus/pm_helpers.c +1
-1@@ -9,6 +9,7 @@#include <linux/iopoll.h> #include <linux/kernel.h> #include <linux/pm_domain.h> +#include <linux/pm_opp.h> #include <linux/pm_runtime.h> #include <linux/types.h> #include <media/v4l2-mem2mem.h> @@ -66,10 +67,9 @@ static void core_clks_disable(struct venus_core *core)static int core_clks_set_rate (struct venus_core *core,unsigned long freq) { -struct clk *clk = core->clks[0 ];int ret;
Quoted 4 lines
drivers/media/platform/qcom/venus/pm_helpers.c static void core_clks_disable(struct venus_core *core) · line 72
Quoted 2 lines
drivers/media/platform/qcom/venus/pm_helpers.c +1
-1- ret =clk_set_rate (clk, freq); + ret =dev_pm_opp_set_rate (core->dev, freq);Is this will work for legacy platforms without OPP tables?
yes, see [1] which is already merged in mainline.
Quoted 2 lines
Also what about the other clocks (vicodec0,1) in this function.
We continue to use clk_set_rate() for those. The performance state is associated with only the core clk.
Quoted 35 lines
Quoted 35 lines
drivers/media/platform/qcom/venus/pm_helpers.c +14
-1if (ret)return ret;@@ -740,13 +740,15 @@ static int venc_power_v4(struct device *dev, int on)static int vcodec_domains_get (struct device *dev) { +struct opp_table *opp_table; +struct device **opp_virt_dev;struct venus_core *core =dev_get_drvdata (dev);const struct venus_resources *res = core->res;struct device *pd;unsigned int i;if (!res->vcodec_pmdomains_num) -return -ENODEV ; + goto skip_pmdomains;for (i =0 ; i < res->vcodec_pmdomains_num; i++) { pd = dev_pm_domain_attach_by_name(dev,@@ -763,6 +765,24 @@ static int vcodec_domains_get(struct device *dev)if (!core->pd_dl_venus)return -ENODEV ; +skip_pmdomains: +if (!res->opp_pmdomain || !core->has_opp_table) +return 0 ; + +/* Attach the power domain for setting performance state */ + opp_table =dev_pm_opp_attach_genpd (dev, res->opp_pmdomain, &opp_virt_dev); +if (IS_ERR (opp_table)) { +return PTR_ERR (opp_table); + }else if (opp_virt_dev) { + core->opp_pmdomain = *opp_virt_dev; + core->opp_dl_venus = device_link_add(dev, core->opp_pmdomain,
Quoted 8 lines
drivers/media/platform/qcom/venus/pm_helpers.c static int vcodec_domains_get(struct device *dev) · line 783
Quoted 5 lines
drivers/media/platform/qcom/venus/pm_helpers.c +5
-0+DL_FLAG_RPM_ACTIVE | +DL_FLAG_PM_RUNTIME | + DL_FLAG_STATELESS); +if (!core->opp_dl_venus) +return -ENODEV ;I think as you return ENODEV you have to detach opp domain here because
vcodec_domains_put()is not called in error path.
Ok, I'll fix that up.
Thanks for the review.
[1] https://lkml.org/lkml/2020/4/8/413
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 03/17] arm64: dts: sdm845: Add OPP table for all qup devices
In reply to Rajendra NayakQuoted 55 lines · Rajendra Nayak
Quoted 46 lines · Rajendra Nayak
Quoted 44 lines · Matthias Kaehlcke
Hi Rajendra,
Quoted 26 lines · Rajendra Nayak
qup has a requirement to vote on the performance state of the CX domain in sdm845 devices. Add OPP tables for these and also add power-domains property for all qup instances.
Signed-off-by Rajendra Nayak <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
arch/arm64/boot/dts/qcom/sdm845.dtsi| 115 +++++++++++++++++++++++++++++++++++1 file changed, 115 insertions(+)arch/arm64/boot/dts/qcom/sdm845.dtsi +9
-0@@ -804,6 +804,25 @@ clock-names = "core"; }; + qup_opp_table: qup-opp-table { + compatible = "operating-points-v2"; + + opp-19200000 { + opp-hz = /bits/ 64 <19200000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-75000000 {arch/arm64/boot/dts/qcom/sdm845.dtsi line 824
Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +10
-0+ opp-hz = /bits/ 64 <75000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-100000000 { + opp-hz = /bits/ 64 <100000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + }; +Judging from SDM845 (which has more OPP tables) the convention seems to be to add OPP tables to the nodes that use them, which seems reasonable and keeps them out of the device list.
Quoted 6 lines
Quoted 4 lines
Unfortunately this convention isn't completely suitable for cases like this (and the DSI OPPs later in this series), where the same OPP table is used by multiple devices. A possible compromise would be to add the table to the node of the first device that uses them.
Sounds fair, I will do that and respin. Thanks.
Quoted 8 lines
Looking into this some more, I see we do have..
static const struct
of_device_idof_skipped_node_table[] = {
{ .compatible = "operating-points-v2", }, {} /* Empty terminated list */
};..in
drivers/of/platform.c, so its not being added to the device list.
sure, I didn't mean that the OPP table is added by the kernel as a device, but that the table breaks with the structure of the DT of device nodes ordered by address.
Quoted 3 lines
And atleast in case of qup, I am having to duplicate the OPP tables once for each qup instance. Not to mention, having them inside the first qup device just makes it a little confusing to read who the OPP table belongs to.
I'm not advocating for duplicating the OPP tables. An alternative to having them in the first QUP device could be to have an dedicated node with shared opp tables outside of the device list, similar to thermal-zones.
I tend to like consistency and the sprinkled in OPP tables break with that, but ultimately it's up to Bjorn.
Re: [PATCH v3 03/17] arm64: dts: sdm845: Add OPP table for all qup devices
Quoted 63 lines · Matthias Kaehlcke
Quoted 62 lines · Rajendra Nayak
Quoted 46 lines · Rajendra Nayak
Quoted 44 lines · Matthias Kaehlcke
Hi Rajendra,
Quoted 26 lines · Rajendra Nayak
qup has a requirement to vote on the performance state of the CX domain in sdm845 devices. Add OPP tables for these and also add power-domains property for all qup instances.
Signed-off-by Rajendra Nayak <[email protected]>Signed-off-by Stephen Boyd <[email protected]>--- arch/arm64/boot/dts/qcom/sdm845.dtsi | 115 +++++++++++++++++++++++++++++++++++ 1 file changed, 115 insertions(+)arch/arm64/boot/dts/qcom/sdm845.dtsi +9
-0@@ -804,6 +804,25 @@ clock-names = "core"; }; + qup_opp_table: qup-opp-table { + compatible = "operating-points-v2"; + + opp-19200000 { + opp-hz = /bits/ 64 <19200000>; + required-opps = <&rpmhpd_opp_min_svs>; + }; + + opp-75000000 {arch/arm64/boot/dts/qcom/sdm845.dtsi line 824
Quoted 10 lines
arch/arm64/boot/dts/qcom/sdm845.dtsi +10
-0+ opp-hz = /bits/ 64 <75000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-100000000 { + opp-hz = /bits/ 64 <100000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + }; +Judging from SDM845 (which has more OPP tables) the convention seems to be to add OPP tables to the nodes that use them, which seems reasonable and keeps them out of the device list.
Quoted 6 lines
Quoted 4 lines
Unfortunately this convention isn't completely suitable for cases like this (and the DSI OPPs later in this series), where the same OPP table is used by multiple devices. A possible compromise would be to add the table to the node of the first device that uses them.
Sounds fair, I will do that and respin. Thanks.
Looking into this some more, I see we do have..
static const struct
of_device_idof_skipped_node_table[] = {
{ .compatible = "operating-points-v2", }, {} /* Empty terminated list */
};
Quoted 5 lines
Quoted 1 line
..in
drivers/of/platform.c, so its not being added to the device list.sure, I didn't mean that the OPP table is added by the kernel as a device, but that the table breaks with the structure of the DT of device nodes ordered by address.
Ah ok, got it.
Quoted 8 lines
Quoted 4 lines
And atleast in case of qup, I am having to duplicate the OPP tables once for each qup instance. Not to mention, having them inside the first qup device just makes it a little confusing to read who the OPP table belongs to.
I'm not advocating for duplicating the OPP tables. An alternative to having them in the first QUP device could be to have an dedicated node with shared opp tables outside of the device list, similar to thermal-zones.
That sounds like a good idea too.
Quoted 2 lines
I tend to like consistency and the sprinkled in OPP tables break with that, but ultimately it's up to Bjorn.
Bjorn, any thoughts?
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 03/17] arm64: dts: sdm845: Add OPP table for all qup devices
In reply to Matthias KaehlckeQuoted 2 lines · Matthias Kaehlcke
Judging from SDM845 (which has more OPP tables) the convention seems to be to add OPP tables to the nodes that use them, which seems reasonable and
I don't think that's right. The same DT opp tables are used for multiple CPUs and they are placed outside of any device's node.
And that is the reason we have handled that specially in kernel (which Rajendra shared in another email), to not create a platform device for the opp table.
Signature · 1 line
viresh
Re: [PATCH v3 09/17] mmc: sdhci-msm: Fix error handling for dev_pm_opp_of_add_table()
In reply to Rajendra NayakQuoted 21 lines · Rajendra Nayak
Quoted 18 lines · Ulf Hansson
Quoted 16 lines · Rajendra Nayak
Even though specifying OPP's in device tree is optional, ignoring all errors reported by
dev_pm_opp_of_add_table()means we can't distinguish between a missing OPP table and a wrong/buggy OPP table. While missing OPP table (dev_pm_opp_of_add_table()returns a-ENODEVin such case) can be ignored, a wrong/buggy OPP table in device tree should make the driver error out.while we fix that, lets also fix the variable names for opp/opp_table to avoid confusion and name them opp_table/has_opp_table instead.
Suggested-by Matthias Kaehlcke <[email protected]>Signed-off-by Rajendra Nayak <[email protected]>Cc Ulf Hansson <[email protected]>Cc Pradeep P V K <[email protected]>Cc Veerabhadrarao Badiganti <[email protected]>
Quoted 4 lines
Quoted 1 line
Is this a standalone patch that I queue up via my mmc tree?
Hi Ulf, yes, its a standalone patch which applies on top of the one you already have in your tree. No other dependencies.
Thanks for confirming! Perhaps next time you could add this information as part of a description to the patch (where we usually add patch version information).
Anyway, applied for next!
[...]
Kind regards
Uffe
Re: [PATCH v3 09/17] mmc: sdhci-msm: Fix error handling for dev_pm_opp_of_add_table()
Quoted 24 lines · Ulf Hansson
Quoted 23 lines · Rajendra Nayak
Quoted 19 lines · Ulf Hansson
Quoted 10 lines · Rajendra Nayak
Even though specifying OPP's in device tree is optional, ignoring all errors reported by
dev_pm_opp_of_add_table()means we can't distinguish between a missing OPP table and a wrong/buggy OPP table. While missing OPP table (dev_pm_opp_of_add_table()returns a-ENODEVin such case) can be ignored, a wrong/buggy OPP table in device tree should make the driver error out.while we fix that, lets also fix the variable names for opp/opp_table to avoid confusion and name them opp_table/has_opp_table instead.
Quoted 6 lines
Suggested-by Matthias Kaehlcke <[email protected]>Signed-off-by Rajendra Nayak <[email protected]>Cc Ulf Hansson <[email protected]>Cc Pradeep P V K <[email protected]>Cc Veerabhadrarao Badiganti <[email protected]>Is this a standalone patch that I queue up via my mmc tree?
Quoted 8 lines
Quoted 2 lines
Hi Ulf, yes, its a standalone patch which applies on top of the one you already have in your tree. No other dependencies.
Thanks for confirming! Perhaps next time you could add this information as part of a description to the patch (where we usually add patch version information).
Anyway, applied for next!
Thanks Ulf, I should have sent this out as a standalone patch instead of including it with the reset of the series, which caused the confusion. Sorry about that :/
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation
Re: [PATCH v3 04/17] arm64: dts: sc7180: Add OPP table for all qup devices
In reply to Rajendra NayakHi Rajendra,
Quoted 29 lines · Rajendra Nayak
qup has a requirement to vote on the performance state of the CX domain in sc7180 devices. Add OPP tables for these and also add power-domains property for all qup instances.
Signed-off-by Rajendra Nayak <[email protected]>--- arch/arm64/boot/dts/qcom/sc7180.dtsi | 79 ++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+)arch/arm64/boot/dts/qcom/sc7180.dtsi +12
-0@@ -417,6 +417,25 @@ status = "disabled"; }; + qup_opp_table: qup-opp-table { + compatible = "operating-points-v2"; + + opp-75000000 { + opp-hz = /bits/ 64 <75000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-100000000 { + opp-hz = /bits/ 64 <100000000>; + required-opps = <&rpmhpd_opp_svs>; + };
arch/arm64/boot/dts/qcom/sc7180.dtsi line 441
Quoted 10 lines
arch/arm64/boot/dts/qcom/sc7180.dtsi +7
-0+ + opp-128000000 { + opp-hz = /bits/ 64 <128000000>; + required-opps = <&rpmhpd_opp_nom>; + }; + }; + qupv3_id_0: geniqup@8c0000 { compatible = "qcom,geni-se-qup"; reg = <0 0x008c0000 0 0x6000>;
no entries for i2c0?
Quoted 127 lines
arch/arm64/boot/dts/qcom/sc7180.dtsi +28
-0@@ -452,6 +471,8 @@ interrupts = <GIC_SPI 601 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -463,6 +484,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart0_default>; interrupts = <GIC_SPI 601 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -476,6 +499,8 @@ interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -489,6 +514,8 @@ interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -500,6 +527,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart1_default>; interrupts = <GIC_SPI 602 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -513,6 +542,8 @@ interrupts = <GIC_SPI 603 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -524,6 +555,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart2_default>; interrupts = <GIC_SPI 603 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -537,6 +570,8 @@ interrupts = <GIC_SPI 604 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -550,6 +585,8 @@ interrupts = <GIC_SPI 604 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -561,6 +598,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart3_default>; interrupts = <GIC_SPI 604 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -574,6 +613,8 @@ interrupts = <GIC_SPI 605 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -585,6 +626,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart4_default>; interrupts = <GIC_SPI 605 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -598,6 +641,8 @@ interrupts = <GIC_SPI 606 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -611,6 +656,8 @@ interrupts = <GIC_SPI 606 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };
arch/arm64/boot/dts/qcom/sc7180.dtsi line 676
Quoted 8 lines
arch/arm64/boot/dts/qcom/sc7180.dtsi +2
-0@@ -622,6 +669,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart5_default>; interrupts = <GIC_SPI 606 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; }; };
no entries for i2c6?
Quoted 135 lines
arch/arm64/boot/dts/qcom/sc7180.dtsi +30
-0@@ -661,6 +710,8 @@ interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -672,6 +723,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart6_default>; interrupts = <GIC_SPI 353 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -685,6 +738,8 @@ interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -696,6 +751,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart7_default>; interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -709,6 +766,8 @@ interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -722,6 +781,8 @@ interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -733,6 +794,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart8_default>; interrupts = <GIC_SPI 355 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -746,6 +809,8 @@ interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -757,6 +822,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart9_default>; interrupts = <GIC_SPI 356 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -770,6 +837,8 @@ interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -783,6 +852,8 @@ interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -794,6 +865,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart10_default>; interrupts = <GIC_SPI 357 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -807,6 +880,8 @@ interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -820,6 +895,8 @@ interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>; #address-cells = <1>; #size-cells = <0>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; };@@ -831,6 +908,8 @@ pinctrl-names = "default"; pinctrl-0 = <&qup_uart11_default>; interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>; + power-domains = <&rpmhpd SC7180_CX>; + operating-points-v2 = <&qup_opp_table>; status = "disabled"; }; }
Re: [PATCH v3 04/17] arm64: dts: sc7180: Add OPP table for all qup devices
Quoted 37 lines · Matthias Kaehlcke
Hi Rajendra,
Quoted 34 lines · Rajendra Nayak
qup has a requirement to vote on the performance state of the CX domain in sc7180 devices. Add OPP tables for these and also add power-domains property for all qup instances.
Signed-off-by Rajendra Nayak <[email protected]>--- arch/arm64/boot/dts/qcom/sc7180.dtsi | 79 ++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+)arch/arm64/boot/dts/qcom/sc7180.dtsi +17
-0@@ -417,6 +417,25 @@ status = "disabled"; }; + qup_opp_table: qup-opp-table { + compatible = "operating-points-v2"; + + opp-75000000 { + opp-hz = /bits/ 64 <75000000>; + required-opps = <&rpmhpd_opp_low_svs>; + }; + + opp-100000000 { + opp-hz = /bits/ 64 <100000000>; + required-opps = <&rpmhpd_opp_svs>; + }; + + opp-128000000 { + opp-hz = /bits/ 64 <128000000>; + required-opps = <&rpmhpd_opp_nom>; + };
Quoted 8 lines
arch/arm64/boot/dts/qcom/sc7180.dtsi line 441
Quoted 5 lines
arch/arm64/boot/dts/qcom/sc7180.dtsi +2
-0+ }; + qupv3_id_0: geniqup@8c0000 { compatible = "qcom,geni-se-qup"; reg = <0 0x008c0000 0 0x6000>;no entries for i2c0?
I have actually wrongly added them for some i2c instances, I need to drop all of them. geni i2c does not support dvfs, it just uses a fixed clock.
Signature · 2 lines
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation