From patchwork Tue Dec 13 14:08:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 32832 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp141371wrn; Tue, 13 Dec 2022 06:10:44 -0800 (PST) X-Google-Smtp-Source: AA0mqf6ibWU05ohz4Vd7jxJlBJJ38CGJ4jcqb6RNyOXCWuKRDv4dyWDDgvYLUhAUEVLYUZLpavkR X-Received: by 2002:a17:903:324c:b0:189:d0fa:231b with SMTP id ji12-20020a170903324c00b00189d0fa231bmr21687838plb.67.1670940644250; Tue, 13 Dec 2022 06:10:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670940644; cv=none; d=google.com; s=arc-20160816; b=KM/cop7MhSUOUaWhHW8aG6KkJsU2/S7Nw/Ve4fxFels8jpuSqwXOcoQTne34DJFJOP Dc3RWdL2+cK/EjkWbNrnRKiYmx1M8mQ3yihxBnVyfProPJb4IY1ZIg18Ao/loNUh1xTC K55dQAWiQTUdO8J75U4hLWyFu9AuWq6ITGtGkkCBROy8pA0ZAaFqzuVDDUHgoX4yJ/xR AmgPhC5lWmnwwc0zx/f8Ik/X1/hJCHHxuDmC+fI1rQPqOm/5TeXG9gvOScbxTU8JznbV FFvhaUMuBTxLNSci6sWlfzvGggUjVGLPAQ2oIm34YqTFBDK50cSJPQ53qyBk/8//h14+ jhKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lTQiiQemAx0BN92ye/wOoqD/l2WuQUEp4RFyO/6MPs8=; b=oi2bhp1BqRS7wt1emwwjj3XHMX0xoAKf2WpNTSv0f8/+VHAZT7JvcLuR6Rzmt0tXwj SYJ/fg1p8TGvUEPZJkbT7CtYejZnnmYWdqWPRdpl535g4Ef831nJxCSjHfw/QbeKLlTu Yc3m1thQppdRV80wb7I3oVZg04Cay0c6szAETRVhS23fSTVxos0BDyzip2o4ZHKtjIpk jBPMgbJeCCft4MWqkMwBXaFgR9fJguSiz7BkiRRnT6RPHEptRwWcoT/y5ounduJzIJ1f j7kYnmK3Duc4grZyhckxJbPt16o84EeNd1lsqyN+MDHGCMoFdiE1CiXOrE8ymQ+mXhvx cbSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OVE3nw4V; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f14-20020a63554e000000b00476cc73fd87si12321265pgm.512.2022.12.13.06.10.29; Tue, 13 Dec 2022 06:10:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OVE3nw4V; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235907AbiLMOJV (ORCPT + 99 others); Tue, 13 Dec 2022 09:09:21 -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 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752108256567746843?= X-GMAIL-MSGID: =?utf-8?q?1752108256567746843?= 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-aic.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 *irqc, struct device_node *no ipi_domain->flags |= IRQ_DOMAIN_FLAG_IPI_SINGLE; irq_domain_update_bus_token(ipi_domain, DOMAIN_BUS_IPI); - base_ipi = __irq_domain_alloc_irqs(ipi_domain, -1, AIC_NR_SWIPI, - NUMA_NO_NODE, NULL, false, NULL); - + base_ipi = 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-armada-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_node *node) return; irq_domain_update_bus_token(ipi_domain, DOMAIN_BUS_IPI); - base_ipi = __irq_domain_alloc_irqs(ipi_domain, -1, IPI_DOORBELL_END, - NUMA_NO_NODE, NULL, false, NULL); + base_ipi = irq_domain_alloc_irqs(ipi_domain, IPI_DOORBELL_END, + NUMA_NO_NODE, NULL); if (WARN_ON(!base_ipi)) return; 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 |= IRQ_DOMAIN_FLAG_IPI_SINGLE; irq_domain_update_bus_token(ipi_domain, DOMAIN_BUS_IPI); - base_ipi = __irq_domain_alloc_irqs(ipi_domain, -1, BITS_PER_MBOX, - NUMA_NO_NODE, NULL, - false, NULL); - + base_ipi = irq_domain_alloc_irqs(ipi_domain, BITS_PER_MBOX, + NUMA_NO_NODE, NULL); if (WARN_ON(!base_ipi)) return; 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); /* Register all 8 non-secure SGIs */ - base_sgi = __irq_domain_alloc_irqs(gic_data.domain, -1, 8, - NUMA_NO_NODE, &sgi_fwspec, - false, NULL); + base_sgi = irq_domain_alloc_irqs(gic_data.domain, 8, NUMA_NO_NODE, + &sgi_fwspec); if (WARN_ON(base_sgi <= 0)) return; 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; - sgi_base = __irq_domain_alloc_irqs(vpe->sgi_domain, -1, 16, - NUMA_NO_NODE, vpe, - false, NULL); + sgi_base = irq_domain_alloc_irqs(vpe->sgi_domain, 16, NUMA_NO_NODE, + vpe); if (sgi_base <= 0) goto err; @@ -176,9 +175,8 @@ int its_alloc_vcpu_irqs(struct its_vm *vm) vm->vpes[i]->idai = true; } - vpe_base_irq = __irq_domain_alloc_irqs(vm->domain, -1, vm->nr_vpes, - NUMA_NO_NODE, vm, - false, NULL); + vpe_base_irq = irq_domain_alloc_irqs(vm->domain, vm->nr_vpes, + NUMA_NO_NODE, vm); if (vpe_base_irq <= 0) goto err; 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); - base_sgi = __irq_domain_alloc_irqs(gic_data[0].domain, -1, 8, - NUMA_NO_NODE, &sgi_fwspec, - false, NULL); + base_sgi = irq_domain_alloc_irqs(gic_data[0].domain, 8, NUMA_NO_NODE, + &sgi_fwspec); if (WARN_ON(base_sgi <= 0)) return; From patchwork Tue Dec 13 14:08:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 32835 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp142239wrn; Tue, 13 Dec 2022 06:11:56 -0800 (PST) X-Google-Smtp-Source: AA0mqf5lu+pMjQtVeXXt1jpsC79d1YfK6kWl8d90ZWSU9CWnuN52GeinPZ3EqFwwUSTRBeR7pbEO X-Received: by 2002:a62:ee14:0:b0:566:900d:6073 with SMTP id e20-20020a62ee14000000b00566900d6073mr19737538pfi.24.1670940716521; Tue, 13 Dec 2022 06:11:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670940716; cv=none; d=google.com; s=arc-20160816; b=eKMhUZTcksZDXnZ1sNjfilCs+5ZYfqKIoI/3SAveMqE2vATsFjrVZvIfflDXOwAtOd hSPdK7Ue9SKw6uniB+13+V1UBI5aFqh4CIhsTSh3LVXJFM8WpCZ/MnVPdg3JsBSRUhbY KyV58d9HrffoubmoDx/8rh4bE3n93biL+0z+lFf9gX1Q+yeuiIxaV6b/AJxKu0crd+wq GdqBx1szh66R4iSABSRCmzhpcL5z+25DjZ+bOwc/eFhJBLFQWYLmWzqnqvllIj441pfc +TGbP4GsQIqKYNHHmL8rVE+b98EExhW5Tf3/xyGOnnkb7wgXzC/z9dJiqfLMVe7MoARx bIbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=RudMhIKPxrv4knDpqasxIh2kLNuaccIdrQzaqIipi4g=; b=DO/7HyjeV4524qcmGB+GR3AvkcAFX6wc8TE13u7zCz0xEn7DI7twHmSCVG/uysyOSm QiNPX67gmJ0DkAzuUjPORbEy8Hp0b+RPqZr1Gg5Z0pXiPMLkzJAWIN+Zq1As73W3l2it COTcngr06PdON7jQoscQWpGASwXEhDR/6cYggxTbldAaT/TuAtr45+AFuU4uUDgSSjcQ sU0va9gcRIncbBbJsJVFgZ7l299JlHLqE+Q0oeHbXdXrl0bv12/dmnylqCUM6YCb4mHi UMxdTfMsLSBVOMcgSQkg3+WxcPc1zX+mxHFOxqCmocgKft8Pq7dFpDekgPZ/Ze5gXzNm OEPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UxWcVgkZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y2-20020aa78f22000000b00574f6921ba2si12063649pfr.207.2022.12.13.06.11.43; Tue, 13 Dec 2022 06:11:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UxWcVgkZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235428AbiLMOJ3 (ORCPT + 99 others); Tue, 13 Dec 2022 09:09:29 -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 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752108332459541337?= X-GMAIL-MSGID: =?utf-8?q?1752108332459541337?= 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_domain *domain, NULL); } +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_domain *domain, return -1; } +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) { } 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 ops->set_desc(&arg, desc); - virq = __irq_domain_alloc_irqs(domain, -1, desc->nvec_used, - dev_to_node(dev), &arg, false, - desc->affinity); + virq = 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);