Commit 1202f4fd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull arm64 updates from Will Deacon:
 "A bunch of good stuff in here. Worth noting is that we've pulled in
  the x86/mm branch from -tip so that we can make use of the core
  ioremap changes which allow us to put down huge mappings in the
  vmalloc area without screwing up the TLB. Much of the positive
  diffstat is because of the rseq selftest for arm64.

  Summary:

   - Wire up support for qspinlock, replacing our trusty ticket lock
     code

   - Add an IPI to flush_icache_range() to ensure that stale
     instructions fetched into the pipeline are discarded along with the
     I-cache lines

   - Support for the GCC "stackleak" plugin

   - Support for restartable sequences, plus an arm64 port for the
     selftest

   - Kexec/kdump support on systems booting with ACPI

   - Rewrite of our syscall entry code in C, which allows us to zero the
     GPRs on entry from userspace

   - Support for chained PMU counters, allowing 64-bit event counters to
     be constructed on current CPUs

   - Ensure scheduler topology information is kept up-to-date with CPU
     hotplug events

   - Re-enable support for huge vmalloc/IO mappings now that the core
     code has the correct hooks to use break-before-make sequences

   - Miscellaneous, non-critical fixes and cleanups"

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (90 commits)
  arm64: alternative: Use true and false for boolean values
  arm64: kexec: Add comment to explain use of __flush_icache_range()
  arm64: sdei: Mark sdei stack helper functions as static
  arm64, kaslr: export offset in VMCOREINFO ELF notes
  arm64: perf: Add cap_user_time aarch64
  efi/libstub: Only disable stackleak plugin for arm64
  arm64: drop unused kernel_neon_begin_partial() macro
  arm64: kexec: machine_kexec should call __flush_icache_range
  arm64: svc: Ensure hardirq tracing is updated before return
  arm64: mm: Export __sync_icache_dcache() for xen-privcmd
  drivers/perf: arm-ccn: Use devm_ioremap_resource() to map memory
  arm64: Add support for STACKLEAK gcc plugin
  arm64: Add stack information to on_accessible_stack
  drivers/perf: hisi: update the sccl_id/ccl_id when MT is supported
  arm64: fix ACPI dependencies
  rseq/selftests: Add support for arm64
  arm64: acpi: fix alignment fault in accessing ACPI
  efi/arm: map UEFI memory map even w/o runtime services enabled
  efi/arm: preserve early mapping of UEFI memory map longer for BGRT
  drivers: acpi: add dependency of EFI for arm64
  ...
parents d0055f35 3c4d9137

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2270,6 +2270,7 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
T:	git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git

S:	Maintained

F:	arch/arm64/

X:	arch/arm64/boot/dts/

F:	Documentation/arm64/



AS3645A LED FLASH CONTROLLER DRIVER

arch/arm/include/asm/kvm_emulate.h

+7 −7
Original line number Diff line number Diff line
@@ -26,13 +26,13 @@ 
#include <asm/cputype.h>



/* arm64 compatibility macros */

#define COMPAT_PSR_MODE_ABT	ABT_MODE

#define COMPAT_PSR_MODE_UND	UND_MODE

#define COMPAT_PSR_T_BIT	PSR_T_BIT

#define COMPAT_PSR_I_BIT	PSR_I_BIT

#define COMPAT_PSR_A_BIT	PSR_A_BIT

#define COMPAT_PSR_E_BIT	PSR_E_BIT

#define COMPAT_PSR_IT_MASK	PSR_IT_MASK

#define PSR_AA32_MODE_ABT	ABT_MODE

#define PSR_AA32_MODE_UND	UND_MODE

#define PSR_AA32_T_BIT		PSR_T_BIT

#define PSR_AA32_I_BIT		PSR_I_BIT

#define PSR_AA32_A_BIT		PSR_A_BIT

#define PSR_AA32_E_BIT		PSR_E_BIT

#define PSR_AA32_IT_MASK	PSR_IT_MASK



unsigned long *vcpu_reg(struct kvm_vcpu *vcpu, u8 reg_num);

arch/arm/kernel/perf_event_v6.c

+10 −4
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ armv6_pmcr_counter_has_overflowed(unsigned long pmcr, 
	return ret;

}



static inline u32 armv6pmu_read_counter(struct perf_event *event)

static inline u64 armv6pmu_read_counter(struct perf_event *event)

{

	struct hw_perf_event *hwc = &event->hw;

	int counter = hwc->idx;
@@ -251,7 +251,7 @@ static inline u32 armv6pmu_read_counter(struct perf_event *event) 
	return value;

}



static inline void armv6pmu_write_counter(struct perf_event *event, u32 value)

