From patchwork Fri Jun 28 12:23:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 13716046 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 C6C29C3064D for ; Fri, 28 Jun 2024 12:23:57 +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: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=/Z6oT8Z3Yd9tV/5YC8jxEDCEgA4hoGhwVtN4ggLuNxM=; b=BXa7PifDD50uBQhipcdpB5aTJB FxQ2bVHQfnqw4g6ZR+sb+2Pr4r3WUmSaCI1nGgNsodiefD+xM4SNr8GI9GfTWL2DpUCVyzmU22R3i GHiJ0uthOMH4bS8Djpaj0X0sUDyIC8DaFihNFrHPXGU+M3AKjvI3LxehLQSloQHsxJIbmGRktQ9Yt Zny+/+RWInDcc831RpwuBxNmhKR36SXzDzqpWXqM/6bDqjcyMXfDKmOGTADwrIbHpY6UXExtghADe MnO+gh40+FUaZbRMMk2YMoFjxWS3rLwv9/JcQM0lH0VNkU2eEV7TQYWRFzJW+n0yN9kmfocHuAbw5 r8T1fMWg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNAdn-0000000DfkJ-16Ac; Fri, 28 Jun 2024 12:23:47 +0000 Received: from laurent.telenet-ops.be ([2a02:1800:110:4::f00:19]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sNAdd-0000000Dfio-0o0i for linux-arm-kernel@lists.infradead.org; Fri, 28 Jun 2024 12:23:39 +0000 Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed80:acf4:1256:ab55:12e6]) by laurent.telenet-ops.be with bizsmtp id h0PX2C0025ECAAU010PXHm; Fri, 28 Jun 2024 14:23:31 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1sNAdQ-000VEZ-W0; Fri, 28 Jun 2024 14:23:30 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1sNAdW-00Bkeh-Qv; Fri, 28 Jun 2024 14:23:30 +0200 From: Geert Uytterhoeven To: Marc Zyngier , Thomas Gleixner Cc: linux-arm-kernel@lists.infradead.org, linux-renesas-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH] irqchip/gic-v3: Pass GICV index to gic_of_setup_kvm_info() Date: Fri, 28 Jun 2024 14:23:29 +0200 Message-Id: <2eb7c6e9c142f08cbe34bc6f423778f389ac67f4.1719577252.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240628_052337_388395_DDF44155 X-CRM114-Status: GOOD ( 12.26 ) 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 The caller of gic_of_setup_kvm_info() already queried DT for the value of the #redistributor-regions property. So just calculate and pass the GICV index, instead of doing the DT look-up again in the callee. Signed-off-by: Geert Uytterhoeven Acked-by: Marc Zyngier --- drivers/irqchip/irq-gic-v3.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 1f70262742f3b7c7..9c03b63277ba5b2b 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -2185,11 +2185,10 @@ static void __init gic_populate_ppi_partitions(struct device_node *gic_node) of_node_put(parts_node); } -static void __init gic_of_setup_kvm_info(struct device_node *node) +static void __init gic_of_setup_kvm_info(struct device_node *node, u32 gicv_idx) { int ret; struct resource r; - u32 gicv_idx; gic_v3_kvm_info.type = GIC_V3; @@ -2197,11 +2196,6 @@ static void __init gic_of_setup_kvm_info(struct device_node *node) if (!gic_v3_kvm_info.maint_irq) return; - if (of_property_read_u32(node, "#redistributor-regions", - &gicv_idx)) - gicv_idx = 1; - - gicv_idx += 3; /* Also skip GICD, GICC, GICH */ ret = of_address_to_resource(node, gicv_idx, &r); if (!ret) gic_v3_kvm_info.vcpu = r; @@ -2292,7 +2286,7 @@ static int __init gic_of_init(struct device_node *node, struct device_node *pare gic_populate_ppi_partitions(node); if (static_branch_likely(&supports_deactivate_key)) - gic_of_setup_kvm_info(node); + gic_of_setup_kvm_info(node, nr_redist_regions + 3); return 0; out_unmap_rdist: