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: Sunil V L <sunilvl@ventanamicro.com>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Reviewed-by: Atish Patra <atishp@rivosinc.com>
Link: https://lore.kernel.org/r/20230607112417.782085-3-sunilvl@ventanamicro.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
index 4f3ac296b3e25afe356cd7662e32c6f6e2cbf2d5..0bc491252a44c33f423ee7e910bdac1bb797097c 100644 (file)
--- a/drivers/perf/riscv_pmu_sbi.c
+++ b/drivers/perf/riscv_pmu_sbi.c
@@ -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;