Merge "rpmh_master_stat: Fix accumulated sleep duration" (4cdedb54) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/soc/qcom/rpmh_master_stat.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -103,6 +103,7 @@ static ssize_t msm_rpmh_master_stats_print_data(char *prvbuf, ssize_t length,
		struct msm_rpmh_master_stats *record,
		const char *name)
		{
		uint64_t temp_accumulated_duration = record->accumulated_duration;
		/*
		* If a master is in sleep when reading the sleep stats from SMEM
		* adjust the accumulated sleep duration to show actual sleep time.
		@@ -110,7 +111,7 @@ static ssize_t msm_rpmh_master_stats_print_data(char *prvbuf, ssize_t length,
		* the purpose of computing battery utilization.
		*/
		if (record->last_entered > record->last_exited)
		record->accumulated_duration +=
		temp_accumulated_duration +=
		(arch_counter_get_cntvct()
		- record->last_entered);

		@@ -121,7 +122,7 @@ static ssize_t msm_rpmh_master_stats_print_data(char *prvbuf, ssize_t length,
		"\tSleep Accumulated Duration:0x%llx\n\n",
		name, record->version_id, record->counts,
		record->last_entered, record->last_exited,
		record->accumulated_duration);
		temp_accumulated_duration);
		}

		static ssize_t msm_rpmh_master_stats_show(struct kobject *kobj,