From patchwork Tue Jan 8 16:24:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Miquel Raynal X-Patchwork-Id: 10752373 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8366A1399 for ; Tue, 8 Jan 2019 16:25:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 709011FFCA for ; Tue, 8 Jan 2019 16:25:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 64A1B212DB; Tue, 8 Jan 2019 16:25:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0B7711FFCA for ; Tue, 8 Jan 2019 16:25:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=EQt1GGnHprukAsp5/MQtbUHdZPVCA+3w2T6/IXrqurI=; b=TMjq7c9d8nmGC/ /QTSijZbfB4MvLiq5IgELotTS9JLw+87M01Yd8khzCDS+2hX5uRyM/el6z2QMD8Q0Dcpy5hYnwYt5 MB27Us67JC8UP5HUGe8aGob9h4TuD7+b1+P6kPUlMAvuwqlQ7JYa6HECbB0MT2siFR7pRKcPr4P7A kyQILrfyOewMBm7mtUYN0f0aXTlktezkyZCqO+O0xc47wSlZgnuA1iHYhxrOGr0hqLcgduBCsTTuB IfbrMlIc1H3U30UMIv6Z+kgjhgXtuFfBrjx0ipBZIlSTPFZDPwlW9Pm3BP8FSq30B/QlmruILGOf7 V+ScigavQLNU60q2MmOA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gguCQ-0002x0-CQ; Tue, 08 Jan 2019 16:25:54 +0000 Received: from mail.bootlin.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gguBM-0000bu-OD for linux-arm-kernel@lists.infradead.org; Tue, 08 Jan 2019 16:24:50 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 36B2920A14; Tue, 8 Jan 2019 17:24:47 +0100 (CET) Received: from localhost.localdomain (aaubervilliers-681-1-45-241.w90-88.abo.wanadoo.fr [90.88.163.241]) by mail.bootlin.com (Postfix) with ESMTPSA id CAFB6207A3; Tue, 8 Jan 2019 17:24:46 +0100 (CET) From: Miquel Raynal To: Gregory Clement , Jason Cooper , Andrew Lunn , Sebastian Hesselbarth , Thomas Petazzoni , Bjorn Helgaas Subject: [PATCH v3 06/15] PCI: aardvark: Add external reset GPIO support Date: Tue, 8 Jan 2019 17:24:31 +0100 Message-Id: <20190108162441.5278-7-miquel.raynal@bootlin.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190108162441.5278-1-miquel.raynal@bootlin.com> References: <20190108162441.5278-1-miquel.raynal@bootlin.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190108_082449_097071_5317A93E X-CRM114-Status: GOOD ( 14.92 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Lorenzo Pieralisi , Antoine Tenart , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Maxime Chevallier , Nadav Haklai , Rob Herring , Miquel Raynal , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add support for a possible external reset GPIO wired to the PCIe endpoint card. Asserting/deasserting the reset line is done during the warm reset because the warm reset operation already triggers the internal reset line that may also reset the endpoint card (if muxed). Signed-off-by: Miquel Raynal --- drivers/pci/controller/pci-aardvark.c | 50 +++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c index cfe48e553bca..3fb14e37eb59 100644 --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c @@ -10,6 +10,7 @@ #include #include +#include #include #include #include @@ -19,6 +20,7 @@ #include #include #include +#include #include #include "../pci.h" @@ -209,6 +211,7 @@ struct advk_pcie { int root_bus_nr; struct pci_bridge_emul bridge; struct phy *phy; + struct gpio_desc *reset_gpio; }; static inline void advk_writel(struct advk_pcie *pcie, u32 val, u64 reg) @@ -249,6 +252,12 @@ static int advk_pcie_wait_for_link(struct advk_pcie *pcie) return -ETIMEDOUT; } +static void advk_pcie_card_reset_assert(struct advk_pcie *pcie, bool status) +{ + if (pcie->reset_gpio) + gpiod_set_value_cansleep(pcie->reset_gpio, status); +} + static void advk_pcie_setup_hw(struct advk_pcie *pcie) { u32 reg; @@ -257,11 +266,13 @@ static void advk_pcie_setup_hw(struct advk_pcie *pcie) reg = advk_readl(pcie, CTRL_WARM_RESET_REG); reg |= CTRL_PCIE_CORE_WARM_RESET | CTRL_PHY_CORE_WARM_RESET | CTRL_PERSTN_GPIO_EN; + advk_pcie_card_reset_assert(pcie, 1); advk_writel(pcie, reg, CTRL_WARM_RESET_REG); reg = advk_readl(pcie, CTRL_WARM_RESET_REG); mdelay(1); reg &= ~(CTRL_PCIE_CORE_WARM_RESET | CTRL_PHY_CORE_WARM_RESET | CTRL_PERSTN_GPIO_EN); + advk_pcie_card_reset_assert(pcie, 0); advk_writel(pcie, reg, CTRL_WARM_RESET_REG); reg = advk_readl(pcie, CTRL_WARM_RESET_REG); mdelay(10); @@ -1073,6 +1084,41 @@ static int advk_pcie_setup_phy(struct advk_pcie *pcie) return ret; } +static int advk_pcie_setup_reset_gpio(struct advk_pcie *pcie) +{ + struct device *dev = &pcie->pdev->dev; + enum of_gpio_flags of_flags; + unsigned long gpio_flags; + int gpio_nb; + int ret; + + gpio_nb = of_get_named_gpio_flags(dev->of_node, "reset-gpios", 0, + &of_flags); + if (gpio_nb == -EPROBE_DEFER) + return gpio_nb; + + /* No all boards use an external GPIO for card reset */ + if (!gpio_is_valid(gpio_nb)) + return 0; + + if (of_flags & OF_GPIO_ACTIVE_LOW) + gpio_flags = GPIOF_ACTIVE_LOW | + GPIOF_OUT_INIT_LOW; + else + gpio_flags = GPIOF_OUT_INIT_HIGH; + + ret = devm_gpio_request_one(dev, gpio_nb, gpio_flags, + "pcie-aardvark-card-reset"); + if (ret) { + dev_err(dev, "Failed to retrieve reset GPIO (%d)\n", ret); + return ret; + } + + pcie->reset_gpio = gpio_to_desc(gpio_nb); + + return 0; +} + static int advk_pcie_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -1116,6 +1162,10 @@ static int advk_pcie_probe(struct platform_device *pdev) if (ret) return ret; + ret = advk_pcie_setup_reset_gpio(pcie); + if (ret) + return ret; + advk_pcie_setup_hw(pcie); advk_sw_pci_bridge_init(pcie);