From nobody Wed Sep 17 23:46:43 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 D335FC4332F for ; Tue, 13 Dec 2022 14:09:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235855AbiLMOJW (ORCPT ); Tue, 13 Dec 2022 09:09:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36978 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235847AbiLMOIv (ORCPT ); Tue, 13 Dec 2022 09:08:51 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B152B20BF0 for ; Tue, 13 Dec 2022 06:08:42 -0800 (PST) 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 dfw.source.kernel.org (Postfix) with ESMTPS id 464D861547 for ; Tue, 13 Dec 2022 14:08:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 84437C43392; Tue, 13 Dec 2022 14:08:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670940521; bh=5ANoRWrSaLL6qmyIVtv/zuiN4Gcz4H2KBPrL3ePRwww=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OVE3nw4VjjY+BFuP1O+J++Oa7V8+ioOqIXPOvGVBTJsvD65b93f8CDLNWL9+LCBsn 0VJz5Ed4xJ+gmEdF9OjXzRrsYw3JQSsa9ng+1vwpOf/GLuakBwblIz+mJuoeo0LP7G sfgUIf9RhydWdwvJYCTEl6HM1bJNHu8PPFvE9yAE6KHpAnXENKGlFLzqezYbTiiP1/ j4gbYTwGFvVPrFVgfxcvoYhRD4agYlyLqRayxlsqlo5CwEQLoKnbFb0MWl/gIdVVtL xEPGseHaCKK/zniNCEUXUwWXadaR8h8Aq3ZFNZH28Hv9F7iwsWuYi/Cv9JvLmP7Ynf vzpVzEyMQkJSw== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1p55xz-00042L-Eu; Tue, 13 Dec 2022 15:09:07 +0100 From: Johan Hovold To: Thomas Gleixner , Marc Zyngier Cc: Hector Martin , Sven Peter , Alyssa Rosenzweig , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Florian Fainelli , Broadcom internal kernel review list , Ray Jui , Scott Branden , asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, Johan Hovold Subject: [PATCH 1/2] irqchip: Use irq_domain_alloc_irqs() Date: Tue, 13 Dec 2022 15:08:43 +0100 Message-Id: <20221213140844.15470-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221213140844.15470-1-johan+linaro@kernel.org> References: <20221213140844.15470-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" Use the irq_domain_alloc_irqs() wrapper instead of the full __irq_domain_alloc_irqs() interface, which was only intended for some legacy (x86) use cases. Signed-off-by: Johan Hovold --- drivers/irqchip/irq-apple-aic.c | 5 ++--- drivers/irqchip/irq-armada-370-xp.c | 4 ++-- drivers/irqchip/irq-bcm2836.c | 6 ++---- drivers/irqchip/irq-gic-v3.c | 5 ++--- drivers/irqchip/irq-gic-v4.c | 10 ++++------ drivers/irqchip/irq-gic.c | 5 ++--- 6 files changed, 14 insertions(+), 21 deletions(-) diff --git a/drivers/irqchip/irq-apple-aic.c b/drivers/irqchip/irq-apple-ai= c.c index ae3437f03e6c..848ccef03c92 100644 --- a/drivers/irqchip/irq-apple-aic.c +++ b/drivers/irqchip/irq-apple-aic.c @@ -924,9 +924,8 @@ static int __init aic_init_smp(struct aic_irq_chip *irq= c, struct device_node *no ipi_domain->flags |=3D IRQ_DOMAIN_FLAG_IPI_SINGLE; irq_domain_update_bus_token(ipi_domain, DOMAIN_BUS_IPI); =20 - base_ipi =3D __irq_domain_alloc_irqs(ipi_domain, -1, AIC_NR_SWIPI, - NUMA_NO_NODE, NULL, false, NULL); - + base_ipi =3D irq_domain_alloc_irqs(ipi_domain, AIC_NR_SWIPI, NUMA_NO_NODE, + NULL); if (WARN_ON(!base_ipi)) { irq_domain_remove(ipi_domain); return -ENODEV; diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-arma= da-370-xp.c index ee18eb3e72b7..c6f8f5b07ec0 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -454,8 +454,8 @@ static __init void armada_xp_ipi_init(struct device_nod= e *node) return; =20 irq_domain_update_bus_token(ipi_domain, DOMAIN_BUS_IPI); - base_ipi =3D __irq_domain_alloc_irqs(ipi_domain, -1, IPI_DOORBELL_END, - NUMA_NO_NODE, NULL, false, NULL); + base_ipi =3D irq_domain_alloc_irqs(ipi_domain, IPI_DOORBELL_END, + NUMA_NO_NODE, NULL); if (WARN_ON(!base_ipi)) return; =20 diff --git a/drivers/irqchip/irq-bcm2836.c b/drivers/irqchip/irq-bcm2836.c index 51491c3c6fdd..0f49246af16e 100644 --- a/drivers/irqchip/irq-bcm2836.c +++ b/drivers/irqchip/irq-bcm2836.c @@ -268,10 +268,8 @@ static void __init bcm2836_arm_irqchip_smp_init(void) ipi_domain->flags |=3D IRQ_DOMAIN_FLAG_IPI_SINGLE; irq_domain_update_bus_token(ipi_domain, DOMAIN_BUS_IPI); =20 - base_ipi =3D __irq_domain_alloc_irqs(ipi_domain, -1, BITS_PER_MBOX, - NUMA_NO_NODE, NULL, - false, NULL); - + base_ipi =3D irq_domain_alloc_irqs(ipi_domain, BITS_PER_MBOX, + NUMA_NO_NODE, NULL); if (WARN_ON(!base_ipi)) return; =20 diff --git a/drivers/irqchip/irq-gic-v3.c b/drivers/irqchip/irq-gic-v3.c index 997104d4338e..7acf501c9a10 100644 --- a/drivers/irqchip/irq-gic-v3.c +++ b/drivers/irqchip/irq-gic-v3.c @@ -1310,9 +1310,8 @@ static void __init gic_smp_init(void) gic_starting_cpu, NULL); =20 /* Register all 8 non-secure SGIs */ - base_sgi =3D __irq_domain_alloc_irqs(gic_data.domain, -1, 8, - NUMA_NO_NODE, &sgi_fwspec, - false, NULL); + base_sgi =3D irq_domain_alloc_irqs(gic_data.domain, 8, NUMA_NO_NODE, + &sgi_fwspec); if (WARN_ON(base_sgi <=3D 0)) return; =20 diff --git a/drivers/irqchip/irq-gic-v4.c b/drivers/irqchip/irq-gic-v4.c index a6277dea4c7a..7635707c37e5 100644 --- a/drivers/irqchip/irq-gic-v4.c +++ b/drivers/irqchip/irq-gic-v4.c @@ -139,9 +139,8 @@ static int its_alloc_vcpu_sgis(struct its_vpe *vpe, int= idx) if (!vpe->sgi_domain) goto err; =20 - sgi_base =3D __irq_domain_alloc_irqs(vpe->sgi_domain, -1, 16, - NUMA_NO_NODE, vpe, - false, NULL); + sgi_base =3D irq_domain_alloc_irqs(vpe->sgi_domain, 16, NUMA_NO_NODE, + vpe); if (sgi_base <=3D 0) goto err; =20 @@ -176,9 +175,8 @@ int its_alloc_vcpu_irqs(struct its_vm *vm) vm->vpes[i]->idai =3D true; } =20 - vpe_base_irq =3D __irq_domain_alloc_irqs(vm->domain, -1, vm->nr_vpes, - NUMA_NO_NODE, vm, - false, NULL); + vpe_base_irq =3D irq_domain_alloc_irqs(vm->domain, vm->nr_vpes, + NUMA_NO_NODE, vm); if (vpe_base_irq <=3D 0) goto err; =20 diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 210bc2f4d555..c87021f037c9 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -868,9 +868,8 @@ static __init void gic_smp_init(void) "irqchip/arm/gic:starting", gic_starting_cpu, NULL); =20 - base_sgi =3D __irq_domain_alloc_irqs(gic_data[0].domain, -1, 8, - NUMA_NO_NODE, &sgi_fwspec, - false, NULL); + base_sgi =3D irq_domain_alloc_irqs(gic_data[0].domain, 8, NUMA_NO_NODE, + &sgi_fwspec); if (WARN_ON(base_sgi <=3D 0)) return; =20 --=20 2.37.4 From nobody Wed Sep 17 23:46:43 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 A6215C4332F for ; Tue, 13 Dec 2022 14:09:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235912AbiLMOJb (ORCPT ); Tue, 13 Dec 2022 09:09:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235887AbiLMOI4 (ORCPT ); Tue, 13 Dec 2022 09:08:56 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13CF820F42 for ; Tue, 13 Dec 2022 06:08:44 -0800 (PST) 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 C2E4EB811DA for ; Tue, 13 Dec 2022 14:08:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 80A5EC433D2; Tue, 13 Dec 2022 14:08:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1670940521; bh=M2Je/haA40Wu9LCU1PfMEDvXGneFkuJ8iybnSPHk2oI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UxWcVgkZrWmEEJ8Ao51oMyMe+heeIkwUihFgxIgb0XlgHRs/hGIVJLR2uV9H8XQDz 6UqQMpJIgarzttGleoBAESwIMUpxmpUdiwD6CYSZA0XgMAM5o6AWnP5zwY9HrrcaAG wWstqE9uA1p3UZGVG5jzl3t3kDy4xsUkllpUnKSmYQFxKeFhogvbNQruMP5TqX9dd6 DJ8nI6WYU66GdYR24n4yaKBP8bEbuEA2eYhAgLxujnmsKl++3Cg/hIop0ZBS75cQKC dHxcoyVPrNAaQXGTYvnLo3raoDCUFQcRVlcCWWPfv3fSuw8xHje3l4aQTt7G8mxAmJ TlgBjeRHXMwaQ== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1p55xz-00042N-Hl; Tue, 13 Dec 2022 15:09:07 +0100 From: Johan Hovold To: Thomas Gleixner , Marc Zyngier Cc: Hector Martin , Sven Peter , Alyssa Rosenzweig , Andrew Lunn , Gregory Clement , Sebastian Hesselbarth , Florian Fainelli , Broadcom internal kernel review list , Ray Jui , Scott Branden , asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, Johan Hovold Subject: [PATCH 2/2] genirq/irqdomain/msi: Add irq_domain_alloc_irqs_affinity() wrapper Date: Tue, 13 Dec 2022 15:08:44 +0100 Message-Id: <20221213140844.15470-3-johan+linaro@kernel.org> X-Mailer: git-send-email 2.37.4 In-Reply-To: <20221213140844.15470-1-johan+linaro@kernel.org> References: <20221213140844.15470-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" The full __irq_domain_alloc_irqs() interface was initially only intended for some legacy (x86) use cases while most callers should use the irq_domain_alloc_irqs() wrapper. Add a matching irq_domain_alloc_irqs_affinity() wrapper that can be used when an affinity hint needs to be provided and use it for MSI allocations. Signed-off-by: Johan Hovold --- include/linux/irqdomain.h | 15 +++++++++++++++ kernel/irq/msi.c | 6 +++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h index cad47737a052..b1b06d75d31a 100644 --- a/include/linux/irqdomain.h +++ b/include/linux/irqdomain.h @@ -507,6 +507,14 @@ static inline int irq_domain_alloc_irqs(struct irq_dom= ain *domain, NULL); } =20 +static inline int irq_domain_alloc_irqs_affinity(struct irq_domain *domain, + unsigned int nr_irqs, int node, void *arg, + const struct irq_affinity_desc *affinity) +{ + return __irq_domain_alloc_irqs(domain, -1, nr_irqs, node, arg, false, + affinity); +} + extern int irq_domain_alloc_irqs_hierarchy(struct irq_domain *domain, unsigned int irq_base, unsigned int nr_irqs, void *arg); @@ -585,6 +593,13 @@ static inline int irq_domain_alloc_irqs(struct irq_dom= ain *domain, return -1; } =20 +static inline int irq_domain_alloc_irqs_affinity(struct irq_domain *domain, + unsigned int nr_irqs, int node, void *arg, + const struct irq_affinity_desc *affinity) +{ + return -1; +} + static inline void irq_domain_free_irqs(unsigned int virq, unsigned int nr_irqs) { } =20 diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c index bd4d4dd626b4..01f7f3c8d77a 100644 --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -1272,9 +1272,9 @@ static int __msi_domain_alloc_irqs(struct device *dev= , struct irq_domain *domain =20 ops->set_desc(&arg, desc); =20 - virq =3D __irq_domain_alloc_irqs(domain, -1, desc->nvec_used, - dev_to_node(dev), &arg, false, - desc->affinity); + virq =3D irq_domain_alloc_irqs_affinity(domain, desc->nvec_used, + dev_to_node(dev), &arg, + desc->affinity); if (virq < 0) return msi_handle_pci_fail(domain, desc, allocated); =20 --=20 2.37.4