From: Marek Vasut <marex@denx.de> To: linux-pci@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Marek Vasut <marex@denx.de>, Bjorn Helgaas <bhelgaas@google.com>, Frank Li <lznuaa@gmail.com>, Harro Haan <hrhaan@gmail.com>, Jingoo Han <jg1.han@samsung.com>, Mohit KUMAR <Mohit.KUMAR@st.com>, Pratyush Anand <pratyush.anand@st.com>, Richard Zhu <r65037@freescale.com>, Sascha Hauer <s.hauer@pengutronix.de>, Sean Cross <xobs@kosagi.com>, Shawn Guo <shawn.guo@linaro.org>, Siva Reddy Kallam <siva.kallam@samsung.com>, Srikanth T Shivanand <ts.srikanth@samsung.com>, Tim Harvey <tharvey@gateworks.com>, Troy Kisky <troy.kisky@boundarydevices.com>, Yinghai Lu <yinghai@kernel.org> Subject: [PATCH V2 3/7] PCI: imx6: Split away the PHY reset Date: Wed, 11 Dec 2013 11:30:14 +0100 [thread overview] Message-ID: <1386757818-5154-3-git-send-email-marex@denx.de> (raw) In-Reply-To: <1386757818-5154-1-git-send-email-marex@denx.de> Split the PCIe PHY reset from the link up function to make the code a little more structured. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Frank Li <lznuaa@gmail.com> Cc: Harro Haan <hrhaan@gmail.com> Cc: Jingoo Han <jg1.han@samsung.com> Cc: Mohit KUMAR <Mohit.KUMAR@st.com> Cc: Pratyush Anand <pratyush.anand@st.com> Cc: Richard Zhu <r65037@freescale.com> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Sean Cross <xobs@kosagi.com> Cc: Shawn Guo <shawn.guo@linaro.org> Cc: Siva Reddy Kallam <siva.kallam@samsung.com> Cc: Srikanth T Shivanand <ts.srikanth@samsung.com> Cc: Tim Harvey <tharvey@gateworks.com> Cc: Troy Kisky <troy.kisky@boundarydevices.com> Cc: Yinghai Lu <yinghai@kernel.org> --- drivers/pci/host/pci-imx6.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) V2: Drop unused 'temp' variable. diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c index 4d5be4e..478e87e 100644 --- a/drivers/pci/host/pci-imx6.c +++ b/drivers/pci/host/pci-imx6.c @@ -336,9 +336,26 @@ static void imx6_pcie_host_init(struct pcie_port *pp) return; } +static void imx6_pcie_reset_phy(struct pcie_port *pp) +{ + uint32_t temp; + + pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &temp); + temp |= (PHY_RX_OVRD_IN_LO_RX_DATA_EN | + PHY_RX_OVRD_IN_LO_RX_PLL_EN); + pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, temp); + + usleep_range(2000, 3000); + + pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &temp); + temp &= ~(PHY_RX_OVRD_IN_LO_RX_DATA_EN | + PHY_RX_OVRD_IN_LO_RX_PLL_EN); + pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, temp); +} + static int imx6_pcie_link_up(struct pcie_port *pp) { - u32 rc, ltssm, rx_valid, temp; + u32 rc, ltssm, rx_valid; /* * Test if the PHY reports that the link is up and also that @@ -370,21 +387,7 @@ static int imx6_pcie_link_up(struct pcie_port *pp) dev_err(pp->dev, "transition to gen2 is stuck, reset PHY!\n"); - pcie_phy_read(pp->dbi_base, - PHY_RX_OVRD_IN_LO, &temp); - temp |= (PHY_RX_OVRD_IN_LO_RX_DATA_EN - | PHY_RX_OVRD_IN_LO_RX_PLL_EN); - pcie_phy_write(pp->dbi_base, - PHY_RX_OVRD_IN_LO, temp); - - usleep_range(2000, 3000); - - pcie_phy_read(pp->dbi_base, - PHY_RX_OVRD_IN_LO, &temp); - temp &= ~(PHY_RX_OVRD_IN_LO_RX_DATA_EN - | PHY_RX_OVRD_IN_LO_RX_PLL_EN); - pcie_phy_write(pp->dbi_base, - PHY_RX_OVRD_IN_LO, temp); + imx6_pcie_reset_phy(pp); return 0; } -- 1.8.4.3
WARNING: multiple messages have this Message-ID (diff)
From: marex@denx.de (Marek Vasut) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH V2 3/7] PCI: imx6: Split away the PHY reset Date: Wed, 11 Dec 2013 11:30:14 +0100 [thread overview] Message-ID: <1386757818-5154-3-git-send-email-marex@denx.de> (raw) In-Reply-To: <1386757818-5154-1-git-send-email-marex@denx.de> Split the PCIe PHY reset from the link up function to make the code a little more structured. Signed-off-by: Marek Vasut <marex@denx.de> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Frank Li <lznuaa@gmail.com> Cc: Harro Haan <hrhaan@gmail.com> Cc: Jingoo Han <jg1.han@samsung.com> Cc: Mohit KUMAR <Mohit.KUMAR@st.com> Cc: Pratyush Anand <pratyush.anand@st.com> Cc: Richard Zhu <r65037@freescale.com> Cc: Sascha Hauer <s.hauer@pengutronix.de> Cc: Sean Cross <xobs@kosagi.com> Cc: Shawn Guo <shawn.guo@linaro.org> Cc: Siva Reddy Kallam <siva.kallam@samsung.com> Cc: Srikanth T Shivanand <ts.srikanth@samsung.com> Cc: Tim Harvey <tharvey@gateworks.com> Cc: Troy Kisky <troy.kisky@boundarydevices.com> Cc: Yinghai Lu <yinghai@kernel.org> --- drivers/pci/host/pci-imx6.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) V2: Drop unused 'temp' variable. diff --git a/drivers/pci/host/pci-imx6.c b/drivers/pci/host/pci-imx6.c index 4d5be4e..478e87e 100644 --- a/drivers/pci/host/pci-imx6.c +++ b/drivers/pci/host/pci-imx6.c @@ -336,9 +336,26 @@ static void imx6_pcie_host_init(struct pcie_port *pp) return; } +static void imx6_pcie_reset_phy(struct pcie_port *pp) +{ + uint32_t temp; + + pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &temp); + temp |= (PHY_RX_OVRD_IN_LO_RX_DATA_EN | + PHY_RX_OVRD_IN_LO_RX_PLL_EN); + pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, temp); + + usleep_range(2000, 3000); + + pcie_phy_read(pp->dbi_base, PHY_RX_OVRD_IN_LO, &temp); + temp &= ~(PHY_RX_OVRD_IN_LO_RX_DATA_EN | + PHY_RX_OVRD_IN_LO_RX_PLL_EN); + pcie_phy_write(pp->dbi_base, PHY_RX_OVRD_IN_LO, temp); +} + static int imx6_pcie_link_up(struct pcie_port *pp) { - u32 rc, ltssm, rx_valid, temp; + u32 rc, ltssm, rx_valid; /* * Test if the PHY reports that the link is up and also that @@ -370,21 +387,7 @@ static int imx6_pcie_link_up(struct pcie_port *pp) dev_err(pp->dev, "transition to gen2 is stuck, reset PHY!\n"); - pcie_phy_read(pp->dbi_base, - PHY_RX_OVRD_IN_LO, &temp); - temp |= (PHY_RX_OVRD_IN_LO_RX_DATA_EN - | PHY_RX_OVRD_IN_LO_RX_PLL_EN); - pcie_phy_write(pp->dbi_base, - PHY_RX_OVRD_IN_LO, temp); - - usleep_range(2000, 3000); - - pcie_phy_read(pp->dbi_base, - PHY_RX_OVRD_IN_LO, &temp); - temp &= ~(PHY_RX_OVRD_IN_LO_RX_DATA_EN - | PHY_RX_OVRD_IN_LO_RX_PLL_EN); - pcie_phy_write(pp->dbi_base, - PHY_RX_OVRD_IN_LO, temp); + imx6_pcie_reset_phy(pp); return 0; } -- 1.8.4.3
next prev parent reply other threads:[~2013-12-11 10:30 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-12-11 10:30 [PATCH 1/7] PCI: imx6: Make reset-gpio optional Marek Vasut 2013-12-11 10:30 ` Marek Vasut 2013-12-11 10:30 ` [PATCH 2/7] PCI: imx6: Fix waiting for link up Marek Vasut 2013-12-11 10:30 ` Marek Vasut 2013-12-11 10:30 ` Marek Vasut [this message] 2013-12-11 10:30 ` [PATCH V2 3/7] PCI: imx6: Split away the PHY reset Marek Vasut 2013-12-19 1:11 ` Jingoo Han 2013-12-19 1:11 ` Jingoo Han 2013-12-11 10:30 ` [PATCH 4/7] PCI: imx6: Split away the link up wait loop Marek Vasut 2013-12-11 10:30 ` Marek Vasut 2013-12-11 10:30 ` [PATCH V2 5/7] PCI: imx6: Fix link start operation Marek Vasut 2013-12-11 10:30 ` Marek Vasut 2013-12-11 10:30 ` [PATCH 6/7] PCI: imx6: Fix bugs in PCIe startup code Marek Vasut 2013-12-11 10:30 ` Marek Vasut 2013-12-11 10:30 ` [PATCH 7/7] ARM: dts: imx6q-sabrelite: Enable PCI express Marek Vasut 2013-12-11 10:30 ` Marek Vasut 2013-12-13 7:01 ` Shawn Guo 2013-12-13 7:01 ` Shawn Guo 2013-12-12 2:46 ` [PATCH 1/7] PCI: imx6: Make reset-gpio optional Jingoo Han 2013-12-12 2:46 ` Jingoo Han 2013-12-12 5:10 ` Tim Harvey 2013-12-12 5:10 ` Tim Harvey 2013-12-12 10:22 ` Marek Vasut 2013-12-12 10:22 ` Marek Vasut 2013-12-12 18:16 ` Tim Harvey 2013-12-12 18:16 ` Tim Harvey 2013-12-12 18:25 ` Marek Vasut 2013-12-12 18:25 ` Marek Vasut 2013-12-12 21:07 ` Bjorn Helgaas 2013-12-12 21:07 ` Bjorn Helgaas 2013-12-12 21:20 ` Bjorn Helgaas 2013-12-12 21:20 ` Bjorn Helgaas 2013-12-12 21:38 ` Marek Vasut 2013-12-12 21:38 ` Marek Vasut 2013-12-12 22:12 ` Harro Haan 2013-12-12 22:12 ` Harro Haan 2013-12-12 21:49 [PATCH V2 " Marek Vasut 2013-12-12 21:50 ` [PATCH V2 3/7] PCI: imx6: Split away the PHY reset Marek Vasut 2013-12-12 21:50 ` Marek Vasut
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1386757818-5154-3-git-send-email-marex@denx.de \ --to=marex@denx.de \ --cc=Mohit.KUMAR@st.com \ --cc=bhelgaas@google.com \ --cc=hrhaan@gmail.com \ --cc=jg1.han@samsung.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-pci@vger.kernel.org \ --cc=lznuaa@gmail.com \ --cc=pratyush.anand@st.com \ --cc=r65037@freescale.com \ --cc=s.hauer@pengutronix.de \ --cc=shawn.guo@linaro.org \ --cc=siva.kallam@samsung.com \ --cc=tharvey@gateworks.com \ --cc=troy.kisky@boundarydevices.com \ --cc=ts.srikanth@samsung.com \ --cc=xobs@kosagi.com \ --cc=yinghai@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.