* for-next/memory-hotremove: : Memory hot-remove support for arm64 arm64/mm: Enable memory hot remove arm64/mm: Hold memory hotplug lock while walking for kernel page table dump * for-next/arm_sdei: : SDEI: fix double locking on return from hibernate and clean-up firmware: arm_sdei: clean up sdei_event_create() firmware: arm_sdei: Use cpus_read_lock() to avoid races with cpuhp firmware: arm_sdei: fix possible double-lock on hibernate error path firmware: arm_sdei: fix double-lock on hibernate with shared events * for-next/amu: : ARMv8.4 Activity Monitors support clocksource/drivers/arm_arch_timer: validate arch_timer_rate arm64: use activity monitors for frequency invariance cpufreq: add function to get the hardware max frequency Documentation: arm64: document support for the AMU extension arm64/kvm: disable access to AMU registers from kvm guests arm64: trap to EL1 accesses to AMU counters from EL0 arm64: add support for the AMU extension v1 * for-next/final-cap-helper: : Introduce cpus_have_final_cap_helper(), migrate arm64 KVM to it arm64: kvm: hyp: use cpus_have_final_cap() arm64: cpufeature: add cpus_have_final_cap() * for-next/cpu_ops-cleanup: : cpu_ops[] access code clean-up 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 * for-next/misc: : Various fixes and clean-ups arm64: define __alloc_zeroed_user_highpage arm64/kernel: Simplify __cpu_up() by bailing out early arm64: remove redundant blank for '=' operator arm64: kexec_file: Fixed code style. arm64: add blank after 'if' arm64: fix spelling mistake "ca not" -> "cannot" arm64: entry: unmask IRQ in el0_sp() arm64: efi: add efi-entry.o to targets instead of extra-$(CONFIG_EFI) arm64: csum: Optimise IPv6 header checksum arch/arm64: fix typo in a comment arm64: remove gratuitious/stray .ltorg stanzas arm64: Update comment for ASID() macro arm64: mm: convert cpu_do_switch_mm() to C arm64: fix NUMA Kconfig typos * for-next/perf: : arm64 perf updates arm64: perf: Add support for ARMv8.5-PMU 64-bit counters KVM: arm64: limit PMU version to PMUv3 for ARMv8.1 arm64: cpufeature: Extract capped perfmon fields arm64: perf: Clean up enable/disable calls perf: arm-ccn: Use scnprintf() for robustness arm64: perf: Support new DT compatibles arm64: perf: Refactor PMU init callbacks perf: arm_spe: Remove unnecessary zero check on 'nr_pages'
da12d277 parents bbd6ec6 f7d5ef0 c265861 b5475d8 de58ed5 c17a290 8673e0248 files · +1154 −371Browse filesShowing the changes to include/linux (3 of 48 files). Show all
Unified · Split
| @@ -33,6 +33,8 @@ unsigned long topology_get_freq_scale(int cpu) · 32 unmodified lines | |||
| 33 | return per_cpu(freq_scale, cpu); | 33 | return per_cpu(freq_scale, cpu); |
| 34 | } | 34 | } |
| 35 | 35 | ||
| 36 | bool arch_freq_counters_available(struct cpumask *cpus); | ||
| 37 | |||
| 36 | struct cpu_topology { | 38 | struct cpu_topology { |
| 37 | int thread_id; | 39 | int thread_id; |
| 38 | int core_id; | 40 | int core_id; |
| @@ -205,6 +205,7 @@ static inline bool policy_is_shared(struct cpufreq_policy *policy) · 204 unmodified lines | |||
| 205 | unsigned int cpufreq_get(unsigned int cpu); | 205 | unsigned int cpufreq_get(unsigned int cpu); |
| 206 | unsigned int cpufreq_quick_get(unsigned int cpu); | 206 | unsigned int cpufreq_quick_get(unsigned int cpu); |
| 207 | unsigned int cpufreq_quick_get_max(unsigned int cpu); | 207 | unsigned int cpufreq_quick_get_max(unsigned int cpu); |
| 208 | unsigned int cpufreq_get_hw_max_freq(unsigned int cpu); | ||
| 208 | void disable_cpufreq(void); | 209 | void disable_cpufreq(void); |
| 209 | 210 | ||
| 210 | u64 get_cpu_idle_time(unsigned int cpu, u64 *wall, int io_busy); | 211 | u64 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 | } |
| 236 | static inline unsigned int cpufreq_get_hw_max_freq(unsigned int cpu) | ||
| 237 | { | ||
| 238 | return 0; | ||
| 239 | } | ||
| 235 | static inline void disable_cpufreq(void) { } | 240 | static inline void disable_cpufreq(void) { } |
| 236 | #endif | 241 | #endif |
| 237 | 242 | ||
| @@ -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); |