Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a301766 authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Bjorn Helgaas
Browse files

PCI: dwc: designware: Handle ->host_init() failures 



In several dwc-based drivers, ->host_init() can fail, so make sure to
propagate and handle this to avoid continuing operation of a driver or
hardware in an invalid state.

Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarJoao Pinto <jpinto@synopsys.com>
Acked-by: default avatarJingoo Han <jingoohan1@gmail.com>
parent e9be4d78

drivers/pci/dwc/pci-dra7xx.c

+3 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static void dra7xx_pcie_enable_interrupts(struct dra7xx_pcie *dra7xx) 
	dra7xx_pcie_enable_msi_interrupts(dra7xx);

}



static void dra7xx_pcie_host_init(struct pcie_port *pp)

static int dra7xx_pcie_host_init(struct pcie_port *pp)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pci);
@@ -206,6 +206,8 @@ static void dra7xx_pcie_host_init(struct pcie_port *pp) 
	dw_pcie_wait_for_link(pci);

	dw_pcie_msi_init(pp);

	dra7xx_pcie_enable_interrupts(dra7xx);



	return 0;

}



static const struct dw_pcie_host_ops dra7xx_pcie_host_ops = {

drivers/pci/dwc/pci-exynos.c

+3 −1
Original line number Diff line number Diff line
@@ -581,13 +581,15 @@ static int exynos_pcie_link_up(struct dw_pcie *pci) 
	return 0;

}



static void exynos_pcie_host_init(struct pcie_port *pp)

static int exynos_pcie_host_init(struct pcie_port *pp)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	struct exynos_pcie *ep = to_exynos_pcie(pci);



	exynos_pcie_establish_link(ep);

	exynos_pcie_enable_interrupts(ep);



	return 0;

}



static const struct dw_pcie_host_ops exynos_pcie_host_ops = {

drivers/pci/dwc/pci-imx6.c

+3 −1
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie) 
	return ret;

}



static void imx6_pcie_host_init(struct pcie_port *pp)

static int imx6_pcie_host_init(struct pcie_port *pp)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	struct imx6_pcie *imx6_pcie = to_imx6_pcie(pci);
@@ -649,6 +649,8 @@ static void imx6_pcie_host_init(struct pcie_port *pp) 


	if (IS_ENABLED(CONFIG_PCI_MSI))

		dw_pcie_msi_init(pp);



	return 0;

}



static int imx6_pcie_link_up(struct dw_pcie *pci)

drivers/pci/dwc/pci-keystone.c

+3 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static int keystone_pcie_fault(unsigned long addr, unsigned int fsr, 
	return 0;

}



static void __init ks_pcie_host_init(struct pcie_port *pp)

static int __init ks_pcie_host_init(struct pcie_port *pp)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	struct keystone_pcie *ks_pcie = to_keystone_pcie(pci);
@@ -289,6 +289,8 @@ static void __init ks_pcie_host_init(struct pcie_port *pp) 
	 */

	hook_fault_code(17, keystone_pcie_fault, SIGBUS, 0,

			"Asynchronous external abort");



	return 0;

}



static const struct dw_pcie_host_ops keystone_pcie_host_ops = {

drivers/pci/dwc/pci-layerscape.c

+10 −4
Original line number Diff line number Diff line
@@ -108,31 +108,35 @@ static int ls1021_pcie_link_up(struct dw_pcie *pci) 
	return 1;

}



static void ls1021_pcie_host_init(struct pcie_port *pp)

static int ls1021_pcie_host_init(struct pcie_port *pp)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	struct ls_pcie *pcie = to_ls_pcie(pci);

	struct device *dev = pci->dev;

	u32 index[2];

	int ret;



	pcie->scfg = syscon_regmap_lookup_by_phandle(dev->of_node,

						     "fsl,pcie-scfg");

	if (IS_ERR(pcie->scfg)) {

		ret = PTR_ERR(pcie->scfg);

		dev_err(dev, "No syscfg phandle specified\n");

		pcie->scfg = NULL;

		return;

		return ret;

	}



	if (of_property_read_u32_array(dev->of_node,

				       "fsl,pcie-scfg", index, 2)) {

		pcie->scfg = NULL;

		return;

		return -EINVAL;

	}

	pcie->index = index[1];



	dw_pcie_setup_rc(pp);



	ls_pcie_drop_msg_tlp(pcie);



	return 0;

}



static int ls_pcie_link_up(struct dw_pcie *pci)
@@ -150,7 +154,7 @@ static int ls_pcie_link_up(struct dw_pcie *pci) 
	return 1;

}



static void ls_pcie_host_init(struct pcie_port *pp)

static int ls_pcie_host_init(struct pcie_port *pp)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);

	struct ls_pcie *pcie = to_ls_pcie(pci);
@@ -160,6 +164,8 @@ static void ls_pcie_host_init(struct pcie_port *pp) 
	ls_pcie_clear_multifunction(pcie);

	ls_pcie_drop_msg_tlp(pcie);

	iowrite32(0, pci->dbi_base + PCIE_DBI_RO_WR_EN);



	return 0;

}



static int ls_pcie_msi_host_init(struct pcie_port *pp,