PCI: dwc: Restore MSI Receiver mask during resume
PATCH 1/1 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.
--- drivers/pci/controller/dwc/pcie-designware-host.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/pci/controller/dwc/pcie-designware-host.c +6 -1
@@ -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]);
Signature · 1 line
2.45.2
Quoted 12 lines · Jisheng Zhang
commit
815953dc2011ad7a34de355dfa703dcef1085219upstreamIf a host that uses the IP's integrated MSI Receiver lost power during suspend, we call
dw_pcie_setup_rc()to reinit the RC. Butdw_pcie_setup_rc()always sets pp->irq_mask[ctrl] to ~0, so the mask register is always set as0xffffffffincorrectly, 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.
Quoted 9 lines
Tested-by Richard Zhu <[email protected]>Signed-off-by Jisheng Zhang <[email protected]>Signed-off-by Lorenzo Pieralisi <[email protected]>Signed-off-by Bjorn Helgaas <[email protected]>--- drivers/pci/controller/dwc/pcie-designware-host.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
Now queued up, thanks.
greg k-h