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

Commit 9efffbc8 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Greg Kroah-Hartman
Browse files

PCI: altera: Reorder read/write functions 



commit f8be11ae3d2c9a1338da37ff91ff4c65922d21be upstream.

Move cra_writel(), cra_readl(), and altera_pcie_link_is_up() so a future
patch can use them in altera_pcie_retrain().  No functional change
intended.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Cc: Claudius Heine <claudius.heine.ext@siemens.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ecd77ebf

drivers/pci/host/pcie-altera.c

+16 −16
Original line number Diff line number Diff line
@@ -81,6 +81,22 @@ struct tlp_rp_regpair_t { 
	u32 reg1;

};



static inline void cra_writel(struct altera_pcie *pcie, const u32 value,

			      const u32 reg)

{

	writel_relaxed(value, pcie->cra_base + reg);

}



static inline u32 cra_readl(struct altera_pcie *pcie, const u32 reg)

{

	return readl_relaxed(pcie->cra_base + reg);

}



static bool altera_pcie_link_is_up(struct altera_pcie *pcie)

{

	return !!((cra_readl(pcie, RP_LTSSM) & RP_LTSSM_MASK) == LTSSM_L0);

}



static void altera_pcie_retrain(struct pci_dev *dev)

{

	u16 linkcap, linkstat;
@@ -120,17 +136,6 @@ static bool altera_pcie_hide_rc_bar(struct pci_bus *bus, unsigned int devfn, 
	return false;

}



static inline void cra_writel(struct altera_pcie *pcie, const u32 value,

			      const u32 reg)

{

	writel_relaxed(value, pcie->cra_base + reg);

}



static inline u32 cra_readl(struct altera_pcie *pcie, const u32 reg)

{

	return readl_relaxed(pcie->cra_base + reg);

}



static void tlp_write_tx(struct altera_pcie *pcie,

			 struct tlp_rp_regpair_t *tlp_rp_regdata)

{
@@ -139,11 +144,6 @@ static void tlp_write_tx(struct altera_pcie *pcie, 
	cra_writel(pcie, tlp_rp_regdata->ctrl, RP_TX_CNTRL);

}



static bool altera_pcie_link_is_up(struct altera_pcie *pcie)

{

	return !!((cra_readl(pcie, RP_LTSSM) & RP_LTSSM_MASK) == LTSSM_L0);

}



static bool altera_pcie_valid_config(struct altera_pcie *pcie,

				     struct pci_bus *bus, int dev)

{