From nobody Tue Feb 10 08:26:41 2026 Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E4AAA3A1A5F for ; Fri, 6 Feb 2026 11:17:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770376626; cv=none; b=q4DkxxU43YCI6KtyvWJMYkf+8QK5l+HBrUvwFhgrYyxkHnmDKh1mulyJcb8xK9R+qc8RB4QU9lshc3lKVovU0Q18+MK/WsQc05G0cD+HGlLIYOGnm/N0n8cIdaJkeet/RBJmxjS95Qb47clvU3u1BIOstQOI5AE0aD5P/dZsFUM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770376626; c=relaxed/simple; bh=3C74JNFXi3uKwy8kFvk6HfAp8K0Gq6R+KU/xJsdc5fA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JDjfR2Lxr+YUVKtmvBvDjGIfIk7JIr68yzHLNrUXXo5eX5omAQ2Faa8g9uzZarDvy2PLRYMdP06+kKoTl2prrQ3LYdNHNcDgwtpuGSARhfeGR3nvP79lUjTWIBJijVr0WStqq+KtZmFbZuelWbcKy2nksY/flA90Wii6jZTVx7E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=L3ggPMsJ; arc=none smtp.client-ip=209.85.221.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="L3ggPMsJ" Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-4359249bbacso1897549f8f.0 for ; Fri, 06 Feb 2026 03:17:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1770376624; x=1770981424; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1TFRvg3GiC3fTa3U71n08qAP9/3weHGAPlVvCNhEDkk=; b=L3ggPMsJhpa1PddOs2AJ7IS/tIuLPR/BzxJ8Z3MJV6goyQ0KScIXqmVcIx/z5Cg1jX rlSNUM6Xw5jPJ7Pw/390sn3QvY3BSKjiFHeIGRHzyZUp4WNwwfH1WCfQMUKYGEpCwydj LqrNS6EJezg0PY6+ybFgg7me1JT0SqvZ6cXsibGFhelZJLl8gAhUp7EmsAPS0Pr8zLQi tfjLjARhhca5rwqlcbsmdDknHDYMs4OEC/Q6PF25W/w4Xr0gC7FwLNNjdKZSmocfY2Oy nmnvrtgbut7i3Oz3ajw0I3A4fUL1JwO6BadGW1GO+WHlJssIZcTcj+lKMSKI5ym9FQ1p V1SQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770376624; x=1770981424; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=1TFRvg3GiC3fTa3U71n08qAP9/3weHGAPlVvCNhEDkk=; b=kvhZlURHf6xAKtrInrAmPGJ8yDroawABseSLFSvp67EM8+f4jJzOiUkcyp6yD///FT TAVROgXf8uDaHuZdyCoeJNtbephydv0Y82xrnw/FHm/b5fsQ007u7SmhNRCgeNn15dqp BQZeK1B7dxSE9uEJWjWRWNqjbkGcEtxUQZsrDxDUzL3YFn8Izlophy+IJQvCn3yi3shP 4U87GCFsKeRHQ+iWv0fwrhcLNIXDsDLfq2Fh/yBUinJt+i7OHxUPg1uplQ/FgPveL+gi lFzPrFKYU0AzbbfAWokm/T5OXcRrxTDNkiSalHdVF0q/RluPqKm75IGbOGUohRYzPCHY bDCw== X-Forwarded-Encrypted: i=1; AJvYcCWQLO4lMXBdcwAxkXTcKsb8fxcRf9JR2fvFCxXV3nn+a2xE/QwgnhYF3vOCqy84TDbTctzlnzQPuqkECvo=@vger.kernel.org X-Gm-Message-State: AOJu0YxuFuNo/U9o25s6Mf3lY5gvPi3Xwxr1DNdjYorTsPR46NrbdYoh B65nKFMCVs1cU1pmJ7JEGnideIbUTw/i7AbuL3XBf1MWdhR4d8uz81h8 X-Gm-Gg: AZuq6aIwO08jzJmpqhWKgCEXL/fW9J0dDXf0rbvfzIjgrJc9Gvz6TEz1bnuTV2plDnw fy69zmSoh/PiZtWE/Z2BcQoL6VeiN39Z/DGVrNs4C+JkSBl2DOzVSEtAxy+Zg4vVw4L8fGZHx4o oJQ/Wyfylkpm6SKurf46arg0dsQjMzLVAtVK1GOeW8dGOYSu4P4zE+knSJ1/2ByrvEFOx7rkjna BbbfRpjwgv4np8XwNCvAM+7EzG8vSE0R3AI0C46uEUWml0nCfGksh3B8R1pu8iwmXxha1tuBBLK GrYHL5DxgJmoBq2se0ZRRT06CiqisKk87xG6nxjGZWbtNPWY5xx2jEJmmiz7mG6eEV8O9tcrYSl R5gIOxYs73yvgEMpUtLWQGcB7hZsM03SxtPyeRCBCX1imY+/oNrH5duX8XF8o65nNec5SRFGRgd 0lKIZn5BUYcbkU/eMb5g== X-Received: by 2002:a05:6000:2306:b0:435:b674:c9b1 with SMTP id ffacd0b85a97d-4362903c4c0mr4529994f8f.11.1770376624214; Fri, 06 Feb 2026 03:17:04 -0800 (PST) Received: from biju.lan ([2a00:23c4:a758:8a01:1e64:f8d5:9d7a:19d4]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4362972fa4csm4746380f8f.26.2026.02.06.03.17.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Feb 2026 03:17:03 -0800 (PST) From: Biju X-Google-Original-From: Biju To: Thomas Gleixner Cc: Biju Das , linux-kernel@vger.kernel.org, Geert Uytterhoeven , Prabhakar Mahadev Lad , Biju Das , linux-renesas-soc@vger.kernel.org Subject: [PATCH v3 6/9] irqchip/renesas-rzg2l: Drop IRQC_IRQ_COUNT macro Date: Fri, 6 Feb 2026 11:16:49 +0000 Message-ID: <20260206111658.231934-7-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260206111658.231934-1-biju.das.jz@bp.renesas.com> References: <20260206111658.231934-1-biju.das.jz@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Biju Das The total number of External IRQs in RZ/G2L and RZ/G3L SoC are different. The RZ/G3L has 16 external IRQs where as RZ/G2L has only 8 external IRQ. Add irq_count variable in struct rzg2l_hw_info to handle this differences and drop the macro IRQC_IRQ_COUNT. Signed-off-by: Biju Das --- v2->v3: * No change v1->v2: * No change --- drivers/irqchip/irq-renesas-rzg2l.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/irqchip/irq-renesas-rzg2l.c b/drivers/irqchip/irq-rene= sas-rzg2l.c index e5393306f610..0de7db45d4c8 100644 --- a/drivers/irqchip/irq-renesas-rzg2l.c +++ b/drivers/irqchip/irq-renesas-rzg2l.c @@ -21,7 +21,6 @@ #include =20 #define IRQC_IRQ_START 1 -#define IRQC_IRQ_COUNT 8 #define IRQC_TINT_COUNT 32 =20 #define ISCR 0x10 @@ -68,10 +67,12 @@ struct rzg2l_irqc_reg_cache { =20 /** * struct rzg2l_hw_info - Interrupt Control Unit controller hardware info = structure. + * @irq_count: Number of IRQC interrupts * @tint_start: Start of TINT interrupts * @num_irq: Total Number of interrupts */ struct rzg2l_hw_info { + u8 irq_count; u8 tint_start; u8 num_irq; }; @@ -144,7 +145,7 @@ static void rzg2l_irqc_eoi(struct irq_data *d) unsigned int hw_irq =3D irqd_to_hwirq(d); =20 raw_spin_lock(&priv->lock); - if (hw_irq >=3D IRQC_IRQ_START && hw_irq <=3D IRQC_IRQ_COUNT) + if (hw_irq >=3D IRQC_IRQ_START && hw_irq <=3D priv->info->irq_count) rzg2l_clear_irq_int(priv, hw_irq); else if (hw_irq >=3D priv->info->tint_start && hw_irq < priv->info->num_i= rq) rzg2l_clear_tint_int(priv, hw_irq); @@ -190,7 +191,7 @@ static void rzfive_irqc_mask(struct irq_data *d) unsigned int hwirq =3D irqd_to_hwirq(d); =20 raw_spin_lock(&priv->lock); - if (hwirq >=3D IRQC_IRQ_START && hwirq <=3D IRQC_IRQ_COUNT) + if (hwirq >=3D IRQC_IRQ_START && hwirq <=3D priv->info->irq_count) rzfive_irqc_mask_irq_interrupt(priv, hwirq); else if (hwirq >=3D priv->info->tint_start && hwirq < priv->info->num_irq) rzfive_irqc_mask_tint_interrupt(priv, hwirq); @@ -204,7 +205,7 @@ static void rzfive_irqc_unmask(struct irq_data *d) unsigned int hwirq =3D irqd_to_hwirq(d); =20 raw_spin_lock(&priv->lock); - if (hwirq >=3D IRQC_IRQ_START && hwirq <=3D IRQC_IRQ_COUNT) + if (hwirq >=3D IRQC_IRQ_START && hwirq <=3D priv->info->irq_count) rzfive_irqc_unmask_irq_interrupt(priv, hwirq); else if (hwirq >=3D priv->info->tint_start && hwirq < priv->info->num_irq) rzfive_irqc_unmask_tint_interrupt(priv, hwirq); @@ -400,7 +401,7 @@ static int rzg2l_irqc_set_type(struct irq_data *d, unsi= gned int type) unsigned int hw_irq =3D irqd_to_hwirq(d); int ret =3D -EINVAL; =20 - if (hw_irq >=3D IRQC_IRQ_START && hw_irq <=3D IRQC_IRQ_COUNT) + if (hw_irq >=3D IRQC_IRQ_START && hw_irq <=3D priv->info->irq_count) ret =3D rzg2l_irq_set_type(d, type); else if (hw_irq >=3D priv->info->tint_start && hw_irq < priv->info->num_i= rq) ret =3D rzg2l_tint_set_edge(d, type); @@ -500,7 +501,7 @@ static int rzg2l_irqc_alloc(struct irq_domain *domain, = unsigned int virq, * from 16-31 bits. TINT from the pinctrl driver needs to be programmed * in IRQC registers to enable a given gpio pin as interrupt. */ - if (hwirq > IRQC_IRQ_COUNT) { + if (hwirq > priv->info->irq_count) { tint =3D TINT_EXTRACT_GPIOINT(hwirq); hwirq =3D TINT_EXTRACT_HWIRQ(hwirq); =20 @@ -607,8 +608,9 @@ static int rzg2l_irqc_common_probe(struct platform_devi= ce *pdev, struct device_n } =20 static const struct rzg2l_hw_info rzg2l_hw_params =3D { - .tint_start =3D IRQC_IRQ_START + IRQC_IRQ_COUNT, - .num_irq =3D IRQC_IRQ_START + IRQC_IRQ_COUNT + IRQC_TINT_COUNT, + .irq_count =3D 8, + .tint_start =3D IRQC_IRQ_START + 8, + .num_irq =3D IRQC_IRQ_START + 8 + IRQC_TINT_COUNT, }; =20 static int rzg2l_irqc_probe(struct platform_device *pdev, struct device_no= de *parent) --=20 2.43.0