Commit 0a14d764 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arc-5.10-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc 

Pull ARC fix from Vineet Gupta:
 "I found a snafu in perf driver which made it into 5.9-rc4 and the fix
  should go in now than wait"

* tag 'arc-5.10-rc1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: perf: redo the pct irq missing in device-tree handling
parents 032c7ed9 8c42a5c0

arch/arc/kernel/perf_event.c

+18 −9
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ static int arc_pmu_device_probe(struct platform_device *pdev) 
{

	struct arc_reg_pct_build pct_bcr;

	struct arc_reg_cc_build cc_bcr;

	int i, has_interrupts, irq;

	int i, has_interrupts, irq = -1;

	int counter_size;	/* in bits */



	union cc_name {
@@ -637,19 +637,28 @@ static int arc_pmu_device_probe(struct platform_device *pdev) 
		.attr_groups	= arc_pmu->attr_groups,

	};



	if (has_interrupts && (irq = platform_get_irq(pdev, 0) >= 0)) {

	if (has_interrupts) {

		irq = platform_get_irq(pdev, 0);

		if (irq >= 0) {

			int ret;



			arc_pmu->irq = irq;



			/* intc map function ensures irq_set_percpu_devid() called */

		request_percpu_irq(irq, arc_pmu_intr, "ARC perf counters",

			ret = request_percpu_irq(irq, arc_pmu_intr, "ARC perf counters",

						 this_cpu_ptr(&arc_pmu_cpu));



			if (!ret)

				on_each_cpu(arc_cpu_pmu_irq_init, &irq, 1);

	} else {

		arc_pmu->pmu.capabilities |= PERF_PMU_CAP_NO_INTERRUPT;

			else

				irq = -1;

		}



	}



	if (irq == -1)

		arc_pmu->pmu.capabilities |= PERF_PMU_CAP_NO_INTERRUPT;



	/*

	 * perf parser doesn't really like '-' symbol in events name, so let's

	 * use '_' in arc pct name as it goes to kernel PMU event prefix.

CRA Git | Maintained and supported by SUSTech CRA and CCSE