Commit 5d18d702 authored by Pali Rohár's avatar Pali Rohár Committed by Lorenzo Pieralisi
Browse files

PCI: mvebu: Check for errors from pci_bridge_emul_init() call 

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

Link: https://lore.kernel.org/r/20211125124605.25915-3-pali@kernel.org


Fixes: 1f08673e ("PCI: mvebu: Convert to PCI emulated bridge config space")
Signed-off-by: default avatarPali Rohár <pali@kernel.org>
Signed-off-by: default avatarLorenzo Pieralisi <lorenzo.pieralisi@arm.com>
parent 8cdabfdd

drivers/pci/controller/pci-mvebu.c

+12 −3
Original line number Diff line number Diff line
@@ -570,7 +570,7 @@ static struct pci_bridge_emul_ops mvebu_pci_bridge_emul_ops = { 
 * Initialize the configuration space of the PCI-to-PCI bridge

 * associated with the given PCIe interface.

 */

static void mvebu_pci_bridge_emul_init(struct mvebu_pcie_port *port)

static int mvebu_pci_bridge_emul_init(struct mvebu_pcie_port *port)

{

	struct pci_bridge_emul *bridge = &port->bridge;
@@ -589,7 +589,7 @@ static void mvebu_pci_bridge_emul_init(struct mvebu_pcie_port *port) 
	bridge->data = port;

	bridge->ops = &mvebu_pci_bridge_emul_ops;



	pci_bridge_emul_init(bridge, PCI_BRIDGE_EMUL_NO_PREFETCHABLE_BAR);

	return pci_bridge_emul_init(bridge, PCI_BRIDGE_EMUL_NO_PREFETCHABLE_BAR);

}



static inline struct mvebu_pcie *sys_to_pcie(struct pci_sys_data *sys)
@@ -1075,9 +1075,18 @@ static int mvebu_pcie_probe(struct platform_device *pdev) 
			continue;

		}



		ret = mvebu_pci_bridge_emul_init(port);

		if (ret < 0) {

			dev_err(dev, "%s: cannot init emulated bridge\n",

				port->name);

			devm_iounmap(dev, port->base);

			port->base = NULL;

			mvebu_pcie_powerdown(port);

			continue;

		}



		mvebu_pcie_setup_hw(port);

		mvebu_pcie_set_local_dev_nr(port, 1);

		mvebu_pci_bridge_emul_init(port);

	}



	pcie->nports = i;