Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux (e66d001c) · Commits · 戴 / test

arch/arm64/kernel/perf_event.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -966,6 +966,12 @@ static int armv8pmu_set_event_filter(struct hw_perf_event *event,
		return 0;
		}

		static int armv8pmu_filter_match(struct perf_event *event)
		{
		unsigned long evtype = event->hw.config_base & ARMV8_PMU_EVTYPE_EVENT;
		return evtype != ARMV8_PMUV3_PERFCTR_CHAIN;
		}

		static void armv8pmu_reset(void *info)
		{
		struct arm_pmu cpu_pmu = (struct arm_pmu )info;
		@@ -1114,6 +1120,7 @@ static int armv8_pmu_init(struct arm_pmu *cpu_pmu)
		cpu_pmu->stop = armv8pmu_stop,
		cpu_pmu->reset = armv8pmu_reset,
		cpu_pmu->set_event_filter = armv8pmu_set_event_filter;
		cpu_pmu->filter_match = armv8pmu_filter_match;

		return 0;
		}

arch/arm64/kernel/setup.c

+27 −29

Original line number	Diff line number	Diff line
		@@ -64,6 +64,9 @@
		#include <asm/xen/hypervisor.h>
		#include <asm/mmu_context.h>

		static int num_standard_resources;
		static struct resource *standard_resources;

		phys_addr_t __fdt_pointer __initdata;

		/*
		@@ -206,14 +209,19 @@ static void __init request_standard_resources(void)
		{
		struct memblock_region *region;
		struct resource *res;
		unsigned long i = 0;

		kernel_code.start = __pa_symbol(_text);
		kernel_code.end = __pa_symbol(__init_begin - 1);
		kernel_data.start = __pa_symbol(_sdata);
		kernel_data.end = __pa_symbol(_end - 1);

		num_standard_resources = memblock.memory.cnt;
		standard_resources = alloc_bootmem_low(num_standard_resources *
		sizeof(*standard_resources));

		for_each_memblock(memory, region) {
		res = alloc_bootmem_low(sizeof(*res));
		res = &standard_resources[i++];
		if (memblock_is_nomap(region)) {
		res->name = "reserved";
		res->flags = IORESOURCE_MEM;
		@@ -243,37 +251,27 @@ static void __init request_standard_resources(void)

		static int __init reserve_memblock_reserved_regions(void)
		{
		phys_addr_t start, end, roundup_end = 0;
		struct resource mem, res;
		u64 i;

		for_each_reserved_mem_region(i, &start, &end) {
		if (end <= roundup_end)
		continue; /* done already */

		start = __pfn_to_phys(PFN_DOWN(start));
		end = __pfn_to_phys(PFN_UP(end)) - 1;
		roundup_end = end;

		res = kzalloc(sizeof(*res), GFP_ATOMIC);
		if (WARN_ON(!res))
		return -ENOMEM;
		res->start = start;
		res->end = end;
		res->name = "reserved";
		res->flags = IORESOURCE_MEM;
		u64 i, j;

		mem = request_resource_conflict(&iomem_resource, res);
		/*
		* We expected memblock_reserve() regions to conflict with
		* memory created by request_standard_resources().
		*/
		if (WARN_ON_ONCE(!mem))
		for (i = 0; i < num_standard_resources; ++i) {
		struct resource *mem = &standard_resources[i];
		phys_addr_t r_start, r_end, mem_size = resource_size(mem);

		if (!memblock_is_region_reserved(mem->start, mem_size))
		continue;

		for_each_reserved_mem_region(j, &r_start, &r_end) {
		resource_size_t start, end;

		start = max(PFN_PHYS(PFN_DOWN(r_start)), mem->start);
		end = min(PFN_PHYS(PFN_UP(r_end)) - 1, mem->end);

		if (start > mem->end \|\| end < mem->start)
		continue;
		kfree(res);

		reserve_region_with_split(mem, start, end, "reserved");
		}
		}

		return 0;
		}

drivers/perf/arm_pmu.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -485,7 +485,13 @@ static int armpmu_filter_match(struct perf_event *event)
		{
		struct arm_pmu *armpmu = to_arm_pmu(event->pmu);
		unsigned int cpu = smp_processor_id();
		return cpumask_test_cpu(cpu, &armpmu->supported_cpus);
		int ret;

		ret = cpumask_test_cpu(cpu, &armpmu->supported_cpus);
		if (ret && armpmu->filter_match)
		return armpmu->filter_match(event);

		return ret;
		}

		static ssize_t armpmu_cpumask_show(struct device *dev,

include/linux/perf/arm_pmu.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -99,6 +99,7 @@ struct arm_pmu {
		void (stop)(struct arm_pmu );
		void (reset)(void );
		int (map_event)(struct perf_event event);
		int (filter_match)(struct perf_event event);
		int num_events;
		bool secure_access; /* 32-bit ARM only */
		#define ARMV8_PMUV3_MAX_COMMON_EVENTS 0x40

Admin message