PCI: dwc: Restore MSI Receiver mask during resume

commit 815953dc2011ad7a34de355dfa703dcef1085219 upstream

If a host that uses the IP's integrated MSI Receiver lost power
during suspend, we call dw_pcie_setup_rc() to reinit the RC. But
dw_pcie_setup_rc() always sets pp->irq_mask[ctrl] to ~0, so the mask
register is always set as 0xffffffff incorrectly, thus the MSI can't
work after resume.

Fix this issue by moving pp->irq_mask[ctrl] initialization to
dw_pcie_host_init() so we can correctly set the mask reg during both
boot and resume.

Tested-by: Richard Zhu <hongxing.zhu@nxp.com>
Link: https://lore.kernel.org/r/20211226074019.2556-1-jszhang@kernel.org
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
index f561e87cd5f6e45510711c0ae7292b6a3a32796d..962e700f90f596218f57743185cb419203eada88 100644 (file)
--- a/drivers/pci/controller/dwc/pcie-designware-host.c
+++ b/drivers/pci/controller/dwc/pcie-designware-host.c
@@ -352,6 +352,12 @@ int dw_pcie_host_init(struct pcie_port *pp)
                        if (ret < 0)
                                return ret;
                } else if (pp->has_msi_ctrl) {
+                       u32 ctrl, num_ctrls;
+
+                       num_ctrls = pp->num_vectors / MAX_MSI_IRQS_PER_CTRL;
+                       for (ctrl = 0; ctrl < num_ctrls; ctrl++)
+                               pp->irq_mask[ctrl] = ~0;
+
                        if (!pp->msi_irq) {
                                pp->msi_irq = platform_get_irq_byname_optional(pdev, "msi");
                                if (pp->msi_irq < 0) {
@@ -550,7 +556,6 @@ 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_writel_dbi(pci, PCIE_MSI_INTR0_MASK +
                                            (ctrl * MSI_REG_CTRL_BLOCK_SIZE),
                                            pp->irq_mask[ctrl]);