lkml.org 
[lkml]   [2022]   [Aug]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 459/779] PCI: dwc: Stop link on host_init errors and de-initialization
    Date
    From: Serge Semin <Sergey.Semin@baikalelectronics.ru>

    [ Upstream commit 113fa857b74c947137d845e7e635afcf6a59c43a ]

    It's logically correct to undo everything that was done when an error is
    discovered or in the corresponding cleanup counterpart. Otherwise the host
    controller will be left in an undetermined state. Since the link is set up
    in the host_init method, deactivate it there in the cleanup-on-error block
    and stop the link in the antagonistic routine - dw_pcie_host_deinit(). Link
    deactivation is platform-specific and should be implemented in
    dw_pcie_ops.stop_link().

    Fixes: 886a9c134755 ("PCI: dwc: Move link handling into common code")
    Link: https://lore.kernel.org/r/20220624143428.8334-2-Sergey.Semin@baikalelectronics.ru
    Tested-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
    Signed-off-by: Serge Semin <Sergey.Semin@baikalelectronics.ru>
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
    Reviewed-by: Rob Herring <robh@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    .../pci/controller/dwc/pcie-designware-host.c | 16 ++++++++++++++--
    1 file changed, 14 insertions(+), 2 deletions(-)

    diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
    index bc0807fe3fc3..3200e906bcda 100644
    --- a/drivers/pci/controller/dwc/pcie-designware-host.c
    +++ b/drivers/pci/controller/dwc/pcie-designware-host.c
    @@ -414,8 +414,14 @@ int dw_pcie_host_init(struct pcie_port *pp)
    bridge->sysdata = pp;

    ret = pci_host_probe(bridge);
    - if (!ret)
    - return 0;
    + if (ret)
    + goto err_stop_link;
    +
    + return 0;
    +
    +err_stop_link:
    + if (pci->ops && pci->ops->stop_link)
    + pci->ops->stop_link(pci);

    err_free_msi:
    if (pp->has_msi_ctrl)
    @@ -426,8 +432,14 @@ EXPORT_SYMBOL_GPL(dw_pcie_host_init);

    void dw_pcie_host_deinit(struct pcie_port *pp)
    {
    + struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
    +
    pci_stop_root_bus(pp->bridge->bus);
    pci_remove_root_bus(pp->bridge->bus);
    +
    + if (pci->ops && pci->ops->stop_link)
    + pci->ops->stop_link(pci);
    +
    if (pp->has_msi_ctrl)
    dw_pcie_free_msi(pp);
    }
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-15 21:23    [W:2.479 / U:0.056 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site