2 files changed, 7 insertions, 7 deletions

diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
index 768e16aad68e..c550c4a7ef89 100644
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -164,9 +164,9 @@ static void dw_pci_bottom_mask(struct irq_data *d)
                 res = ctrl * MSI_REG_CTRL_BLOCK_SIZE;
                 bit = d->hwirq % MAX_MSI_IRQS_PER_CTRL;
 
-                pp->irq_status[ctrl] &= ~(1 << bit);
+                pp->irq_mask[ctrl] |= (1 << bit);
                 dw_pcie_wr_own_conf(pp, PCIE_MSI_INTR0_MASK + res, 4,
-                                    ~pp->irq_status[ctrl]);
+                                    pp->irq_mask[ctrl]);
         }
 
         raw_spin_unlock_irqrestore(&pp->lock, flags);
@@ -187,9 +187,9 @@ static void dw_pci_bottom_unmask(struct irq_data *d)
                 res = ctrl * MSI_REG_CTRL_BLOCK_SIZE;
                 bit = d->hwirq % MAX_MSI_IRQS_PER_CTRL;
 
-                pp->irq_status[ctrl] |= 1 << bit;
+                pp->irq_mask[ctrl] &= ~(1 << bit);
                 dw_pcie_wr_own_conf(pp, PCIE_MSI_INTR0_MASK + res, 4,
-                                    ~pp->irq_status[ctrl]);
+                                    pp->irq_mask[ctrl]);
         }
 
         raw_spin_unlock_irqrestore(&pp->lock, flags);
@@ -665,13 +665,13 @@ void dw_pcie_setup_rc(struct pcie_port *pp)
 
         /* Initialize IRQ Status array */
         for (ctrl = 0; ctrl < num_ctrls; ctrl++) {
+                pp->irq_mask[ctrl] = ~0;
                 dw_pcie_wr_own_conf(pp, PCIE_MSI_INTR0_MASK +
                                         (ctrl * MSI_REG_CTRL_BLOCK_SIZE),
-                                    4, ~0);
+                                    4, pp->irq_mask[ctrl]);
                 dw_pcie_wr_own_conf(pp, PCIE_MSI_INTR0_ENABLE +
                                         (ctrl * MSI_REG_CTRL_BLOCK_SIZE),
                                     4, ~0);
-                pp->irq_status[ctrl] = 0;
         }
 
         /* Setup RC BARs */
diff --git a/drivers/pci/controller/dwc/pcie-designware.h b/drivers/pci/controller/dwc/pcie-designware.h
index 9943d8c68335..279000255ad1 100644
--- a/drivers/pci/controller/dwc/pcie-designware.h
+++ b/drivers/pci/controller/dwc/pcie-designware.h
@@ -177,7 +177,7 @@ struct pcie_port {
         struct irq_domain       *msi_domain;
         dma_addr_t              msi_data;
         u32                     num_vectors;
-        u32                     irq_status[MAX_MSI_CTRLS];
+        u32                     irq_mask[MAX_MSI_CTRLS];
         raw_spinlock_t          lock;
         DECLARE_BITMAP(msi_irq_in_use, MAX_MSI_IRQS);
 };