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

Commit ba95a82e authored by Hou Zhiqiang's avatar Hou Zhiqiang Committed by Bjorn Helgaas
Browse files

PCI: layerscape: Move generic init functions earlier in file 



We will use the generic ls_pcie_link_up() and ls_pcie_host_init() from
device-specific routines.  Move the generic functions earlier in the file
so we won't need forward declarations.  This is strictly a code move with
no functional change intended.

Signed-off-by: default avatarHou Zhiqiang <Zhiqiang.Hou@nxp.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarRoy Zang <tie-fei.zang@freescale.com>
parent 5da39bf0

drivers/pci/dwc/pci-layerscape.c

+32 −32
Original line number Diff line number Diff line
@@ -108,6 +108,38 @@ static int ls1021_pcie_link_up(struct dw_pcie *pci) 
	return 1;

}



static int ls_pcie_link_up(struct dw_pcie *pci)

{

	struct ls_pcie *pcie = to_ls_pcie(pci);

	u32 state;



	state = (ioread32(pcie->lut + pcie->drvdata->lut_dbg) >>

		 pcie->drvdata->ltssm_shift) &

		 LTSSM_STATE_MASK;



	if (state < LTSSM_PCIE_L0)

		return 0;



	return 1;

}



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);



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

	ls_pcie_fix_class(pcie);

	ls_pcie_clear_multifunction(pcie);

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



	ls_pcie_drop_msg_tlp(pcie);



	dw_pcie_setup_rc(pp);



	return 0;

}



static int ls1021_pcie_host_init(struct pcie_port *pp)

{

	struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
@@ -144,38 +176,6 @@ static int ls1021_pcie_host_init(struct pcie_port *pp) 
	return 0;

}



static int ls_pcie_link_up(struct dw_pcie *pci)

{

	struct ls_pcie *pcie = to_ls_pcie(pci);

	u32 state;



	state = (ioread32(pcie->lut + pcie->drvdata->lut_dbg) >>

		 pcie->drvdata->ltssm_shift) &

		 LTSSM_STATE_MASK;



	if (state < LTSSM_PCIE_L0)

		return 0;



	return 1;

}



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);



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

	ls_pcie_fix_class(pcie);

	ls_pcie_clear_multifunction(pcie);

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



	ls_pcie_drop_msg_tlp(pcie);



	dw_pcie_setup_rc(pp);



	return 0;

}



static int ls_pcie_msi_host_init(struct pcie_port *pp,

				 struct msi_controller *chip)

{