Unverified Commit ca7473cb authored by Sunil V L's avatar Sunil V L Committed by Palmer Dabbelt
Browse files

RISC-V/perf: Use standard interface to get INTC domain 



Currently the PMU driver is using DT based lookup to
find the INTC node for sscofpmf extension. This will not work
for ACPI based systems causing the driver to fail to register
the PMU overflow interrupt handler.

Hence, change the code to use the standard interface to find
the INTC node which works irrespective of DT or ACPI.

Signed-off-by: default avatarSunil V L <sunilvl@ventanamicro.com>
Reviewed-by: default avatarConor Dooley <conor.dooley@microchip.com>
Reviewed-by: default avatarAtish Patra <atishp@rivosinc.com>
Link: https://lore.kernel.org/r/20230607112417.782085-3-sunilvl@ventanamicro.com


Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 3b426d4b

drivers/perf/riscv_pmu_sbi.c

+2 −15
Original line number Diff line number Diff line
@@ -739,7 +739,6 @@ static int pmu_sbi_setup_irqs(struct riscv_pmu *pmu, struct platform_device *pde 
{

	int ret;

	struct cpu_hw_events __percpu *hw_events = pmu->hw_events;

	struct device_node *cpu, *child;

	struct irq_domain *domain = NULL;



	if (riscv_isa_extension_available(NULL, SSCOFPMF)) {
@@ -756,20 +755,8 @@ static int pmu_sbi_setup_irqs(struct riscv_pmu *pmu, struct platform_device *pde 
	if (!riscv_pmu_use_irq)

		return -EOPNOTSUPP;



	for_each_of_cpu_node(cpu) {

		child = of_get_compatible_child(cpu, "riscv,cpu-intc");

		if (!child) {

			pr_err("Failed to find INTC node\n");

			of_node_put(cpu);

			return -ENODEV;

		}

		domain = irq_find_host(child);

		of_node_put(child);

		if (domain) {

			of_node_put(cpu);

			break;

		}

	}

	domain = irq_find_matching_fwnode(riscv_get_intc_hwnode(),

					  DOMAIN_BUS_ANY);

	if (!domain) {

		pr_err("Failed to find INTC IRQ root domain\n");

		return -ENODEV;