genirq/generic_chip: Make irq_remove_generic_chip() irqdomain aware

[platform/kernel/linux-starfive.git] / kernel / irq / msi.c

diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
index b4c31a5..79b4a58 100644 (file)
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -1204,7 +1204,6 @@ static int msi_handle_pci_fail(struct irq_domain *domain, struct msi_desc *desc,
 
 #define VIRQ_CAN_RESERVE       0x01
 #define VIRQ_ACTIVATE          0x02
-#define VIRQ_NOMASK_QUIRK      0x04
 
 static int msi_init_virq(struct irq_domain *domain, int virq, unsigned int vflags)
 {
@@ -1213,8 +1212,6 @@ static int msi_init_virq(struct irq_domain *domain, int virq, unsigned int vflag
 
        if (!(vflags & VIRQ_CAN_RESERVE)) {
                irqd_clr_can_reserve(irqd);
-               if (vflags & VIRQ_NOMASK_QUIRK)
-                       irqd_set_msi_nomask_quirk(irqd);
 
                /*
                 * If the interrupt is managed but no CPU is available to
@@ -1275,15 +1272,8 @@ static int __msi_domain_alloc_irqs(struct device *dev, struct irq_domain *domain
         * Interrupt can use a reserved vector and will not occupy
         * a real device vector until the interrupt is requested.
         */
-       if (msi_check_reservation_mode(domain, info, dev)) {
+       if (msi_check_reservation_mode(domain, info, dev))
                vflags |= VIRQ_CAN_RESERVE;
-               /*
-                * MSI affinity setting requires a special quirk (X86) when
-                * reservation mode is active.
-                */
-               if (info->flags & MSI_FLAG_NOMASK_QUIRK)
-                       vflags |= VIRQ_NOMASK_QUIRK;
-       }
 
        xa_for_each_range(xa, idx, desc, ctrl->first, ctrl->last) {
                if (!msi_desc_match(desc, MSI_DESC_NOTASSOCIATED))