Merge branch 'QK-eleven' into upstreamed-common

arch/arm64/boot/dts/vendor/qcom/kona-v2.dtsi

@@ -6,20 +6,44 @@
 	qcom,msm-id = <356 0x20000>;
 };
 
+&CPU0 {
+	capacity-dmips-mhz = <448>;
+	dynamic-power-coefficient = <103>;
+};
+
+&CPU1 {
+	capacity-dmips-mhz = <448>;
+	dynamic-power-coefficient = <103>;
+};
+
+&CPU2 {
+	capacity-dmips-mhz = <448>;
+	dynamic-power-coefficient = <103>;
+};
+
+&CPU3 {
+	capacity-dmips-mhz = <448>;
+	dynamic-power-coefficient = <103>;
+};
+
 &CPU4 {
-	dynamic-power-coefficient = <533>;
+	capacity-dmips-mhz = <1022>;
+	dynamic-power-coefficient = <340>;
 };
 
 &CPU5 {
-	dynamic-power-coefficient = <533>;
+	capacity-dmips-mhz = <1022>;
+	dynamic-power-coefficient = <340>;
 };
 
 &CPU6 {
-	dynamic-power-coefficient = <533>;
+	capacity-dmips-mhz = <1022>;
+	dynamic-power-coefficient = <340>;
 };
 
 &CPU7 {
-	dynamic-power-coefficient = <642>;
+	capacity-dmips-mhz = <1024>;
+	dynamic-power-coefficient = <409>;
 };
 
 &clock_camcc {
@@ -390,4 +414,30 @@
 		   <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>,
 		   <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
 	interrupt-names = "dcvsh0_int", "dcvsh1_int", "dcvsh2_int";
+
+	qcom,cpufreq-table-0 =
+			< 691200>,
+			<1708800>,
+			<1804800>;
+
+	qcom,cpufreq-table-1 =
+			< 710400>,
+			<1478400>,
+			<1766400>,
+			<1862400>,
+			<2054400>,
+			<2246400>,
+			<2342400>,
+			<2419200>;
+
+	qcom,cpufreq-table-2 =
+			< 844800>,
+			<1862400>,
+			<2073600>,
+			<2265600>,
+			<2361600>,
+			<2457600>,
+			<2553600>,
+			<2841600>,
+			<3187200>;
 };

arch/arm64/boot/dts/vendor/qcom/xiaomi-sm8250-common.dtsi

@@ -5,81 +5,6 @@
 #include "kona-sde-display.dtsi"
 #include "kona-thermal-overlay.dtsi"
 
-// Overlayed CPU Frequency table
-&cpufreq_hw {
-	interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>,
-		   <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>,
-		   <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
-	interrupt-names = "dcvsh0_int", "dcvsh1_int", "dcvsh2_int";
-
-	qcom,cpufreq-table-0 =
-			< 691200>,
-			<1708800>,
-			<1804800>;
-
-	qcom,cpufreq-table-1 =
-			< 710400>,
-			<1478400>,
-			<1766400>,
-			<1862400>,
-			<2054400>,
-			<2246400>,
-			<2342400>,
-			<2419200>;
-
-	qcom,cpufreq-table-2 =
-			< 844800>,
-			<1862400>,
-			<2073600>,
-			<2265600>,
-			<2361600>,
-			<2457600>,
-			<2553600>,
-			<2841600>,
-			<3187200>;
-};
-
-//CPU Recalculation & Optimization
-&CPU0 {
-	capacity-dmips-mhz = <448>;
-	dynamic-power-coefficient = <103>;
-};
-
-&CPU1 {
-	capacity-dmips-mhz = <448>;
-	dynamic-power-coefficient = <103>;
-};
-
-&CPU2 {
-	capacity-dmips-mhz = <448>;
-	dynamic-power-coefficient = <103>;
-};
-
-&CPU3 {
-	capacity-dmips-mhz = <448>;
-	dynamic-power-coefficient = <103>;
-};
-
-&CPU4 {
-	capacity-dmips-mhz = <1022>;
-	dynamic-power-coefficient = <340>;
-};
-
-&CPU5 {
-	capacity-dmips-mhz = <1022>;
-	dynamic-power-coefficient = <340>;
-};
-
-&CPU6 {
-	capacity-dmips-mhz = <1022>;
-	dynamic-power-coefficient = <340>;
-};
-
-&CPU7 {
-	capacity-dmips-mhz = <1024>;
-	dynamic-power-coefficient = <409>;
-};
-
 &qupv3_se12_2uart {
 	status = "ok";
 };

