From nobody Fri Sep 12 06:19:10 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9EB6EC0502C for ; Thu, 1 Sep 2022 14:29:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234814AbiIAO2m (ORCPT ); Thu, 1 Sep 2022 10:28:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36204 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234564AbiIAO2Z (ORCPT ); Thu, 1 Sep 2022 10:28:25 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 76CD25A2D3 for ; Thu, 1 Sep 2022 07:28:24 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id EA46EB826FD for ; Thu, 1 Sep 2022 14:28:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8130DC433B5; Thu, 1 Sep 2022 14:28:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1662042501; bh=LnBC3fB2mOYhP4NE61cF3t75q8/+srAg40Zl2RdR5/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BNaD/QCLRTi4LB8IXBn+4/5amiei1i/oUyQUJ6WLvMtSWxfFNzmc/uaT1VvmzjEVQ mHn/2EY8np9F9fkh0xpvgl4wXgV7X5laTqCblYVu42WdNbh7XDntxS4WxSK5PoXW7h vLugoSETaF2L8zmBwhRvVFER4nKRZGeEEH5H4gqmE+vOEhJ7Dop3z8k821PUE9Qh+l +TlFmChYrd99yRfRW7a4EJoLYe1vWDyiO+Ahg3G5DG0zN6foYg56r0scM0Fk8JaSd0 lPywSLc0WlbGVPRn3UrZSQwuUcSj919ypJkPbDCF10tTu9NhkM7t/odPUyhwf6Qx2P XprM/kH4tJ2eA== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1oTlB8-0003Zo-Sl; Thu, 01 Sep 2022 16:28:22 +0200 From: Johan Hovold To: Marc Zyngier Cc: Thomas Gleixner , Greg Kroah-Hartman , Rob Herring , linux-kernel@vger.kernel.org, Johan Hovold Subject: [PATCH v2 1/4] irqdomain: Look for existing mapping only once Date: Thu, 1 Sep 2022 16:28:13 +0200 Message-Id: <20220901142816.13731-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220901142816.13731-1-johan+linaro@kernel.org> References: <20220901142816.13731-1-johan+linaro@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Avoid looking for an existing mapping twice when creating a new mapping using irq_create_fwspec_mapping() by factoring out the actual allocation which is shared with irq_create_mapping_affinity(). Signed-off-by: Johan Hovold --- kernel/irq/irqdomain.c | 60 +++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 8fe1da9614ee..24ddd8d9b597 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -668,6 +668,34 @@ unsigned int irq_create_direct_mapping(struct irq_doma= in *domain) EXPORT_SYMBOL_GPL(irq_create_direct_mapping); #endif =20 +static unsigned int __irq_create_mapping_affinity(struct irq_domain *domai= n, + irq_hw_number_t hwirq, + const struct irq_affinity_desc *affinity) +{ + struct device_node *of_node =3D irq_domain_get_of_node(domain); + int virq; + + pr_debug("irq_create_mapping(0x%p, 0x%lx)\n", domain, hwirq); + + /* Allocate a virtual interrupt number */ + virq =3D irq_domain_alloc_descs(-1, 1, hwirq, of_node_to_nid(of_node), + affinity); + if (virq <=3D 0) { + pr_debug("-> virq allocation failed\n"); + return 0; + } + + if (irq_domain_associate(domain, virq, hwirq)) { + irq_free_desc(virq); + return 0; + } + + pr_debug("irq %lu on domain %s mapped to virtual irq %u\n", + hwirq, of_node_full_name(of_node), virq); + + return virq; +} + /** * irq_create_mapping_affinity() - Map a hardware interrupt into linux irq= space * @domain: domain owning this hardware interrupt or NULL for default doma= in @@ -680,14 +708,11 @@ EXPORT_SYMBOL_GPL(irq_create_direct_mapping); * on the number returned from that call. */ unsigned int irq_create_mapping_affinity(struct irq_domain *domain, - irq_hw_number_t hwirq, - const struct irq_affinity_desc *affinity) + irq_hw_number_t hwirq, + const struct irq_affinity_desc *affinity) { - struct device_node *of_node; int virq; =20 - pr_debug("irq_create_mapping(0x%p, 0x%lx)\n", domain, hwirq); - /* Look for default domain if necessary */ if (domain =3D=3D NULL) domain =3D irq_default_domain; @@ -695,34 +720,15 @@ unsigned int irq_create_mapping_affinity(struct irq_d= omain *domain, WARN(1, "%s(, %lx) called with NULL domain\n", __func__, hwirq); return 0; } - pr_debug("-> using domain @%p\n", domain); - - of_node =3D irq_domain_get_of_node(domain); =20 /* Check if mapping already exists */ virq =3D irq_find_mapping(domain, hwirq); if (virq) { - pr_debug("-> existing mapping on virq %d\n", virq); + pr_debug("existing mapping on virq %d\n", virq); return virq; } =20 - /* Allocate a virtual interrupt number */ - virq =3D irq_domain_alloc_descs(-1, 1, hwirq, of_node_to_nid(of_node), - affinity); - if (virq <=3D 0) { - pr_debug("-> virq allocation failed\n"); - return 0; - } - - if (irq_domain_associate(domain, virq, hwirq)) { - irq_free_desc(virq); - return 0; - } - - pr_debug("irq %lu on domain %s mapped to virtual irq %u\n", - hwirq, of_node_full_name(of_node), virq); - - return virq; + return __irq_create_mapping_affinity(domain, hwirq, affinity); } EXPORT_SYMBOL_GPL(irq_create_mapping_affinity); =20 @@ -827,7 +833,7 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspe= c *fwspec) return 0; } else { /* Create mapping */ - virq =3D irq_create_mapping(domain, hwirq); + virq =3D __irq_create_mapping_affinity(domain, hwirq, NULL); if (!virq) return virq; } --=20 2.35.1