From 43b189a712ad04fcae6eea6b44ded5c9cffc4bae Mon Sep 17 00:00:00 2001 From: Finley Xiao Date: Mon, 4 Mar 2019 17:40:47 +0800 Subject: [PATCH] soc: rockchip: Change the parameter of power model for cpu and npu Change-Id: I73724946fce82311d29de4538b8446e87d67dc92 Signed-off-by: Finley Xiao --- arch/arm64/boot/dts/rockchip/rk1808.dtsi | 14 +++++++++++--- drivers/soc/rockchip/rockchip_ipa.c | 6 +++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk1808.dtsi b/arch/arm64/boot/dts/rockchip/rk1808.dtsi index 2cbae980e0e3..34d58bac7c77 100644 --- a/arch/arm64/boot/dts/rockchip/rk1808.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk1808.dtsi @@ -53,6 +53,13 @@ operating-points-v2 = <&cpu0_opp_table>; dynamic-power-coefficient = <74>; #cooling-cells = <2>; + power-model { + compatible = "simple-power-model"; + ref-leakage = <31>; + static-coefficient = <100000>; + ts = <59740 24105 (-245) 7>; + thermal-zone = "soc-thermal"; + }; }; cpu1: cpu@1 { @@ -576,7 +583,7 @@ soc_thermal: soc-thermal { polling-delay-passive = <20>; /* milliseconds */ polling-delay = <1000>; /* milliseconds */ - sustainable-power = <527>; /* milliwatts */ + sustainable-power = <977>; /* milliwatts */ thermal-sensors = <&tsadc 0>; @@ -1543,9 +1550,10 @@ npu_power_model: power-model { compatible = "simple-power-model"; - static-coefficient = <342478>; + ref-leakage = <31>; + static-coefficient = <100000>; dynamic-coefficient = <3080>; - ts = <32000 4700 (-80) 2>; + ts = <8861 30312 (-500) 10>; thermal-zone = "soc-thermal"; }; }; diff --git a/drivers/soc/rockchip/rockchip_ipa.c b/drivers/soc/rockchip/rockchip_ipa.c index 0c91147527d5..37ee0dbe1e5b 100644 --- a/drivers/soc/rockchip/rockchip_ipa.c +++ b/drivers/soc/rockchip/rockchip_ipa.c @@ -115,7 +115,11 @@ static u32 calculate_volt_scaling_factor(const u32 voltage_mv) const u32 v3 = v3_big / 1000; - return v3; + const u32 v4_big = v3 * voltage_mv; + + const u32 v4 = v4_big / 1000; + + return v4; } /**