[PATCH v1 -next 2/2] RISC-V/perf: Use standard interface to get INTC domain

[Conor Dooley]

On Mon, Jun 05, 2023 at 08:05:12PM +0530, Sunil V L wrote:
> 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 at ventanamicro.com>
> ---
>  drivers/perf/riscv_pmu_sbi.c | 17 ++---------------
>  1 file changed, 2 insertions(+), 15 deletions(-)
> 
> diff --git a/drivers/perf/riscv_pmu_sbi.c b/drivers/perf/riscv_pmu_sbi.c
> index 4f3ac296b3e2..0bc491252a44 100644
> --- 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);

This riscv_get_intc_hwnode stuff is horrific, but that's besides the
point.
Reviewed-by: Conor Dooley <conor.dooley at microchip.com>

Cheers,
Conor.

>  	if (!domain) {
>  		pr_err("Failed to find INTC IRQ root domain\n");
>  		return -ENODEV;
> -- 
> 2.34.1
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20230606/80a1a196/attachment.sig>