From patchwork Tue Jul 2 11:42:50 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: 13719496 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 3D0A7C3064D for ; Tue, 2 Jul 2024 11:46:33 +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=1OGr1Tqxdwoah9Z8oe4cO3nawWbl6p1cPxDZvzYY6dA=; b=PXQXZZXSnetoM4Lrq1atm6AW0g 1wVsDSL/54pdsCBGZsL/O4cXUf1cRHNq3Q15GmOP93dsr1GcHE2ENhAdXrsUEK1yzt04EUUKnxXRT aCL+MSdq45ZgPf2vwjvV+/oUhlyIBf/fMDsmcfOSHo+xKyMqoF1F+QBVuaoynOZeQHMZrrriiZpCp jmoEnQKuv3xqo0kPvdTkGV6F9bFznwBxIwwHgABnwwj3erPdqaZ8eA1JmZ0HDnflxVfd3GhdiBWJR 2ZrUyxX5dOdoOhoTJAHHvVhnMKl4Q/74Q0Kx2bFwj1GBB/cx0X+DcEIsOcZcpItgcWAtHN4MuneRE yCvsEIgA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sObxm-00000006Xfr-0vyZ; Tue, 02 Jul 2024 11:46:22 +0000 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sObvP-00000006WM3-3c81 for linux-arm-kernel@lists.infradead.org; Tue, 02 Jul 2024 11:43:57 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 622DB61BFD; Tue, 2 Jul 2024 11:43:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E75C6C2BD10; Tue, 2 Jul 2024 11:43:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1719920635; bh=v6GoGtOwD3WuDm4OOSiddHpdB/QWfaKPOZ4tzVEEZkY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DxIKIoR3miAbm8BpY8ZHvmHd8sA6qDaQwBnn8Ccm4ucKdf+J2c4UmXH6hbgyTi7Ej d7L9hJuPneXcr1YBXSthoXrekLLFj7SQzX9cv94SI2gtVFPxFMLFU3zuf5gHUfm648 6CYpWzWcYTbOXrrl4Tg7v+MTQG7RjpkuKOubGZ/e+txaSASy4bnreHlvjALRQRkkVd +m4dc8Yj557epugfaRpJorpqz3Fz6vFjgxPN7rXqZ+6Wnpt7ZZ7P3F6eFwjoLirw7m 5TdW/bNsEFGLwIZEmu3I9e1Vvqy8XpYEk07WW4Wnm7JCY8O4v3HUG492/19QqRestW v7VZe/TWvVVUQ== 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 v2 18/30] irqchip/armada-370-xp: Use FIELD_GET() and named register constant Date: Tue, 2 Jul 2024 13:42:50 +0200 Message-ID: <20240702114302.22475-19-kabel@kernel.org> X-Mailer: git-send-email 2.44.2 In-Reply-To: <20240702114302.22475-1-kabel@kernel.org> References: <20240702114302.22475-1-kabel@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240702_044356_008924_A0E8FADB X-CRM114-Status: GOOD ( 13.36 ) 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 Use FIELD_GET() and named register mask constant when reading the number of supported interrupts / current interrupt. Signed-off-by: Marek Behún --- drivers/irqchip/irq-armada-370-xp.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index 151f0fd0389a..6f71bf08831f 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -10,6 +10,7 @@ * Ben Dooks */ +#include #include #include #include @@ -112,6 +113,7 @@ /* Registers relative to main_int_base */ #define MPIC_INT_CONTROL 0x00 +#define MPIC_INT_CONTROL_NUMINT_MASK GENMASK(12, 2) #define MPIC_SW_TRIG_INT 0x04 #define MPIC_INT_SET_ENABLE 0x30 #define MPIC_INT_CLEAR_ENABLE 0x34 @@ -124,6 +126,7 @@ #define MPIC_IN_DRBEL_MASK 0x0c #define MPIC_PPI_CAUSE 0x10 #define MPIC_CPU_INTACK 0x44 +#define MPIC_CPU_INTACK_IID_MASK GENMASK(9, 0) #define MPIC_INT_SET_MASK 0x48 #define MPIC_INT_CLEAR_MASK 0x4C #define MPIC_INT_FABRIC_MASK 0x54 @@ -676,7 +679,7 @@ static void __exception_irq_entry mpic_handle_irq(struct pt_regs *regs) do { irqstat = readl_relaxed(per_cpu_int_base + MPIC_CPU_INTACK); - irqnr = irqstat & 0x3FF; + irqnr = FIELD_GET(MPIC_CPU_INTACK_IID_MASK, irqstat); if (irqnr > 1022) break; @@ -776,8 +779,7 @@ static int __init mpic_of_init(struct device_node *node, struct device_node *parent) { struct resource main_int_res, per_cpu_int_res; - int nr_irqs; - u32 control; + unsigned int nr_irqs; BUG_ON(of_address_to_resource(node, 0, &main_int_res)); BUG_ON(of_address_to_resource(node, 1, &per_cpu_int_res)); @@ -797,8 +799,8 @@ static int __init mpic_of_init(struct device_node *node, resource_size(&per_cpu_int_res)); BUG_ON(!per_cpu_int_base); - control = readl(main_int_base + MPIC_INT_CONTROL); - nr_irqs = (control >> 2) & 0x3ff; + nr_irqs = FIELD_GET(MPIC_INT_CONTROL_NUMINT_MASK, + readl(main_int_base + MPIC_INT_CONTROL)); for (int i = 0; i < nr_irqs; i++) writel(i, main_int_base + MPIC_INT_CLEAR_ENABLE);