From: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
To: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Rob Herring <robh@kernel.org>,
Bjorn Helgaas <bhelgaas@google.com>,
Kishon Vijay Abraham I <kishon@ti.com>
Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Masami Hiramatsu <masami.hiramatsu@linaro.org>,
Jassi Brar <jaswinder.singh@linaro.org>,
Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
Subject: [PATCH v2 3/3] PCI: uniphier-ep: Add EPC restart management support
Date: Mon, 25 Jan 2021 00:09:37 +0900 [thread overview]
Message-ID: <1611500977-24816-4-git-send-email-hayashi.kunihiko@socionext.com> (raw)
In-Reply-To: <1611500977-24816-1-git-send-email-hayashi.kunihiko@socionext.com>
Set the polling function and call the init function to enable EPC restart
management. The polling function detects that the bus-reset signal is a
rising edge.
Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
drivers/pci/controller/dwc/Kconfig | 1 +
drivers/pci/controller/dwc/pcie-uniphier-ep.c | 44 ++++++++++++++++++++++++++-
2 files changed, 44 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/controller/dwc/Kconfig b/drivers/pci/controller/dwc/Kconfig
index 22c5529..90d400a 100644
--- a/drivers/pci/controller/dwc/Kconfig
+++ b/drivers/pci/controller/dwc/Kconfig
@@ -302,6 +302,7 @@ config PCIE_UNIPHIER_EP
depends on OF && HAS_IOMEM
depends on PCI_ENDPOINT
select PCIE_DW_EP
+ select PCI_ENDPOINT_RESTART
help
Say Y here if you want PCIe endpoint controller support on
UniPhier SoCs. This driver supports Pro5 SoC.
diff --git a/drivers/pci/controller/dwc/pcie-uniphier-ep.c b/drivers/pci/controller/dwc/pcie-uniphier-ep.c
index 69810c6..9d83850 100644
--- a/drivers/pci/controller/dwc/pcie-uniphier-ep.c
+++ b/drivers/pci/controller/dwc/pcie-uniphier-ep.c
@@ -26,6 +26,7 @@
#define PCL_RSTCTRL_PIPE3 BIT(0)
#define PCL_RSTCTRL1 0x0020
+#define PCL_RSTCTRL_PERST_MON BIT(16)
#define PCL_RSTCTRL_PERST BIT(0)
#define PCL_RSTCTRL2 0x0024
@@ -60,6 +61,7 @@ struct uniphier_pcie_ep_priv {
struct clk *clk, *clk_gio;
struct reset_control *rst, *rst_gio;
struct phy *phy;
+ bool bus_reset_status;
const struct pci_epc_features *features;
};
@@ -212,6 +214,41 @@ uniphier_pcie_get_features(struct dw_pcie_ep *ep)
return priv->features;
}
+static bool uniphier_pcie_ep_poll_reset(void *data)
+{
+ struct uniphier_pcie_ep_priv *priv = data;
+ bool ret, status;
+
+ if (!priv)
+ return false;
+
+ status = !(readl(priv->base + PCL_RSTCTRL1) & PCL_RSTCTRL_PERST_MON);
+
+ /* return true if the rising edge of bus reset is detected */
+ ret = !!(status == false && priv->bus_reset_status == true);
+ priv->bus_reset_status = status;
+
+ return ret;
+}
+
+static int uniphier_pcie_ep_init_complete(struct dw_pcie_ep *ep)
+{
+ struct dw_pcie *pci = to_dw_pcie_from_ep(ep);
+ struct uniphier_pcie_ep_priv *priv = to_uniphier_pcie(pci);
+ int ret;
+
+ /* Set up epc-restart thread */
+ pci_epc_restart_register_poll_func(ep->epc,
+ uniphier_pcie_ep_poll_reset, priv);
+ /* With call of poll_reset() directly, initialize internal state */
+ uniphier_pcie_ep_poll_reset(priv);
+ ret = pci_epc_restart_init(ep->epc);
+ if (ret)
+ dev_err(pci->dev, "Failed to initialize epc-restart (%d)\n", ret);
+
+ return ret;
+}
+
static const struct dw_pcie_ep_ops uniphier_pcie_ep_ops = {
.ep_init = uniphier_pcie_ep_init,
.raise_irq = uniphier_pcie_ep_raise_irq,
@@ -318,7 +355,12 @@ static int uniphier_pcie_ep_probe(struct platform_device *pdev)
return ret;
priv->pci.ep.ops = &uniphier_pcie_ep_ops;
- return dw_pcie_ep_init(&priv->pci.ep);
+
+ ret = dw_pcie_ep_init(&priv->pci.ep);
+ if (ret)
+ return ret;
+
+ return uniphier_pcie_ep_init_complete(&priv->pci.ep);
}
static const struct pci_epc_features uniphier_pro5_data = {
--
2.7.4
next prev parent reply other threads:[~2021-01-24 15:11 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-24 15:09 [PATCH v2 0/3] PCI: endpoint: Add endpoint restart management support Kunihiko Hayashi
2021-01-24 15:09 ` [PATCH v2 1/3] PCI: endpoint: Add 'started' to pci_epc to set whether the controller is started Kunihiko Hayashi
2021-01-28 14:11 ` Kishon Vijay Abraham I
2021-02-02 16:13 ` Kunihiko Hayashi
2021-01-24 15:09 ` [PATCH v2 2/3] PCI: endpoint: Add endpoint restart management Kunihiko Hayashi
2021-01-24 15:09 ` Kunihiko Hayashi [this message]
2021-01-28 14:29 ` [PATCH v2 3/3] PCI: uniphier-ep: Add EPC restart management support Kishon Vijay Abraham I
2021-02-02 16:13 ` Kunihiko Hayashi
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=1611500977-24816-4-git-send-email-hayashi.kunihiko@socionext.com \
--to=hayashi.kunihiko@socionext.com \
--cc=bhelgaas@google.com \
--cc=jaswinder.singh@linaro.org \
--cc=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=masami.hiramatsu@linaro.org \
--cc=robh@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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).