static inline void armv6pmu_write_counter(struct perf_event *event, u64 value)

{

	struct hw_perf_event *hwc = &event->hw;

	int counter = hwc->idx;
@@ -411,6 +411,12 @@ armv6pmu_get_event_idx(struct pmu_hw_events *cpuc, 
	}

}



static void armv6pmu_clear_event_idx(struct pmu_hw_events *cpuc,

				     struct perf_event *event)

{

	clear_bit(event->hw.idx, cpuc->used_mask);

}



static void armv6pmu_disable_event(struct perf_event *event)

{

	unsigned long val, mask, evt, flags;
@@ -491,11 +497,11 @@ static void armv6pmu_init(struct arm_pmu *cpu_pmu) 
	cpu_pmu->read_counter	= armv6pmu_read_counter;

	cpu_pmu->write_counter	= armv6pmu_write_counter;

	cpu_pmu->get_event_idx	= armv6pmu_get_event_idx;

	cpu_pmu->clear_event_idx = armv6pmu_clear_event_idx;

	cpu_pmu->start		= armv6pmu_start;

	cpu_pmu->stop		= armv6pmu_stop;

	cpu_pmu->map_event	= armv6_map_event;

	cpu_pmu->num_events	= 3;

	cpu_pmu->max_period	= (1LLU << 32) - 1;

}



static int armv6_1136_pmu_init(struct arm_pmu *cpu_pmu)
@@ -542,11 +548,11 @@ static int armv6mpcore_pmu_init(struct arm_pmu *cpu_pmu) 
	cpu_pmu->read_counter	= armv6pmu_read_counter;

	cpu_pmu->write_counter	= armv6pmu_write_counter;

	cpu_pmu->get_event_idx	= armv6pmu_get_event_idx;

	cpu_pmu->clear_event_idx = armv6pmu_clear_event_idx;

	cpu_pmu->start		= armv6pmu_start;

	cpu_pmu->stop		= armv6pmu_stop;

	cpu_pmu->map_event	= armv6mpcore_map_event;

	cpu_pmu->num_events	= 3;

	cpu_pmu->max_period	= (1LLU << 32) - 1;



	return 0;

}

arch/arm/kernel/perf_event_v7.c

+12 −3
Original line number Diff line number Diff line
@@ -743,7 +743,7 @@ static inline void armv7_pmnc_select_counter(int idx) 
	isb();

}



static inline u32 armv7pmu_read_counter(struct perf_event *event)

static inline u64 armv7pmu_read_counter(struct perf_event *event)

{

	struct arm_pmu *cpu_pmu = to_arm_pmu(event->pmu);

	struct hw_perf_event *hwc = &event->hw;
@@ -763,7 +763,7 @@ static inline u32 armv7pmu_read_counter(struct perf_event *event) 
	return value;

}



static inline void armv7pmu_write_counter(struct perf_event *event, u32 value)

static inline void armv7pmu_write_counter(struct perf_event *event, u64 value)

{

	struct arm_pmu *cpu_pmu = to_arm_pmu(event->pmu);

	struct hw_perf_event *hwc = &event->hw;
@@ -1058,6 +1058,12 @@ static int armv7pmu_get_event_idx(struct pmu_hw_events *cpuc, 
	return -EAGAIN;

}



static void armv7pmu_clear_event_idx(struct pmu_hw_events *cpuc,

				     struct perf_event *event)

{

	clear_bit(event->hw.idx, cpuc->used_mask);

}



/*

 * Add an event filter to a given event. This will only work for PMUv2 PMUs.

 */
@@ -1167,10 +1173,10 @@ static void armv7pmu_init(struct arm_pmu *cpu_pmu) 
	cpu_pmu->read_counter	= armv7pmu_read_counter;

	cpu_pmu->write_counter	= armv7pmu_write_counter;

	cpu_pmu->get_event_idx	= armv7pmu_get_event_idx;

	cpu_pmu->clear_event_idx = armv7pmu_clear_event_idx;

	cpu_pmu->start		= armv7pmu_start;

	cpu_pmu->stop		= armv7pmu_stop;

	cpu_pmu->reset		= armv7pmu_reset;

	cpu_pmu->max_period	= (1LLU << 32) - 1;

};