arch/arm64/configs/vendor/alioth_defconfig

@@ -50,11 +50,11 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_EMBEDDED=y
+CONFIG_PERF_EVENTS=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
-CONFIG_PROFILING=y
 # CONFIG_ZONE_DMA32 is not set
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_ARCH_QCOM=y

arch/arm64/configs/vendor/apollo_defconfig

@@ -49,11 +49,11 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_EMBEDDED=y
+CONFIG_PERF_EVENTS=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
-CONFIG_PROFILING=y
 # CONFIG_ZONE_DMA32 is not set
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 

arch/arm64/configs/vendor/cas_defconfig

@@ -50,11 +50,11 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_EMBEDDED=y
+CONFIG_PERF_EVENTS=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
-CONFIG_PROFILING=y
 # CONFIG_ZONE_DMA32 is not set
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_ARCH_HAS_REFCOUNT_FULL=y

arch/arm64/configs/vendor/cmi_defconfig

@@ -51,11 +51,11 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_EMBEDDED=y
+CONFIG_PERF_EVENTS=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
-CONFIG_PROFILING=y
 # CONFIG_ZONE_DMA32 is not set
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_ARCH_HAS_REFCOUNT_FULL=y

arch/arm64/configs/vendor/lmi_defconfig

@@ -50,11 +50,11 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_EMBEDDED=y
+CONFIG_PERF_EVENTS=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
-CONFIG_PROFILING=y
 # CONFIG_ZONE_DMA32 is not set
 CONFIG_ARCH_HAS_REFCOUNT_FULL=y
 CONFIG_ARCH_HAS_REFCOUNT=y

arch/arm64/configs/vendor/thyme_defconfig

@@ -50,11 +50,11 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_EMBEDDED=y
+CONFIG_PERF_EVENTS=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
-CONFIG_PROFILING=y
 # CONFIG_ZONE_DMA32 is not set
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_KONA=y

arch/arm64/configs/vendor/umi_defconfig

@@ -50,11 +50,11 @@ CONFIG_KALLSYMS_ALL=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_BPF_JIT_ALWAYS_ON=y
 CONFIG_EMBEDDED=y
+CONFIG_PERF_EVENTS=y
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_COMPAT_BRK is not set
 CONFIG_SLAB_FREELIST_RANDOM=y
 CONFIG_SLAB_FREELIST_HARDENED=y
-CONFIG_PROFILING=y
 # CONFIG_ZONE_DMA32 is not set
 CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
 CONFIG_ARCH_HAS_REFCOUNT_FULL=y

arch/arm64/include/asm/cache.h

@@ -48,7 +48,7 @@
  * cache before the transfer is done, causing old data to be seen by
  * the CPU.
  */
-#define ARCH_DMA_MINALIGN	(128)
+#define ARCH_DMA_MINALIGN	L1_CACHE_BYTES
 
 #ifdef CONFIG_KASAN_SW_TAGS
 #define ARCH_SLAB_MINALIGN	(1ULL << KASAN_SHADOW_SCALE_SHIFT)

drivers/misc/Kconfig

@@ -539,7 +539,7 @@ config MISC_RTSX
 
 config UID_SYS_STATS
 	bool "Per-UID statistics"
-	depends on PROFILING && TASK_XACCT && TASK_IO_ACCOUNTING
+	depends on TASK_XACCT && TASK_IO_ACCOUNTING
 	help
 	  Per UID based cpu time statistics exported to /proc/uid_cputime
 	  Per UID based io statistics exported to /proc/uid_io

include/linux/profile.h

@@ -67,9 +67,6 @@ static inline void profile_hit(int type, void *ip)
 struct task_struct;
 struct mm_struct;
 
-/* task is in do_exit() */
-void profile_task_exit(struct task_struct * task);
-
 /* task is dead, free task struct ? Returns 1 if
  * the task was taken, 0 if the task should be freed.
  */
