History

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux

Pull arm64 updates from Catalin Marinas: "The bulk is in-kernel pointer authentication, activity monitors and lots of asm symbol annotations. I also queued the sys_mremap() patch commenting the asymmetry in the address untagging. Summary: - In-kernel Pointer Authentication support (previously only offered to user space). - ARM Activity Monitors (AMU) extension support allowing better CPU utilisation numbers for the scheduler (frequency invariance). - Memory hot-remove support for arm64. - Lots of asm annotations (SYM_*) in preparation for the in-kernel Branch Target Identification (BTI) support. - arm64 perf updates: ARMv8.5-PMU 64-bit counters, refactoring the PMU init callbacks, support for new DT compatibles. - IPv6 header checksum optimisation. - Fixes: SDEI (software delegated exception interface) double-lock on hibernate with shared events. - Minor clean-ups and refactoring: cpu_ops accessor, cpu_do_switch_mm() converted to C, cpufeature finalisation helper. - sys_mremap() comment explaining the asymmetric address untagging behaviour" * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (81 commits) mm/mremap: Add comment explaining the untagging behaviour of mremap() arm64: head: Convert install_el2_stub to SYM_INNER_LABEL arm64: Introduce get_cpu_ops() helper function arm64: Rename cpu_read_ops() to init_cpu_ops() arm64: Declare ACPI parking protocol CPU operation if needed arm64: move kimage_vaddr to .rodata arm64: use mov_q instead of literal ldr arm64: Kconfig: verify binutils support for ARM64_PTR_AUTH lkdtm: arm64: test kernel pointer authentication arm64: compile the kernel with ptrauth return address signing kconfig: Add support for 'as-option' arm64: suspend: restore the kernel ptrauth keys arm64: __show_regs: strip PAC from lr in printk arm64: unwind: strip PAC from kernel addresses arm64: mask PAC bits of __builtin_return_address arm64: initialize ptrauth keys for kernel booting task arm64: initialize and switch ptrauth kernel keys arm64: enable ptrauth earlier arm64: cpufeature: handle conflicts based on capability arm64: cpufeature: Move cpu capability helpers inside C file ...

Linus Torvalds committed 6 years ago

Commit 3cd86a52 parents a8222fd b2a84de88 files · +2192 −700Browse files

Showing the changes to include/linux (4 of 88 files). Show all

Unified · Split

4 files
  1. include/linux/arch_topology.h +2 −0
  2. include/linux/cpufreq.h +5 −0
  3. include/linux/perf/arm_pmu.h +1 −0
  4. include/linux/stackprotector.h +1 −1
include/linux/arch_topology.h+2−0
@@ -30,6 +30,8 @@ static inline unsigned long topology_get_freq_scale(int cpu) · 29 unmodified lines
30 return per_cpu(freq_scale, cpu);30 return per_cpu(freq_scale, cpu);
31}31}
32 32
33bool arch_freq_counters_available(struct cpumask *cpus);
34
33DECLARE_PER_CPU(unsigned long, thermal_pressure);35DECLARE_PER_CPU(unsigned long, thermal_pressure);
34 36
35static inline unsigned long topology_get_thermal_pressure(int cpu)37static inline unsigned long topology_get_thermal_pressure(int cpu)
include/linux/cpufreq.h+5−0
@@ -205,6 +205,7 @@ static inline bool policy_is_shared(struct cpufreq_policy *policy) · 204 unmodified lines
205unsigned int cpufreq_get(unsigned int cpu);205unsigned int cpufreq_get(unsigned int cpu);
206unsigned int cpufreq_quick_get(unsigned int cpu);206unsigned int cpufreq_quick_get(unsigned int cpu);
207unsigned int cpufreq_quick_get_max(unsigned int cpu);207unsigned int cpufreq_quick_get_max(unsigned int cpu);
208unsigned int cpufreq_get_hw_max_freq(unsigned int cpu);
208void disable_cpufreq(void);209void disable_cpufreq(void);
209 210
210u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy);211u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy);
@@ -232,6 +233,10 @@ static inline unsigned int cpufreq_quick_get_max(unsigned int cpu) · 21 unmodified lines
232{233{
233 return 0;234 return 0;
234}235}
236static inline unsigned int cpufreq_get_hw_max_freq(unsigned int cpu)
237{
238 return 0;
239}
235static inline void disable_cpufreq(void) { }240static inline void disable_cpufreq(void) { }
236#endif241#endif
237 242
include/linux/perf/arm_pmu.h+1−0
@@ -80,6 +80,7 @@ struct arm_pmu { · 79 unmodified lines
80 struct pmu pmu;80 struct pmu pmu;
81 cpumask_t supported_cpus;81 cpumask_t supported_cpus;
82 char *name;82 char *name;
83 int pmuver;
83 irqreturn_t (*handle_irq)(struct arm_pmu *pmu);84 irqreturn_t (*handle_irq)(struct arm_pmu *pmu);
84 void (*enable)(struct perf_event *event);85 void (*enable)(struct perf_event *event);
85 void (*disable)(struct perf_event *event);86 void (*disable)(struct perf_event *event);
include/linux/stackprotector.h+1−1
@@ -6,7 +6,7 @@ · 5 unmodified lines
6#include <linux/sched.h>6#include <linux/sched.h>
7#include <linux/random.h>7#include <linux/random.h>
8 8
9#ifdef CONFIG_STACKPROTECTOR9#if defined(CONFIG_STACKPROTECTOR) || defined(CONFIG_ARM64_PTR_AUTH)
10# include <asm/stackprotector.h>10# include <asm/stackprotector.h>
11#else11#else
12static inline void boot_init_stack_canary(void)12static inline void boot_init_stack_canary(void)