Merge "msm: ipa3: Fix to use proper clock timer" (41539720) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/platform/msm/ipa/ipa_v3/ipa.c

+11 −4

Original line number	Diff line number	Diff line
		@@ -35,6 +35,12 @@
		#include <linux/soc/qcom/smem_state.h>
		#include <linux/of_irq.h>
		#include <linux/ctype.h>
		#include <linux/sched.h>
		#include <asm/arch_timer.h>
		#include <linux/sched/clock.h>
		#include <linux/jiffies.h>
		#include <linux/delay.h>
		#include <linux/wait.h>

		#ifdef CONFIG_ARM64

		@@ -4970,13 +4976,14 @@ static void ipa3_active_clients_log_mod(
		}

		if (id->type != SIMPLE) {
		t = local_clock();
		t = sched_clock();
		nanosec_rem = do_div(t, 1000000000) / 1000;
		snprintf(temp_str, IPA3_ACTIVE_CLIENTS_LOG_LINE_LEN,
		inc ? "[%5lu.%06lu] ^ %s, %s: %d" :
		"[%5lu.%06lu] v %s, %s: %d",
		inc ? "[%5lu.%06lu] ^ %s, %s: %d cnt = %d" :
		"[%5lu.%06lu] v %s, %s: %d cnt = %d",
		(unsigned long)t, nanosec_rem,
		id->id_string, id->file, id->line);
		id->id_string, id->file, id->line,
		atomic_read(&ipa3_ctx->ipa3_active_clients.cnt));
		ipa3_active_clients_log_insert(temp_str);
		}
		spin_unlock_irqrestore(&ipa3_ctx->ipa3_active_clients_logging.lock,