[PATCH V3 1/7] irqchip/loongarch-avec: Adjust irqchip driver for 32BIT/64BIT

From: Huacai Chen

Date: Tue Jan 13 2026 - 04:00:37 EST


csr_read64() is only available on 64BIT LoongArch platform, so use
recently added adaptive csr_read() instead, so as to make the driver
work on both 32BIT and 64BIT platform.

BTW, make avecintc_enable() be a no-op since it is only needed by 64BIT
platform.

Co-developed-by: Jiaxun Yang <jiaxun.yang@xxxxxxxxxxx>
Signed-off-by: Jiaxun Yang <jiaxun.yang@xxxxxxxxxxx>
Signed-off-by: Huacai Chen <chenhuacai@xxxxxxxxxxx>
---
drivers/irqchip/irq-loongarch-avec.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/irqchip/irq-loongarch-avec.c b/drivers/irqchip/irq-loongarch-avec.c
index ba556c008cf3..fb8efde95393 100644
--- a/drivers/irqchip/irq-loongarch-avec.c
+++ b/drivers/irqchip/irq-loongarch-avec.c
@@ -58,11 +58,13 @@ struct avecintc_data {

static inline void avecintc_enable(void)
{
+#ifdef CONFIG_MACH_LOONGSON64
u64 value;

value = iocsr_read64(LOONGARCH_IOCSR_MISC_FUNC);
value |= IOCSR_MISC_FUNC_AVEC_EN;
iocsr_write64(value, LOONGARCH_IOCSR_MISC_FUNC);
+#endif
}

static inline void avecintc_ack_irq(struct irq_data *d)
@@ -167,7 +169,7 @@ void complete_irq_moving(void)
struct pending_list *plist = this_cpu_ptr(&pending_list);
struct avecintc_data *adata, *tdata;
int cpu, vector, bias;
- uint64_t isr;
+ unsigned long isr;

guard(raw_spinlock)(&loongarch_avec.lock);

@@ -177,16 +179,16 @@ void complete_irq_moving(void)
bias = vector / VECTORS_PER_REG;
switch (bias) {
case 0:
- isr = csr_read64(LOONGARCH_CSR_ISR0);
+ isr = csr_read(LOONGARCH_CSR_ISR0);
break;
case 1:
- isr = csr_read64(LOONGARCH_CSR_ISR1);
+ isr = csr_read(LOONGARCH_CSR_ISR1);
break;
case 2:
- isr = csr_read64(LOONGARCH_CSR_ISR2);
+ isr = csr_read(LOONGARCH_CSR_ISR2);
break;
case 3:
- isr = csr_read64(LOONGARCH_CSR_ISR3);
+ isr = csr_read(LOONGARCH_CSR_ISR3);
break;
}

@@ -234,7 +236,7 @@ static void avecintc_irq_dispatch(struct irq_desc *desc)
chained_irq_enter(chip, desc);

while (true) {
- unsigned long vector = csr_read64(LOONGARCH_CSR_IRR);
+ unsigned long vector = csr_read(LOONGARCH_CSR_IRR);
if (vector & IRR_INVALID_MASK)
break;

--
2.47.3