From nobody Thu Apr 2 01:49:51 2026 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (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 7DE803FB072 for ; Wed, 25 Mar 2026 19:25:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774466708; cv=none; b=CnoY32qe1Dyi73aHhOo7aByGCHliIpsOWR2u8Szr/cbl2JZgNK5v6v9eDXWyDukouxhh7RDziV5urNknQwS5nZhg6GnsnUb0XcgNgREkwtWVcHaMIgDbIQzhHJb8ylKQYe4XXU+bA44A2BHiZEv5jNYiikFA08pTwBFM2ZGtmJ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774466708; c=relaxed/simple; bh=/VSMuWN9Mwsz4XXd5ynJfI8giPIJmU4aZ2YqAwnZRmU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FP/SZttXBjWxiP9YhnFQZ+fTZDth8YslWfhl/NwSLICAq/fZKUF2UjqBt7L5+5+ylBieCdbD3wI5mPooBaxwHL0tAvAfogtptc6n/1fkHI+EF5HVyQWZqqmXsAgKRADG0DOqou7NJJMgTCk9k1Ugq10txdd1/KvClAQaTVKR1T0= 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=Cpi9cEhR; arc=none smtp.client-ip=209.85.221.50 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="Cpi9cEhR" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-439bcec8613so115929f8f.3 for ; Wed, 25 Mar 2026 12:25:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1774466705; x=1775071505; 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=ECSVs8rxLOBS5HhR0ryQNWfNFa3hfvRotJ0eLhtmy8I=; b=Cpi9cEhR43VoCe0ZcMpE2Do1coLdkkXAGY/9KIEOLkdM7F1krnhfD7sCa+q/PGS9lZ rhxKOxHkpedApfil/Kvyx0A/AkhI5NF4x03ZdPxWJcBnu7y1C8E6ECN5T/ebpSUzoe5o pSH8dP1X/O30hSCqgupRR83hVnvKgC5EP8KTz7qrrBQj3cUk9hTU2SSWN0J75nrlep9e uBc77ZQf0Cvu6pKdM+rFBoZJ6YkyMFMAMjoekPvpn7g/QJnM3ztP5RLeRA7praQuPzhI ci1r9U4aXS6yLCRniuBh75QgdVP/5TvwCvcrNrrNJ9dg8DcnDqTB12hRAKKklT2gnzMx JZsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774466705; x=1775071505; 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=ECSVs8rxLOBS5HhR0ryQNWfNFa3hfvRotJ0eLhtmy8I=; b=R8EEBeo3QwiZEVuIWACf55PlAHFD01efWrP89Uyjjtvh/C1TBIICStQEIlfRxTfI33 3XWpJeV5ms+NIpsxjyoim219NuU4Fxd6lJmD/L7wv8J9QA5pjbN7POEq7mGG2LvzF6Js AWci7O7LwfVU/O7A5g4RWs0FbYVzUzMjR0iaq3Yv3zZT2XnMVZS5IPDxNfEw55T36GV1 6CxSGmWpvzUT3ZXY2wCb17QGgl789jlc7ZtxVKJFNQeWFEPbsUpor8b//xWB4KoZqJ8/ s74PYNa/B37KfJb5MoB56wZAKkBARpyoY+Kkdm63f2Cl+/bB6fSA8QpoiicVRxp3RUcH 9T4w== X-Forwarded-Encrypted: i=1; AJvYcCVbZmS87pkQh4bEOIqlE8FFM/Y4o0YaohC7OTo1leMpZSZ1NuDYyyxyiX8L5d52RIjifPtBLdqMoT4XmC4=@vger.kernel.org X-Gm-Message-State: AOJu0YzMB2RnFnyd3cqliHXf6zByhF/GioH+S5w+2kAA/kuDkBI9W0nG h+Gkf677GDu+AjQEBlxztIpA+KjN3kElK4eo1lXudf8MXKmvnqCdhZoW X-Gm-Gg: ATEYQzzxd8ejvZ9OFv/Tpn0V9vztU7T6fwrtfT67MDtIlnHyK5w+zHbnRoNb72N13/g 5lNhsAJ5Lwj0Ks01fU2KXR8oJ02VJpPhFBrBGds1L0K987NrAITBxHdhz+XI7+lFz9gf7nXQFiw xzkGnmHNPa/UiiCVMaCqGGpp1ThgUiBypQCLF5Va+j1vkj24HU0KkpVlcOke/IwlvijyvCxSXJZ qM7eeaXogKPrHImumrFvK8NLUHh2s08hTjNE2LCSyOfh2iXxNKV7FLxG4m5FqJCZHgPtBH9u6Tv Lc6ykoGMie8itGcxG4ySvND0O9sKs2JKovVrjD/Lj9P/XQ5JKHOIO7AaTL/XHC4bPiwAeB7U0UK SJ6gLBstbjl1BPmwNQzenTD075DTfa4Jhjb0FDEFXoidj0x6PN7NSfMwcCZFZxEV+X77LArI68U gar1iNM50+UNipl3bYR6hgQDkMHGjmINyJCj7wk87aVeKb2keT X-Received: by 2002:a05:600c:3b16:b0:487:12c:e7e1 with SMTP id 5b1f17b1804b1-48715fcfb24mr67295285e9.11.1774466704754; Wed, 25 Mar 2026 12:25:04 -0700 (PDT) Received: from localhost.localdomain ([2a00:23c4:a758:8a01:8138:17e4:88b1:468c]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b9192e533sm2464485f8f.2.2026.03.25.12.25.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Mar 2026 12:25:04 -0700 (PDT) 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 v7 12/16] irqchip/renesas-rzg2l: Drop IRQC_NUM_IRQ macro Date: Wed, 25 Mar 2026 19:24:27 +0000 Message-ID: <20260325192451.172562-13-biju.das.jz@bp.renesas.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260325192451.172562-1-biju.das.jz@bp.renesas.com> References: <20260325192451.172562-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 interrupts in RZ/G2L and RZ/G3L SoC are different. Introduce struct rzg2l_hw_info to handle the hardware differences and replace the macro IRQC_NUM_IRQ with num_irq variable in struct rzg2l_hw_info. Signed-off-by: Biju Das --- v6->v7: * No change. v5->v6: * No change. v4->v5: * Dropped the hw_irq range check involving info.num_irq v3->v4: * Updated commit description IRQs->interrupts * Replaced the variable type for num_irq in struct rzg2l_hw_info from u8->unsigned int * Replaced the pointer variable info from irqc_priv and instead embed a struct hwinfo into irqc_priv and copy the data into it at probe time. * Replaced the check 'hwirq > (priv->info->num_irq - 1)' with hwirq >=3D priv->info.num_irq v2->v3: * No change v1->v2: * No change --- drivers/irqchip/irq-renesas-rzg2l.c | 34 ++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/drivers/irqchip/irq-renesas-rzg2l.c b/drivers/irqchip/irq-rene= sas-rzg2l.c index 9fc90f894630..2b7a70bdcba1 100644 --- a/drivers/irqchip/irq-renesas-rzg2l.c +++ b/drivers/irqchip/irq-renesas-rzg2l.c @@ -24,7 +24,6 @@ #define IRQC_IRQ_COUNT 8 #define IRQC_TINT_START (IRQC_IRQ_START + IRQC_IRQ_COUNT) #define IRQC_TINT_COUNT 32 -#define IRQC_NUM_IRQ (IRQC_TINT_START + IRQC_TINT_COUNT) =20 #define ISCR 0x10 #define IITSR 0x14 @@ -68,6 +67,14 @@ struct rzg2l_irqc_reg_cache { u32 titsr[2]; }; =20 +/** + * struct rzg2l_hw_info - Interrupt Control Unit controller hardware info = structure. + * @num_irq: Total Number of interrupts + */ +struct rzg2l_hw_info { + unsigned int num_irq; +}; + /** * struct rzg2l_irqc_priv - IRQ controller private data structure * @base: Controller's base address @@ -75,6 +82,7 @@ struct rzg2l_irqc_reg_cache { * @tint_chip: Pointer to struct irq_chip for tint * @fwspec: IRQ firmware specific data * @lock: Lock to serialize access to hardware registers + * @info: Hardware specific data * @cache: Registers cache for suspend/resume */ static struct rzg2l_irqc_priv { @@ -83,6 +91,7 @@ static struct rzg2l_irqc_priv { const struct irq_chip *tint_chip; struct irq_fwspec *fwspec; raw_spinlock_t lock; + struct rzg2l_hw_info info; struct rzg2l_irqc_reg_cache cache; } *rzg2l_irqc_data; =20 @@ -573,7 +582,7 @@ static int rzg2l_irqc_alloc(struct irq_domain *domain, = unsigned int virq, chip =3D priv->irq_chip; } =20 - if (hwirq > (IRQC_NUM_IRQ - 1)) + if (hwirq >=3D priv->info.num_irq) return -EINVAL; =20 ret =3D irq_domain_set_hwirq_and_chip(domain, virq, hwirq, chip, (void *)= (uintptr_t)tint); @@ -596,7 +605,7 @@ static int rzg2l_irqc_parse_interrupts(struct rzg2l_irq= c_priv *priv, unsigned int i; int ret; =20 - for (i =3D 0; i < IRQC_NUM_IRQ; i++) { + for (i =3D 0; i < priv->info.num_irq; i++) { ret =3D of_irq_parse_one(np, i, &map); if (ret) return ret; @@ -609,7 +618,8 @@ static int rzg2l_irqc_parse_interrupts(struct rzg2l_irq= c_priv *priv, =20 static int rzg2l_irqc_common_probe(struct platform_device *pdev, struct de= vice_node *parent, const struct irq_chip *irq_chip, - const struct irq_chip *tint_chip) + const struct irq_chip *tint_chip, + const struct rzg2l_hw_info info) { struct irq_domain *irq_domain, *parent_domain; struct device_node *node =3D pdev->dev.of_node; @@ -632,7 +642,9 @@ static int rzg2l_irqc_common_probe(struct platform_devi= ce *pdev, struct device_n if (IS_ERR(rzg2l_irqc_data->base)) return PTR_ERR(rzg2l_irqc_data->base); =20 - rzg2l_irqc_data->fwspec =3D devm_kcalloc(&pdev->dev, IRQC_NUM_IRQ, + rzg2l_irqc_data->info =3D info; + + rzg2l_irqc_data->fwspec =3D devm_kcalloc(&pdev->dev, info.num_irq, sizeof(*rzg2l_irqc_data->fwspec), GFP_KERNEL); if (!rzg2l_irqc_data->fwspec) return -ENOMEM; @@ -657,7 +669,7 @@ static int rzg2l_irqc_common_probe(struct platform_devi= ce *pdev, struct device_n =20 raw_spin_lock_init(&rzg2l_irqc_data->lock); =20 - irq_domain =3D irq_domain_create_hierarchy(parent_domain, 0, IRQC_NUM_IRQ= , dev_fwnode(dev), + irq_domain =3D irq_domain_create_hierarchy(parent_domain, 0, info.num_irq= , dev_fwnode(dev), &rzg2l_irqc_domain_ops, rzg2l_irqc_data); if (!irq_domain) { pm_runtime_put_sync(dev); @@ -669,14 +681,20 @@ static int rzg2l_irqc_common_probe(struct platform_de= vice *pdev, struct device_n return 0; } =20 +static const struct rzg2l_hw_info rzg2l_hw_params =3D { + .num_irq =3D IRQC_IRQ_START + IRQC_IRQ_COUNT + IRQC_TINT_COUNT, +}; + static int rzg2l_irqc_probe(struct platform_device *pdev, struct device_no= de *parent) { - return rzg2l_irqc_common_probe(pdev, parent, &rzg2l_irqc_irq_chip, &rzg2l= _irqc_tint_chip); + return rzg2l_irqc_common_probe(pdev, parent, &rzg2l_irqc_irq_chip, &rzg2l= _irqc_tint_chip, + rzg2l_hw_params); } =20 static int rzfive_irqc_probe(struct platform_device *pdev, struct device_n= ode *parent) { - return rzg2l_irqc_common_probe(pdev, parent, &rzfive_irqc_irq_chip, &rzfi= ve_irqc_tint_chip); + return rzg2l_irqc_common_probe(pdev, parent, &rzfive_irqc_irq_chip, &rzfi= ve_irqc_tint_chip, + rzg2l_hw_params); } =20 IRQCHIP_PLATFORM_DRIVER_BEGIN(rzg2l_irqc) --=20 2.43.0