Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d5d4d4b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: enable compute governor on sdxpoorwills target"

parents b1178136 2dbbee6e

arch/arm/boot/dts/qcom/sdxpoorwills.dtsi

+27 −0
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ 
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>

#include <dt-bindings/clock/qcom,aop-qmp.h>



#define MHZ_TO_MBPS(mhz, w) ((mhz * 1000000 * w) / (1024 * 1024))



/ {

	model = "Qualcomm Technologies, Inc. SDX POORWILLS";

	compatible = "qcom,sdxpoorwills";
@@ -218,6 +220,31 @@ 
				< 1497600 >;

	};



	cpubw: qcom,cpubw {

		compatible = "qcom,devbw";

		governor = "cpufreq";

		qcom,src-dst-ports = <1 512>;

		qcom,active-only;

		qcom,bw-tbl =

			< MHZ_TO_MBPS(200, 2) >, /*   381 MB/s */

			< MHZ_TO_MBPS(470, 2) >, /*   896 MB/s */

			< MHZ_TO_MBPS(547, 2) >, /*  1043 MB/s */

			< MHZ_TO_MBPS(691, 2) >, /*  1317 MB/s */

			< MHZ_TO_MBPS(806, 2) >, /*  1537 MB/s */

			< MHZ_TO_MBPS(940, 2) >, /*  1792 MB/s */

			< MHZ_TO_MBPS(1383, 2) >; /* 2637 MB/s */

	};



	devfreq_compute: qcom,devfreq-compute {

		compatible = "qcom,arm-cpu-mon";

		qcom,cpulist = <&CPU0>;

		qcom,target-dev = <&cpubw>;

		qcom,core-dev-table =

				<  153600 MHZ_TO_MBPS(200, 2) >,

				<  576000 MHZ_TO_MBPS(691, 2) >,

				< 1497600 MHZ_TO_MBPS(1383, 2)>;

	};



	clock_gcc: qcom,gcc@100000 {

		compatible = "qcom,gcc-sdxpoorwills", "syscon";

		reg = <0x100000 0x1f0000>;

arch/arm/configs/sdxpoorwills-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -382,6 +382,9 @@ CONFIG_QCOM_DCC_V2=y 
CONFIG_QTI_RPM_STATS_LOG=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

CONFIG_QMP_DEBUGFS_CLIENT=y

CONFIG_ARM_MEMLAT_MON=y

CONFIG_DEVFREQ_GOV_MEMLAT=y

CONFIG_QCOM_DEVFREQ_DEVBW=y

CONFIG_EXTCON_QCOM_SPMI_MISC=y

CONFIG_IIO=y

CONFIG_PWM=y

arch/arm/configs/sdxpoorwills_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -386,6 +386,8 @@ CONFIG_QCOM_DCC_V2=y 
CONFIG_QTI_RPM_STATS_LOG=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

CONFIG_QMP_DEBUGFS_CLIENT=y

CONFIG_ARM_MEMLAT_MON=y

CONFIG_DEVFREQ_GOV_MEMLAT=y

CONFIG_QCOM_DEVFREQ_DEVBW=y

CONFIG_EXTCON_QCOM_SPMI_MISC=y

CONFIG_IIO=y

drivers/devfreq/arm-memlat-mon.c

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

 * Copyright (c) 2014-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -82,7 +82,7 @@ static unsigned long compute_freq(struct cpu_pmu_stats *cpustats, 
{

	ktime_t ts;

	unsigned int diff;

	unsigned long freq = 0;

	uint64_t freq = 0;



	ts = ktime_get();

	diff = ktime_to_us(ktime_sub(ts, cpustats->prev_ts));