static void armv7_read_num_pmnc_events(void *info)
@@ -1638,6 +1644,7 @@ static void krait_pmu_clear_event_idx(struct pmu_hw_events *cpuc, 
	bool venum_event = EVENT_VENUM(hwc->config_base);

	bool krait_event = EVENT_CPU(hwc->config_base);



	armv7pmu_clear_event_idx(cpuc, event);

	if (venum_event || krait_event) {

		bit = krait_event_to_bit(event, region, group);

		clear_bit(bit, cpuc->used_mask);
@@ -1967,6 +1974,7 @@ static void scorpion_pmu_clear_event_idx(struct pmu_hw_events *cpuc, 
	bool venum_event = EVENT_VENUM(hwc->config_base);

	bool scorpion_event = EVENT_CPU(hwc->config_base);



	armv7pmu_clear_event_idx(cpuc, event);

	if (venum_event || scorpion_event) {

		bit = scorpion_event_to_bit(event, region, group);

		clear_bit(bit, cpuc->used_mask);
@@ -2030,6 +2038,7 @@ static struct platform_driver armv7_pmu_driver = { 
	.driver		= {

		.name	= "armv7-pmu",

		.of_match_table = armv7_pmu_of_device_ids,

		.suppress_bind_attrs = true,

	},

	.probe		= armv7_pmu_device_probe,

};

arch/arm/kernel/perf_event_xscale.c

+12 −6
Original line number Diff line number Diff line
@@ -292,6 +292,12 @@ xscale1pmu_get_event_idx(struct pmu_hw_events *cpuc, 
	}

}



static void xscalepmu_clear_event_idx(struct pmu_hw_events *cpuc,

				     struct perf_event *event)

{

	clear_bit(event->hw.idx, cpuc->used_mask);

}



static void xscale1pmu_start(struct arm_pmu *cpu_pmu)

{

	unsigned long flags, val;
@@ -316,7 +322,7 @@ static void xscale1pmu_stop(struct arm_pmu *cpu_pmu) 
	raw_spin_unlock_irqrestore(&events->pmu_lock, flags);

}



static inline u32 xscale1pmu_read_counter(struct perf_event *event)

static inline u64 xscale1pmu_read_counter(struct perf_event *event)

{

	struct hw_perf_event *hwc = &event->hw;

	int counter = hwc->idx;
@@ -337,7 +343,7 @@ static inline u32 xscale1pmu_read_counter(struct perf_event *event) 
	return val;

}



static inline void xscale1pmu_write_counter(struct perf_event *event, u32 val)

static inline void xscale1pmu_write_counter(struct perf_event *event, u64 val)

{

	struct hw_perf_event *hwc = &event->hw;

	int counter = hwc->idx;
@@ -370,11 +376,11 @@ static int xscale1pmu_init(struct arm_pmu *cpu_pmu) 
	cpu_pmu->read_counter	= xscale1pmu_read_counter;

	cpu_pmu->write_counter	= xscale1pmu_write_counter;

	cpu_pmu->get_event_idx	= xscale1pmu_get_event_idx;

	cpu_pmu->clear_event_idx = xscalepmu_clear_event_idx;

	cpu_pmu->start		= xscale1pmu_start;

	cpu_pmu->stop		= xscale1pmu_stop;

	cpu_pmu->map_event	= xscale_map_event;

	cpu_pmu->num_events	= 3;

	cpu_pmu->max_period	= (1LLU << 32) - 1;



	return 0;

}
@@ -679,7 +685,7 @@ static void xscale2pmu_stop(struct arm_pmu *cpu_pmu) 
	raw_spin_unlock_irqrestore(&events->pmu_lock, flags);

}



static inline u32 xscale2pmu_read_counter(struct perf_event *event)

static inline u64 xscale2pmu_read_counter(struct perf_event *event)

{

	struct hw_perf_event *hwc = &event->hw;

	int counter = hwc->idx;
@@ -706,7 +712,7 @@ static inline u32 xscale2pmu_read_counter(struct perf_event *event) 
	return val;

}



static inline void xscale2pmu_write_counter(struct perf_event *event, u32 val)

static inline void xscale2pmu_write_counter(struct perf_event *event, u64 val)

{

	struct hw_perf_event *hwc = &event->hw;

	int counter = hwc->idx;
@@ -739,11 +745,11 @@ static int xscale2pmu_init(struct arm_pmu *cpu_pmu) 
	cpu_pmu->read_counter	= xscale2pmu_read_counter;

	cpu_pmu->write_counter	= xscale2pmu_write_counter;

	cpu_pmu->get_event_idx	= xscale2pmu_get_event_idx;

	cpu_pmu->clear_event_idx = xscalepmu_clear_event_idx;

	cpu_pmu->start		= xscale2pmu_start;

	cpu_pmu->stop		= xscale2pmu_stop;

	cpu_pmu->map_event	= xscale_map_event;

	cpu_pmu->num_events	= 5;

	cpu_pmu->max_period	= (1LLU << 32) - 1;



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE