Merge android11-5.4.61+ (364ec3d) into msm-5.4

* refs/heads/tmp-364ec3d:
  UPSTREAM: futex: Don't enable IRQs unconditionally in put_pi_state()
  UPSTREAM: futex: Handle transient "ownerless" rtmutex state correctly
  UPSTREAM: futex: Fix incorrect should_fail_futex() handling
  ANDROID: add macros to create OEM data fields
  BACKPORT: arm64: perf: Support new DT compatibles
  UPSTREAM: usb: xhci-mtk: fix unreleased bandwidth data
  ANDROID: sched: add em_pd_energy vendor hook
  ANDROID: schedutil: add vendor hook for adjusting util to freq calculation
  ANDROID: ABI: update symbols of unisoc whitelist
  Revert "BACKPORT: FROMGIT: mm: improve mprotect(R|W) efficiency on pages referenced once"
  BACKPORT: FROMGIT: mm: improve mprotect(R|W) efficiency on pages referenced once
  ANDROID: simplify vendor hooks for non-GKI builds

 Conflicts:
	kernel/sched/cpufreq_schedutil.c

Change-Id: I9e98cddb693248a3c255d7010c8aeaad85b60ced
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>

include/trace/hooks/restricted_preemptirq.h

@@ -2,20 +2,18 @@
 /*
  * Copyright (c) 2020, The Linux Foundation. All rights reserved.
  */
-#if !defined(_TRACE_RESTRICTED_PREEMPTIRQ_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_RESTRICTED_PREEMPTIRQ_H
-
-#ifdef CONFIG_PREEMPTIRQ_TRACEPOINTS
-
 #undef TRACE_SYSTEM
 #define TRACE_SYSTEM restricted_preemptirq
-
 #undef TRACE_INCLUDE_PATH
 #define TRACE_INCLUDE_PATH trace/hooks
-
+#if !defined(_TRACE_RESTRICTED_PREEMPTIRQ_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_RESTRICTED_PREEMPTIRQ_H
 #include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 
+#if defined(CONFIG_PREEMPTIRQ_TRACEPOINTS) &&	\
+	defined(CONFIG_ANDROID_VENDOR_HOOKS)
+
 #ifdef CONFIG_TRACE_IRQFLAGS
 DECLARE_RESTRICTED_HOOK(restricted_irq_disable,
 			TP_PROTO(unsigned long ip, unsigned long parent_ip),
@@ -28,6 +26,8 @@ DECLARE_RESTRICTED_HOOK(restricted_irq_enable,
 #else
 #define trace_restricted_irq_enable(ip, parent_ip)
 #define trace_restricted_irq_disable(ip, parent_ip)
+#define register_trace_restricted_irq_enable(...)
+#define register_trace_restricted_irq_disable(...)
 #endif /* CONFIG_TRACE_IRQFLAGS */
 
 #ifdef CONFIG_TRACE_PREEMPT_TOGGLE
@@ -42,15 +42,20 @@ DECLARE_RESTRICTED_HOOK(restricted_preempt_enable,
 #else
 #define trace_restricted_preempt_enable(ip, parent_ip)
 #define trace_restricted_preempt_disable(ip, parent_ip)
+#define register_trace_restricted_preempt_enable(...)
+#define register_trace_restricted_preempt_disable(...)
 #endif /* CONFIG_TRACE_PREEMPT_TOGGLE */
 
-#include <trace/define_trace.h>
-
-#else  /* ! CONFIG_PREEMPTIRQ_TRACEPOINTS */
+#else /* CONFIG_PREEMPTIRQ_TRACEPOINTS && CONFIG_ANDROID_VENDOR_HOOKS */
 #define trace_restricted_irq_enable(...)
 #define trace_restricted_irq_disable(...)
+#define register_trace_restricted_irq_enable(...)
+#define register_trace_restricted_irq_disable(...)
 #define trace_restricted_preempt_enable(...)
 #define trace_restricted_preempt_disable(...)
-#endif /* ! CONFIG_PREEMPTIRQ_TRACEPOINTS */
+#define register_trace_restricted_preempt_enable(...)
+#define register_trace_restricted_preempt_disable(...)
+#endif /* CONFIG_PREEMPTIRQ_TRACEPOINTS && CONFIG_ANDROID_VENDOR_HOOKS */
 
 #endif /* TRACE_RESTRICTED_PREEMPTIRQ_H || TRACE_HEADER_MULTI_READ */
+#include <trace/define_trace.h>

include/trace/hooks/sched.h

@@ -10,7 +10,6 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
-#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
 struct task_struct;
 DECLARE_RESTRICTED_HOOK(android_rvh_select_task_rq_fair,
 	TP_PROTO(struct task_struct *p, int prev_cpu, int sd_flag, int wake_flags, int *new_cpu),
@@ -70,22 +69,21 @@ struct sched_group;
 DECLARE_RESTRICTED_HOOK(android_rvh_find_busiest_group,
 	TP_PROTO(struct sched_group *busiest, struct rq *dst_rq, int *out_balance),
 		TP_ARGS(busiest, dst_rq, out_balance), 1);
-#else
-#define trace_android_rvh_select_task_rq_fair(p, prev_cpu, sd_flag, wake_flags, new_cpu)
-#define trace_android_rvh_select_task_rq_rt(p, prev_cpu, sd_flag, wake_flags, new_cpu)
-#define trace_android_rvh_select_fallback_rq(cpu, p, dest_cpu)
-#define trace_android_vh_scheduler_tick(rq)
-#define trace_android_rvh_enqueue_task(rq, p)
-#define trace_android_rvh_dequeue_task(rq, p)
-#define trace_android_rvh_can_migrate_task(p, dst_cpu, can_migrate)
-#define trace_android_rvh_find_lowest_rq(p, local_cpu_mask, lowest_cpu)
-#define trace_android_rvh_prepare_prio_fork(p)
-#define trace_android_rvh_finish_prio_fork(p)
-#define trace_android_rvh_rtmutex_prepare_setprio(p, pi_task)
-#define trace_android_rvh_set_user_nice(p, nice)
-#define trace_android_rvh_setscheduler(p)
-#define trace_android_rvh_find_busiest_group(busiest, dst_rq, out_balance)
-#endif
+
+DECLARE_HOOK(android_vh_map_util_freq,
+	TP_PROTO(unsigned long util, unsigned long freq,
+		unsigned long cap, unsigned long *next_freq),
+	TP_ARGS(util, freq, cap, next_freq));
+
+struct em_perf_domain;
+DECLARE_HOOK(android_vh_em_pd_energy,
+	TP_PROTO(struct em_perf_domain *pd,
+		unsigned long max_util, unsigned long sum_util,
+		unsigned long *energy),
+	TP_ARGS(pd, max_util, sum_util, energy));
+
+/* macro versions of hooks are no longer required */
+
 #endif /* _TRACE_HOOK_SCHED_H */
 /* This part must be outside protection */
 #include <trace/define_trace.h>

include/trace/hooks/vendor_hooks.h

@@ -9,6 +9,8 @@
 
 #include <linux/tracepoint.h>
 
+#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
+
 #define DECLARE_HOOK DECLARE_TRACE
 
 #ifdef TRACE_HEADER_MULTI_READ
@@ -74,3 +76,10 @@
 			PARAMS(__data, args))
 
 #endif /* TRACE_HEADER_MULTI_READ */
+
+#else /* !CONFIG_TRACEPOINTS || !CONFIG_ANDROID_VENDOR_HOOKS */
+/* suppress trace hooks */
+#define DECLARE_HOOK DECLARE_EVENT_NOP
+#define DECLARE_RESTRICTED_HOOK(name, proto, args, cond)		\
+	DECLARE_EVENT_NOP(name, PARAMS(proto), PARAMS(args))
+#endif