lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.9 521/757] PCI: aardvark: Check for errors from pci_bridge_emul_init() call
    Date
    From: Pali Rohár <pali@kernel.org>

    [ Upstream commit 7862a6134456c8b4f8c39e8c94aa97e5c2f7f2b7 ]

    Function pci_bridge_emul_init() may fail so correctly check for errors.

    Link: https://lore.kernel.org/r/20200907111038.5811-3-pali@kernel.org
    Fixes: 8a3ebd8de328 ("PCI: aardvark: Implement emulated root PCI bridge config space")
    Signed-off-by: Pali Rohár <pali@kernel.org>
    Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
    Reviewed-by: Marek Behún <marek.behun@nic.cz>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/pci/controller/pci-aardvark.c | 11 +++++++----
    1 file changed, 7 insertions(+), 4 deletions(-)

    diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c
    index 1c5f2fd47c511..2e2e2a2ff51d3 100644
    --- a/drivers/pci/controller/pci-aardvark.c
    +++ b/drivers/pci/controller/pci-aardvark.c
    @@ -607,7 +607,7 @@ static struct pci_bridge_emul_ops advk_pci_bridge_emul_ops = {
    * Initialize the configuration space of the PCI-to-PCI bridge
    * associated with the given PCIe interface.
    */
    -static void advk_sw_pci_bridge_init(struct advk_pcie *pcie)
    +static int advk_sw_pci_bridge_init(struct advk_pcie *pcie)
    {
    struct pci_bridge_emul *bridge = &pcie->bridge;

    @@ -633,8 +633,7 @@ static void advk_sw_pci_bridge_init(struct advk_pcie *pcie)
    bridge->data = pcie;
    bridge->ops = &advk_pci_bridge_emul_ops;

    - pci_bridge_emul_init(bridge, 0);
    -
    + return pci_bridge_emul_init(bridge, 0);
    }

    static bool advk_pcie_valid_device(struct advk_pcie *pcie, struct pci_bus *bus,
    @@ -1167,7 +1166,11 @@ static int advk_pcie_probe(struct platform_device *pdev)

    advk_pcie_setup_hw(pcie);

    - advk_sw_pci_bridge_init(pcie);
    + ret = advk_sw_pci_bridge_init(pcie);
    + if (ret) {
    + dev_err(dev, "Failed to register emulated root PCI bridge\n");
    + return ret;
    + }

    ret = advk_pcie_init_irq_domain(pcie);
    if (ret) {
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 17:48    [W:4.540 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site