From patchwork Mon Jul 1 17:02:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Marek_Beh=C3=BAn?= X-Patchwork-Id: 13718462 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 75845C3065A for ; Mon, 1 Jul 2024 17:06:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc: To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=f8LlXi77vlBL5zN5jfr9yeC5QDtEseAId/pbahB1PRM=; b=oTqjSETwQyEifDxvGSTr/2V0Pj AJP1/rjVEmLLbbIEI6XtWzo8zP0+aG4V5NbNp4QaAfb0jDCk+tjT6PIiqMhFsaxSMcVK/5LyNUKRT kHF6lkl9ywSEtnPkzF4XWgyH36tGjp8yFgWfhsQC7ISX5bDlyUa7wXGPAhew/O2rKD+rvD0r1EGm8 89gDf1T5NbJ9BoclK7AA9LxxfUYCC4mP6I8i6A55ILwNNgxaZMoOo9sWgjidN/8/rRJuP3sdGDY/p 4sr+Lt1uOTyd5ylGQGrESf9Xatpevi0Y3NDgTHB4vSWfVGBLazWi7FzES6S2UHUzymF3IKaWn0P1Z wTEVoTUg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOKTV-00000004Elm-0DtP; Mon, 01 Jul 2024 17:05:57 +0000 Received: from sin.source.kernel.org ([145.40.73.55]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sOKRQ-00000004Dg8-3M72 for linux-arm-kernel@lists.infradead.org; Mon, 01 Jul 2024 17:03:51 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id C2D44CE167C; Mon, 1 Jul 2024 17:03:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 55733C4AF10; Mon, 1 Jul 2024 17:03:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719853424; bh=y4aG50d34t73JgTHLP+B6ZsHpqATv4hjgJq6JhZ04Eo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Qi5/wakPsrjTaTYOfZsimfqlboyEwdx6p8sLbqrejpKWZJYIPpQDi8VsXOaSthqIq EhgWfFU0XP7Rl55UnlCPk7yK9VS0hTkgXUr95xgcrQNB1UDX2gNgosOI5ihlyzh/7a t2n3tzuBbzIvlubYNIDzYhbmaM99oMmEKILj9tPZpaTcP8jUmnblQQTJfT/xb9EHHa a17tROOtYgj93RRHstKWD9nk97ytXYUt71JCFa+cgaBfIMO5EfXhDbN5V/8Cdy3bdU f40+TLGH5kOVh07v2jurJZkWhbflEPbArZV+ouQUHWIsjpRci43ag7iyGVUJYA06Bc jwserLHdiTSpA== From: =?utf-8?q?Marek_Beh=C3=BAn?= To: Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, arm@kernel.org, Andy Shevchenko , Hans de Goede , =?utf-8?q?Ilpo_J=C3=A4rvinen?= Cc: =?utf-8?q?Marek_Beh=C3=BAn?= Subject: [PATCH 19/25] irqchip/armada-370-xp: Use unsigned int / irq_hw_number_t when iterating Date: Mon, 1 Jul 2024 19:02:43 +0200 Message-ID: <20240701170249.8128-20-kabel@kernel.org> X-Mailer: git-send-email 2.44.2 In-Reply-To: <20240701170249.8128-1-kabel@kernel.org> References: <20240701170249.8128-1-kabel@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240701_100349_616059_1AB1956D X-CRM114-Status: GOOD ( 15.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When iterating, use either irq_hw_number_t or unsigned int type for the iterator, depending on whether the variable is HW IRQ number or added to a HW IRQ number. Signed-off-by: Marek Behún Reviewed-by: Andrew Lunn --- drivers/irqchip/irq-armada-370-xp.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index d21216515fc2..f773d88ead73 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -289,7 +289,7 @@ static int mpic_msi_alloc(struct irq_domain *domain, unsigned int virq, if (hwirq < 0) return -ENOSPC; - for (int i = 0; i < nr_irqs; i++) { + for (unsigned int i = 0; i < nr_irqs; i++) { irq_domain_set_info(domain, virq + i, hwirq + i, &mpic_msi_bottom_irq_chip, domain->host_data, handle_simple_irq, @@ -438,7 +438,7 @@ static struct irq_chip mpic_ipi_irqchip = { static int mpic_ipi_alloc(struct irq_domain *d, unsigned int virq, unsigned int nr_irqs, void *args) { - for (int i = 0; i < nr_irqs; i++) { + for (unsigned int i = 0; i < nr_irqs; i++) { irq_set_percpu_devid(virq + i); irq_domain_set_info(d, virq + i, i, &mpic_ipi_irqchip, d->host_data, handle_percpu_devid_irq, @@ -461,7 +461,7 @@ static const struct irq_domain_ops mpic_ipi_domain_ops = { static void mpic_ipi_resume(void) { - for (int i = 0; i < IPI_DOORBELL_END; i++) { + for (irq_hw_number_t i = 0; i < IPI_DOORBELL_END; i++) { unsigned int virq = irq_find_mapping(mpic_ipi_domain, i); if (!virq || !irq_percpu_is_enabled(virq)) @@ -509,7 +509,7 @@ static int mpic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, static void mpic_smp_cpu_init(void) { - for (int i = 0; i < mpic_domain->hwirq_max; i++) + for (irq_hw_number_t i = 0; i < mpic_domain->hwirq_max; i++) writel(i, per_cpu_int_base + MPIC_INT_SET_MASK); if (!mpic_is_ipi_available()) @@ -628,7 +628,8 @@ static void mpic_handle_msi_irq(struct pt_regs *r, bool b) {} static void mpic_handle_cascade_irq(struct irq_desc *desc) { struct irq_chip *chip = irq_desc_get_chip(desc); - unsigned long irqmap, irqn, irqsrc, cpuid; + unsigned long irqmap, irqsrc, cpuid; + irq_hw_number_t irqn; chained_irq_enter(chip, desc); @@ -657,7 +658,8 @@ static void mpic_handle_cascade_irq(struct irq_desc *desc) static void __exception_irq_entry mpic_handle_irq(struct pt_regs *regs) { - u32 irqstat, irqnr; + irq_hw_number_t irqnr; + u32 irqstat; do { irqstat = readl_relaxed(per_cpu_int_base + MPIC_CPU_INTACK); @@ -679,7 +681,7 @@ static void __exception_irq_entry mpic_handle_irq(struct pt_regs *regs) /* IPI Handling */ if (irqnr == 0) { unsigned long ipimask; - int ipi; + irq_hw_number_t ipi; ipimask = readl_relaxed(per_cpu_int_base + MPIC_IN_DRBEL_CAUSE) & @@ -784,7 +786,7 @@ static int __init mpic_of_init(struct device_node *node, nr_irqs = FIELD_GET(MPIC_INT_CONTROL_NUMINT_MASK, readl(main_int_base + MPIC_INT_CONTROL)); - for (int i = 0; i < nr_irqs; i++) + for (irq_hw_number_t i = 0; i < nr_irqs; i++) writel(i, main_int_base + MPIC_INT_CLEAR_ENABLE); mpic_domain = irq_domain_add_linear(node, nr_irqs, &mpic_irq_ops, NULL);