From nobody Sun Feb 8 23:42:27 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8BBC330BF77; Sun, 18 Jan 2026 10:03:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768730587; cv=none; b=abp9qhbqX5PWnw31Sh7yb0pGu3iEsT4XNlbVsDybAeyQwhfZpuyGLlYaMcMXJg78DnqY/l8k84HK6y9BN40o1nTiI8Y4p4TR471nZ0YjYzBN0nh9n3qIhoHjIJWppqBp+BJOvVP93tg8SZ0efwh9QMNypVuphrC+FZwPfUW5Zgc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1768730587; c=relaxed/simple; bh=qnhnjGsJnlS/cnPxsIs6+PoDi9oK3Oyv0sIxTDBctJI=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=JYUd1Qys7BhG+mEd7t5O0Puw1UwZFm2c/BOmnQPqyeizDxd2ryc7Rmm052PPOXeUHf48grJXOUaMl3G8ZrQQeKgssKquUdtmhitjkwMB9TAZGsH36fyYZvuVL5xNvKlMt0mYyxOEN+1uQDF3ezkWM4GW5NFP3jByL1A9ry0MUG0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=teaVAJI8; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=rHTEioWg; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="teaVAJI8"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="rHTEioWg" Date: Sun, 18 Jan 2026 10:03:02 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1768730584; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SpPgQY5L5fdIpWXVCIAaVUDPBUcVz2wBiDF08HVxEi0=; b=teaVAJI8dx2iWIitcclqU+vYRg+5kIqIPcSdFG71SSYRv0pBnyAFiP4zGgUgi3oT5KE2Pa cijYuGju3Nf3zCujOEUILFE6zRG64cOUhdNtkIb28VSJ5pZQIOmjSEUZHUkuPxmLC2/fKi W5iq0913zyK2jNK76tQ7QEmpW4+JvQZ+TozJsLpUfXFlnMls3i0dVNAjKZR9sixZcikTHA P/wj38ZjX2ABxIOT6KdcF3kR+5fVRKDQB9dRB3ZRFvlpmTtT1VJarj/TF79ahTpWR6ZVfa hH2UMFzJX/SfzsBNbrU/GLPL2tzqYHm3m0NfB5xTh8hDrUtIvAFyO3sL3c1rEA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1768730584; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SpPgQY5L5fdIpWXVCIAaVUDPBUcVz2wBiDF08HVxEi0=; b=rHTEioWgs/7jIIqOsk0Sf9G4b4E+0ZPNrMk9DXaokx+Pa5JdFagx8vodyi6CYBHiEH/fCq RLPhkSlSOowICtAg== From: "tip-bot2 for Huacai Chen" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/drivers] irqchip/loongson-eiointc: Adjust irqchip driver for 32BIT/64BIT Cc: Jiaxun Yang , Huacai Chen , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260113085940.3344837-4-chenhuacai@loongson.cn> References: <20260113085940.3344837-4-chenhuacai@loongson.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <176873058292.510.13429995942244528917.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the irq/drivers branch of tip: Commit-ID: c7f2d13b35333b5fb8e7007513c0f778356b4d82 Gitweb: https://git.kernel.org/tip/c7f2d13b35333b5fb8e7007513c0f7783= 56b4d82 Author: Huacai Chen AuthorDate: Tue, 13 Jan 2026 16:59:36 +08:00 Committer: Thomas Gleixner CommitterDate: Tue, 13 Jan 2026 19:32:01 +01:00 irqchip/loongson-eiointc: Adjust irqchip driver for 32BIT/64BIT iocsr_read64()/iocsr_write64() are only available on 64BIT LoongArch platform, so add and use a pair of helpers, i.e. read_isr()/write_isr() instead to make the driver work on both 32BIT and 64BIT platforms. This makes eoiintc_enable() a no-op for 32-bit as it is only required on 64-bit systems. [ tglx: Make the helpers inline and fixup the variable declaration order ] Co-developed-by: Jiaxun Yang Signed-off-by: Jiaxun Yang Signed-off-by: Huacai Chen Signed-off-by: Thomas Gleixner Link: https://patch.msgid.link/20260113085940.3344837-4-chenhuacai@loongson= .cn --- drivers/irqchip/irq-loongson-eiointc.c | 36 ++++++++++++++++++++----- 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/drivers/irqchip/irq-loongson-eiointc.c b/drivers/irqchip/irq-l= oongson-eiointc.c index ad21056..37e7e1f 100644 --- a/drivers/irqchip/irq-loongson-eiointc.c +++ b/drivers/irqchip/irq-loongson-eiointc.c @@ -37,9 +37,9 @@ #define EXTIOI_ENABLE_INT_ENCODE BIT(2) #define EXTIOI_ENABLE_CPU_ENCODE BIT(3) =20 -#define VEC_REG_COUNT 4 -#define VEC_COUNT_PER_REG 64 -#define VEC_COUNT (VEC_REG_COUNT * VEC_COUNT_PER_REG) +#define VEC_COUNT 256 +#define VEC_COUNT_PER_REG BITS_PER_LONG +#define VEC_REG_COUNT (VEC_COUNT / BITS_PER_LONG) #define VEC_REG_IDX(irq_id) ((irq_id) / VEC_COUNT_PER_REG) #define VEC_REG_BIT(irq_id) ((irq_id) % VEC_COUNT_PER_REG) #define EIOINTC_ALL_ENABLE 0xffffffff @@ -85,11 +85,13 @@ static struct eiointc_priv *eiointc_priv[MAX_IO_PICS]; =20 static void eiointc_enable(void) { +#ifdef CONFIG_MACH_LOONGSON64 uint64_t misc; =20 misc =3D iocsr_read64(LOONGARCH_IOCSR_MISC_FUNC); misc |=3D IOCSR_MISC_FUNC_EXT_IOI_EN; iocsr_write64(misc, LOONGARCH_IOCSR_MISC_FUNC); +#endif } =20 static int cpu_to_eio_node(int cpu) @@ -281,12 +283,34 @@ static int eiointc_router_init(unsigned int cpu) return 0; } =20 +#if VEC_COUNT_PER_REG =3D=3D 32 +static inline unsigned long read_isr(int i) +{ + return iocsr_read32(EIOINTC_REG_ISR + (i << 2)); +} + +static inline void write_isr(int i, unsigned long val) +{ + iocsr_write32(val, EIOINTC_REG_ISR + (i << 2)); +} +#else +static inline unsigned long read_isr(int i) +{ + return iocsr_read64(EIOINTC_REG_ISR + (i << 3)); +} + +static inline void write_isr(int i, unsigned long val) +{ + iocsr_write64(val, EIOINTC_REG_ISR + (i << 3)); +} +#endif + static void eiointc_irq_dispatch(struct irq_desc *desc) { struct eiointc_ip_route *info =3D irq_desc_get_handler_data(desc); struct irq_chip *chip =3D irq_desc_get_chip(desc); + unsigned long pending; bool handled =3D false; - u64 pending; int i; =20 chained_irq_enter(chip, desc); @@ -299,14 +323,14 @@ static void eiointc_irq_dispatch(struct irq_desc *des= c) * read ISR for these 64 interrupt vectors rather than all vectors */ for (i =3D info->start; i < info->end; i++) { - pending =3D iocsr_read64(EIOINTC_REG_ISR + (i << 3)); + pending =3D read_isr(i); =20 /* Skip handling if pending bitmap is zero */ if (!pending) continue; =20 /* Clear the IRQs */ - iocsr_write64(pending, EIOINTC_REG_ISR + (i << 3)); + write_isr(i, pending); while (pending) { int bit =3D __ffs(pending); int irq =3D bit + VEC_COUNT_PER_REG * i;