@@ -81,9 +78,6 @@ void profile_munmap(unsigned long addr);
 int task_handoff_register(struct notifier_block * n);
 int task_handoff_unregister(struct notifier_block * n);
 
-int profile_event_register(enum profile_type, struct notifier_block * n);
-int profile_event_unregister(enum profile_type, struct notifier_block * n);
-
 struct pt_regs;
 
 #else
@@ -120,20 +114,15 @@ static inline int task_handoff_unregister(struct notifier_block * n)
 	return -ENOSYS;
 }
 
-static inline int profile_event_register(enum profile_type t, struct notifier_block * n)
-{
-	return -ENOSYS;
-}
-
-static inline int profile_event_unregister(enum profile_type t, struct notifier_block * n)
-{
-	return -ENOSYS;
-}
-
-#define profile_task_exit(a) do { } while (0)
 #define profile_handoff_task(a) (0)
 #define profile_munmap(a) do { } while (0)
 
 #endif /* CONFIG_PROFILING */
 
+/* task is in do_exit() */
+void profile_task_exit(struct task_struct * task);
+
+int profile_event_register(enum profile_type, struct notifier_block * n);
+int profile_event_unregister(enum profile_type, struct notifier_block * n);
+
 #endif /* _LINUX_PROFILE_H */

kernel/exit.c

@@ -775,6 +775,32 @@ static void check_stack_usage(void)
 static inline void check_stack_usage(void) {}
 #endif
 
+#ifndef CONFIG_PROFILING
+static BLOCKING_NOTIFIER_HEAD(task_exit_notifier);
+
+int profile_event_register(enum profile_type t, struct notifier_block *n)
+{
+	if (t == PROFILE_TASK_EXIT)
+		return blocking_notifier_chain_register(&task_exit_notifier, n);
+
+	return -ENOSYS;
+}
+
+int profile_event_unregister(enum profile_type t, struct notifier_block *n)
+{
+	if (t == PROFILE_TASK_EXIT)
+		return blocking_notifier_chain_unregister(&task_exit_notifier,
+							  n);
+
+	return -ENOSYS;
+}
+
+void profile_task_exit(struct task_struct *tsk)
+{
+	blocking_notifier_call_chain(&task_exit_notifier, 0, tsk);
+}
+#endif
+
 void __noreturn do_exit(long code)
 {
 	struct task_struct *tsk = current;

kernel/irq/cpuhotplug.c

@@ -203,7 +203,7 @@ void irq_migrate_all_off_this_cpu(void)
 		raw_spin_unlock(&desc->lock);
 
 		if (affinity_broken) {
-			pr_info_ratelimited("IRQ %u: no longer affine to CPU%u\n",
+			pr_debug_ratelimited("IRQ %u: no longer affine to CPU%u\n",
 					    irq, smp_processor_id());
 		}
 	}

kernel/time/hrtimer.c

@@ -51,7 +51,6 @@
 #include <linux/timer.h>
 #include <linux/freezer.h>
 #include <linux/compat.h>
-#include <linux/delay.h>
 
 #include <linux/uaccess.h>
 
@@ -179,7 +178,6 @@ struct hrtimer_clock_base *lock_hrtimer_base(const struct hrtimer *timer,
 			raw_spin_unlock_irqrestore(&base->cpu_base->lock, *flags);
 		}
 		cpu_relax();
-		ndelay(TIMER_LOCK_TIGHT_LOOP_DELAY_NS);
 	}
 }
 
@@ -1256,7 +1254,6 @@ int hrtimer_cancel(struct hrtimer *timer)
 		if (ret >= 0)
 			return ret;
 		cpu_relax();
-		ndelay(TIMER_LOCK_TIGHT_LOOP_DELAY_NS);
 	}
 }
 EXPORT_SYMBOL_GPL(hrtimer_cancel);

kernel/time/tick-internal.h

@@ -163,4 +163,3 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
 
 extern u64 get_next_timer_interrupt(unsigned long basej, u64 basem);
 void timer_clear_idle(void);
-#define TIMER_LOCK_TIGHT_LOOP_DELAY_NS	350