| Message ID | 20201229113556.5dd4610c@xhacker.debian (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | [v2] PCI: dwc: Fix MSI not work after resume | expand |
On Mon, Dec 28, 2020 at 8:36 PM Jisheng Zhang <Jisheng.Zhang@synaptics.com> wrote: > > After we move dw_pcie_msi_init() into core -- dw_pcie_host_init(), the > MSI stops working after resume. Because dw_pcie_host_init() is only > called once during probe. To fix this issue, we move dw_pcie_msi_init() > to dw_pcie_setup_rc(). > > Fixes: 59fbab1ae40e ("PCI: dwc: Move dw_pcie_msi_init() into core") > Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> > --- > > Since v1: > - rebased on 5.11-rc1 > - add Fixes tag > > drivers/pci/controller/dwc/pcie-designware-host.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Reviewed-by: Rob Herring <robh@kernel.org> Bjorn, please pick up for 5.11. Rob
diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c index 8a84c005f32b..5240b5f0973d 100644 --- a/drivers/pci/controller/dwc/pcie-designware-host.c +++ b/drivers/pci/controller/dwc/pcie-designware-host.c @@ -423,7 +423,6 @@ int dw_pcie_host_init(struct pcie_port *pp) } dw_pcie_setup_rc(pp); - dw_pcie_msi_init(pp); if (!dw_pcie_link_up(pci) && pci->ops->start_link) { ret = pci->ops->start_link(pci); @@ -574,6 +573,8 @@ void dw_pcie_setup_rc(struct pcie_port *pp) } } + dw_pcie_msi_init(pp); + /* Setup RC BARs */ dw_pcie_writel_dbi(pci, PCI_BASE_ADDRESS_0, 0x00000004); dw_pcie_writel_dbi(pci, PCI_BASE_ADDRESS_1, 0x00000000);
After we move dw_pcie_msi_init() into core -- dw_pcie_host_init(), the MSI stops working after resume. Because dw_pcie_host_init() is only called once during probe. To fix this issue, we move dw_pcie_msi_init() to dw_pcie_setup_rc(). Fixes: 59fbab1ae40e ("PCI: dwc: Move dw_pcie_msi_init() into core") Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> --- Since v1: - rebased on 5.11-rc1 - add Fixes tag drivers/pci/controller/dwc/pcie-designware-host.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)