Commit cb877710 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux 

- perf/arm-cci: allow building as module

- perf/arm-ccn: demote dev_warn() to dev_dbg() in event_init()

- miscellaneous perf/arm cleanups

* 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux:
  ARM: mcpm, perf/arm-cci: export mcpm_is_available
  drivers/bus: arm-cci: fix build warnings
  drivers/perf: Remove ARM_SPE_PMU explicit PERF_EVENTS dependency
  drivers/perf: arm-ccn: don't log to dmesg in event_init
  perf/arm-cci: Allow building as a module
  perf/arm-cci: Remove pointless PMU disabling
  perf/arm-cc*: Fix MODULE_LICENSE() tags
  arm_pmu: simplify arm_pmu::handle_irq
  perf/arm-cci: Remove unnecessary period adjustment
  perf: simplify getting .drvdata
parents 5d81f7dc 73acc031

arch/arm/common/mcpm_entry.c

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 * published by the Free Software Foundation.

 */



#include <linux/export.h>

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/irqflags.h>
@@ -174,6 +175,7 @@ bool mcpm_is_available(void) 
{

	return (platform_ops) ? true : false;

}

EXPORT_SYMBOL_GPL(mcpm_is_available);



/*

 * We can't use regular spinlocks. In the switcher case, it is possible

arch/arm/kernel/perf_event_v6.c

+1 −3
Original line number Diff line number Diff line
@@ -303,12 +303,10 @@ static void armv6pmu_enable_event(struct perf_event *event) 
}



static irqreturn_t

armv6pmu_handle_irq(int irq_num,

		    void *dev)

armv6pmu_handle_irq(struct arm_pmu *cpu_pmu)

{

	unsigned long pmcr = armv6_pmcr_read();

	struct perf_sample_data data;

	struct arm_pmu *cpu_pmu = (struct arm_pmu *)dev;

	struct pmu_hw_events *cpuc = this_cpu_ptr(cpu_pmu->hw_events);

	struct pt_regs *regs;

	int idx;

arch/arm/kernel/perf_event_v7.c

+1 −2
Original line number Diff line number Diff line
@@ -946,11 +946,10 @@ static void armv7pmu_disable_event(struct perf_event *event) 
	raw_spin_unlock_irqrestore(&events->pmu_lock, flags);

}



static irqreturn_t armv7pmu_handle_irq(int irq_num, void *dev)

static irqreturn_t armv7pmu_handle_irq(struct arm_pmu *cpu_pmu)

{

	u32 pmnc;

	struct perf_sample_data data;

	struct arm_pmu *cpu_pmu = (struct arm_pmu *)dev;

	struct pmu_hw_events *cpuc = this_cpu_ptr(cpu_pmu->hw_events);

	struct pt_regs *regs;

	int idx;

arch/arm/kernel/perf_event_xscale.c

+2 −4
Original line number Diff line number Diff line
@@ -142,11 +142,10 @@ xscale1_pmnc_counter_has_overflowed(unsigned long pmnc, 
}



static irqreturn_t

xscale1pmu_handle_irq(int irq_num, void *dev)

xscale1pmu_handle_irq(struct arm_pmu *cpu_pmu)

{

	unsigned long pmnc;

	struct perf_sample_data data;

	struct arm_pmu *cpu_pmu = (struct arm_pmu *)dev;

	struct pmu_hw_events *cpuc = this_cpu_ptr(cpu_pmu->hw_events);

	struct pt_regs *regs;

	int idx;
@@ -489,11 +488,10 @@ xscale2_pmnc_counter_has_overflowed(unsigned long of_flags, 
}



static irqreturn_t

xscale2pmu_handle_irq(int irq_num, void *dev)

xscale2pmu_handle_irq(struct arm_pmu *cpu_pmu)

{

	unsigned long pmnc, of_flags;

	struct perf_sample_data data;

	struct arm_pmu *cpu_pmu = (struct arm_pmu *)dev;

	struct pmu_hw_events *cpuc = this_cpu_ptr(cpu_pmu->hw_events);

	struct pt_regs *regs;

	int idx;

arch/arm64/kernel/perf_event.c

+1 −2
Original line number Diff line number Diff line
@@ -670,11 +670,10 @@ static void armv8pmu_disable_event(struct perf_event *event) 
	raw_spin_unlock_irqrestore(&events->pmu_lock, flags);

}



static irqreturn_t armv8pmu_handle_irq(int irq_num, void *dev)

static irqreturn_t armv8pmu_handle_irq(struct arm_pmu *cpu_pmu)

{

	u32 pmovsr;

	struct perf_sample_data data;

	struct arm_pmu *cpu_pmu = (struct arm_pmu *)dev;

	struct pmu_hw_events *cpuc = this_cpu_ptr(cpu_pmu->hw_events);

	struct pt_regs *regs;

	int idx;

CRA Git | Maintained and supported by SUSTech CRA and CCSE