From patchwork Mon Dec 5 18:25:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 29875 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2415807wrr; Mon, 5 Dec 2022 10:41:49 -0800 (PST) X-Google-Smtp-Source: AA0mqf7dxers1ErlF6WHlaKzd/FVNEyOQbvr7BaRqCBfo/vXvRpGtwch84BHOBeK8zIMKmpJWy1j X-Received: by 2002:a17:907:1185:b0:7c0:d543:7bd6 with SMTP id uz5-20020a170907118500b007c0d5437bd6mr9717094ejb.237.1670265709283; Mon, 05 Dec 2022 10:41:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670265709; cv=none; d=google.com; s=arc-20160816; b=KZrIpxW/tXDCAfE+OW4ZFOgRfRFxmHICozJ5RZ7LgWgSkZdNFSo4JXVoivgh5+pLkV YYkQhfIYFqQ5WV5vv3lpcQUuHXbd0bddwnxb6WOii44q0Zg45D/jqThdq8zq6xRL+KHD Xnk9crulxc/tsvhC+amg7NYdj1KtqRAXJTLvidQTc8cvQ/Ev1OwtDThBLzcMAWjfdvg1 3tREf5xRUjFf0CaPmIsoEguomQd655nJzqkQXO+R0KxQ3bpeJb1LydvUSK0+6BxqDdf3 P6BFosUocqcpOnnjdPkX324du01/uqqIGKEmkszkVjcTCKjqR5Uyp4OT2ayW8XUZoD+g UCwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=NDH8l4Wxx5e8MUWqcN44DvP8vAxTaA+Dc4mm5fhhLEY=; b=m3KY4f2RSDmivQAaz57TQxFfNVmfd+9AfZGBYVkGih5hY69sFo+5J9Fo2O+sU14vgw hpdQ8oSihy0nL6LhLZ4A8ku6TiTsar1dJ1DSxO84FLXnJ495VQFQEDLQ3vX8ucZqt0R0 YgdJwj4r+xgOPe693S+r9vpArqb9pFPTcpEXsnjZDT3yWbMneK7PURHZBvmerlmYUGWZ gw/dakHD7XstP8VCsBJaPa19G8pXlLqbPqe+8Vzk0icyWXdrua4sYKh5uy0Ry8IM3kCD tqL+6pGJ4hv0wZ4Gj1vo0fjQsJVBTI5OnhtG+gyYwxq6IFwuq7NF8M9oZfv2r6tLTEQ0 bFCQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b="m/25FXv+"; dkim=neutral (no key) header.i=@linutronix.de; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p12-20020a056402074c00b00467238595easi165768edy.369.2022.12.05.10.41.26; Mon, 05 Dec 2022 10:41:49 -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=@linutronix.de header.s=2020 header.b="m/25FXv+"; dkim=neutral (no key) header.i=@linutronix.de; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233587AbiLES3U (ORCPT + 99 others); Mon, 5 Dec 2022 13:29:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232690AbiLESZY (ORCPT ); Mon, 5 Dec 2022 13:25:24 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C320A20BD2; Mon, 5 Dec 2022 10:25:23 -0800 (PST) Date: Mon, 05 Dec 2022 18:25:22 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1670264722; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NDH8l4Wxx5e8MUWqcN44DvP8vAxTaA+Dc4mm5fhhLEY=; b=m/25FXv+6inR7+RYx4EPDyyMKFOd4e1RYjI5JPu6IpBz74I4sDtP3uF6A+FtDQ/VD0dwAV BlVNt0ri44FZWdt+p2jOUT1aaAHL1nRAlV/8crXlG5oNyCzv/29ANyJkV4EWLXIisjGfou F2ZIc3XiU+AWpTorc8YUDIMerm6qqB6oE/b4WmmrJt8nvXGCWWRIwFMk7qbm7AWcPwv9y6 Dd/voTMhXteN5JbBpZseyrPASDx1mlPuiXDnYr8M2ta23dE9HEIQHLBjsdB4QNHy3M1sSk eb43XCZO+l/vgU/GmBPwN4d6sfOOl1sDmSzF4yWcj99AeHVgFj13SUYrW8wlpw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1670264722; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NDH8l4Wxx5e8MUWqcN44DvP8vAxTaA+Dc4mm5fhhLEY=; b=rLvYzlI+lyeha8gHiCAYAYdfCokY4r2uVcDqil2KaAqCCjYg1kplZ7xKeD3WllBaHn3Pcv 4qESTE+QkNu+gDDQ== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/core] genirq/msi: Move IRQ_DOMAIN_MSI_NOMASK_QUIRK to MSI flags Cc: Thomas Gleixner , Jason Gunthorpe , Kevin Tian , Marc Zyngier , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221124230313.454246167@linutronix.de> References: <20221124230313.454246167@linutronix.de> MIME-Version: 1.0 Message-ID: <167026472218.4906.17353441487523538459.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,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?1750421779458002324?= X-GMAIL-MSGID: =?utf-8?q?1751400536662991794?= The following commit has been merged into the irq/core branch of tip: Commit-ID: 3dad5f9ad99b77dfd234d31e2ea3d77f620efc09 Gitweb: https://git.kernel.org/tip/3dad5f9ad99b77dfd234d31e2ea3d77f620efc09 Author: Thomas Gleixner AuthorDate: Fri, 25 Nov 2022 00:24:08 +01:00 Committer: Thomas Gleixner CommitterDate: Mon, 05 Dec 2022 19:20:58 +01:00 genirq/msi: Move IRQ_DOMAIN_MSI_NOMASK_QUIRK to MSI flags It's truly a MSI only flag and for the upcoming per device MSI domains this must be in the MSI flags so it can be set during domain setup without exposing this quirk outside of x86. Signed-off-by: Thomas Gleixner Reviewed-by: Jason Gunthorpe Reviewed-by: Kevin Tian Acked-by: Marc Zyngier Link: https://lore.kernel.org/r/20221124230313.454246167@linutronix.de --- arch/x86/kernel/apic/msi.c | 5 ++--- include/linux/irqdomain.h | 9 +-------- include/linux/msi.h | 6 ++++++ kernel/irq/msi.c | 2 +- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/arch/x86/kernel/apic/msi.c b/arch/x86/kernel/apic/msi.c index 248a6a5..71c8751 100644 --- a/arch/x86/kernel/apic/msi.c +++ b/arch/x86/kernel/apic/msi.c @@ -176,7 +176,8 @@ static struct msi_domain_ops pci_msi_domain_ops = { static struct msi_domain_info pci_msi_domain_info = { .flags = MSI_FLAG_USE_DEF_DOM_OPS | MSI_FLAG_USE_DEF_CHIP_OPS | - MSI_FLAG_PCI_MSIX, + MSI_FLAG_PCI_MSIX | MSI_FLAG_NOMASK_QUIRK, + .ops = &pci_msi_domain_ops, .chip = &pci_msi_controller, .handler = handle_edge_irq, @@ -200,8 +201,6 @@ struct irq_domain * __init native_create_pci_msi_domain(void) if (!d) { irq_domain_free_fwnode(fn); pr_warn("Failed to initialize PCI-MSI irqdomain.\n"); - } else { - d->flags |= IRQ_DOMAIN_MSI_NOMASK_QUIRK; } return d; } diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h index a4af7f8..c42c369 100644 --- a/include/linux/irqdomain.h +++ b/include/linux/irqdomain.h @@ -186,15 +186,8 @@ enum { /* Irq domain implements MSI remapping */ IRQ_DOMAIN_FLAG_MSI_REMAP = (1 << 5), - /* - * Quirk to handle MSI implementations which do not provide - * masking. Currently known to affect x86, but partially - * handled in core code. - */ - IRQ_DOMAIN_MSI_NOMASK_QUIRK = (1 << 6), - /* Irq domain doesn't translate anything */ - IRQ_DOMAIN_FLAG_NO_MAP = (1 << 7), + IRQ_DOMAIN_FLAG_NO_MAP = (1 << 6), /* * Flags starting from IRQ_DOMAIN_FLAG_NONCORE are reserved diff --git a/include/linux/msi.h b/include/linux/msi.h index 1ce9d5e..2d87e00 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -399,6 +399,12 @@ enum { MSI_FLAG_ALLOC_SIMPLE_MSI_DESCS = (1 << 9), /* Free MSI descriptors */ MSI_FLAG_FREE_MSI_DESCS = (1 << 10), + /* + * Quirk to handle MSI implementations which do not provide + * masking. Currently known to affect x86, but has to be partially + * handled in the core MSI code. + */ + MSI_FLAG_NOMASK_QUIRK = (1 << 11), }; int msi_domain_set_affinity(struct irq_data *data, const struct cpumask *mask, diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c index 4b99f37..c37c0be 100644 --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -875,7 +875,7 @@ static int __msi_domain_alloc_irqs(struct irq_domain *domain, struct device *dev * MSI affinity setting requires a special quirk (X86) when * reservation mode is active. */ - if (domain->flags & IRQ_DOMAIN_MSI_NOMASK_QUIRK) + if (info->flags & MSI_FLAG_NOMASK_QUIRK) vflags |= VIRQ_NOMASK_QUIRK; }