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 <tglx@linutronix.de>
Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Acked-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20221124230313.454246167@linutronix.de

diff --git a/arch/x86/kernel/apic/msi.c b/arch/x86/kernel/apic/msi.c
index 248a6a5c0ad8a9d970baf3bcc5b9fe2303e49e90..71c87513327e5032c5a639347fe75a9c4ac1a096 100644 (file)
--- 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 a4af7f81661b5e809a48d705392ee24c33fb3205..c42c36947f95fe5f514facf43f63b1ac000310b6 100644 (file)
--- 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 1ce9d5e0bfa3b902b1b5fc424a4c112315d9b682..2d87e000bd45a757f96b5c09a17819b78fbc9b03 100644 (file)
--- 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 4b99f37355d5451328cc18f4896ac4adb0a9bb3c..c37c0be4d6464d0f1bd4b4d4e56d24d50d0eeb95 100644 (file)
--- 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;
        }