lkml.org 
[lkml]   [2019]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.0 059/173] PCI: dwc: Free MSI in dw_pcie_host_init() error path
    Date
    From: Jisheng Zhang <Jisheng.Zhang@synaptics.com>

    [ Upstream commit 9e2b5de5604a6ff2626c51e77014d92c9299722c ]

    If we ever did MSI-related initializations, we need to call
    dw_pcie_free_msi() in the error code path.

    Remove the IS_ENABLED(CONFIG_PCI_MSI) check for MSI init because
    pci_msi_enabled() already has a stub for !CONFIG_PCI_MSI.

    Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
    Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
    Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
    Acked-by: Gustavo Pimentel <gustavo.pimentel@synopsys.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pci/controller/dwc/pcie-designware-host.c | 9 ++++++---
    1 file changed, 6 insertions(+), 3 deletions(-)

    diff --git a/drivers/pci/controller/dwc/pcie-designware-host.c b/drivers/pci/controller/dwc/pcie-designware-host.c
    index 9c5614f21b8eb..d14a6237bdf5a 100644
    --- a/drivers/pci/controller/dwc/pcie-designware-host.c
    +++ b/drivers/pci/controller/dwc/pcie-designware-host.c
    @@ -439,7 +439,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
    if (ret)
    pci->num_viewport = 2;

    - if (IS_ENABLED(CONFIG_PCI_MSI) && pci_msi_enabled()) {
    + if (pci_msi_enabled()) {
    /*
    * If a specific SoC driver needs to change the
    * default number of vectors, it needs to implement
    @@ -477,7 +477,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
    if (pp->ops->host_init) {
    ret = pp->ops->host_init(pp);
    if (ret)
    - goto error;
    + goto err_free_msi;
    }

    pp->root_bus_nr = pp->busn->start;
    @@ -491,7 +491,7 @@ int dw_pcie_host_init(struct pcie_port *pp)

    ret = pci_scan_root_bus_bridge(bridge);
    if (ret)
    - goto error;
    + goto err_free_msi;

    bus = bridge->bus;

    @@ -507,6 +507,9 @@ int dw_pcie_host_init(struct pcie_port *pp)
    pci_bus_add_devices(bus);
    return 0;

    +err_free_msi:
    + if (pci_msi_enabled() && !pp->ops->msi_host_init)
    + dw_pcie_free_msi(pp);
    error:
    pci_free_host_bridge(bridge);
    return ret;
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-06-01 15:38    [W:4.078 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site