mirror of
				https://github.com/torvalds/linux.git
				synced 2025-11-04 10:40:15 +02:00 
			
		
		
		
	irqchip/riscv-intc: Fix low-level interrupt handler setup for AIA
Use riscv_intc_aia_irq() as the low-level interrupt handler instead of the
existing riscv_intc_irq() default handler to make demultiplexing work
correctly.
Also print "using AIA" in the INTC boot banner when AIA is available.
Fixes: 3c46fc5b55 ("irqchip/riscv-intc: Add support for RISC-V AIA")
Signed-off-by: Anup Patel <apatel@ventanamicro.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20240226040746.1396416-2-apatel@ventanamicro.com
			
			
This commit is contained in:
		
							parent
							
								
									c147e1ef59
								
							
						
					
					
						commit
						678c607ecf
					
				
					 1 changed files with 7 additions and 3 deletions
				
			
		| 
						 | 
					@ -183,6 +183,9 @@ static int __init riscv_intc_init_common(struct fwnode_handle *fn, struct irq_ch
 | 
				
			||||||
		return -ENXIO;
 | 
							return -ENXIO;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if (riscv_isa_extension_available(NULL, SxAIA))
 | 
				
			||||||
 | 
							rc = set_handle_irq(&riscv_intc_aia_irq);
 | 
				
			||||||
 | 
						else
 | 
				
			||||||
		rc = set_handle_irq(&riscv_intc_irq);
 | 
							rc = set_handle_irq(&riscv_intc_irq);
 | 
				
			||||||
	if (rc) {
 | 
						if (rc) {
 | 
				
			||||||
		pr_err("failed to set irq handler\n");
 | 
							pr_err("failed to set irq handler\n");
 | 
				
			||||||
| 
						 | 
					@ -191,8 +194,9 @@ static int __init riscv_intc_init_common(struct fwnode_handle *fn, struct irq_ch
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	riscv_set_intc_hwnode_fn(riscv_intc_hwnode);
 | 
						riscv_set_intc_hwnode_fn(riscv_intc_hwnode);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	pr_info("%d local interrupts mapped\n",
 | 
						pr_info("%d local interrupts mapped%s\n",
 | 
				
			||||||
		riscv_isa_extension_available(NULL, SxAIA) ? 64 : riscv_intc_nr_irqs);
 | 
							riscv_isa_extension_available(NULL, SxAIA) ? 64 : riscv_intc_nr_irqs,
 | 
				
			||||||
 | 
							riscv_isa_extension_available(NULL, SxAIA) ? " using AIA" : "");
 | 
				
			||||||
	if (riscv_intc_custom_nr_irqs)
 | 
						if (riscv_intc_custom_nr_irqs)
 | 
				
			||||||
		pr_info("%d custom local interrupts mapped\n", riscv_intc_custom_nr_irqs);
 | 
							pr_info("%d custom local interrupts mapped\n", riscv_intc_custom_nr_irqs);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue