From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 514BFC433FE for ; Sun, 20 Feb 2022 19:34:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244660AbiBTTet (ORCPT ); Sun, 20 Feb 2022 14:34:49 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:43556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244654AbiBTTeq (ORCPT ); Sun, 20 Feb 2022 14:34:46 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 770B3522F2 for ; Sun, 20 Feb 2022 11:34:25 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1265A60EED for ; Sun, 20 Feb 2022 19:34:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 670B7C340E8; Sun, 20 Feb 2022 19:34:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645385664; bh=/PnS26xChDA5R/YR7kt1XShfm9aDXqQ1PCUmLWPS9NQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p23F61SS/A6CTlR3B8ruMMNQ/J+rEbBDadaEtLw8GomIwF88W90kcvdJoqhGeDORt 1d6IOlKMSqCrZenHzWV3oBkJDTtwXmKfCyveoiBXj9miVTeVvNhHCBDDNTvhSCTixA o6PgEaSclLMoZl2ZLcymvKPKfZCxvzJSd81ch1wX1JGlzspDfcAGEQy0XclaaRSRNI bOdoX665CXsDU4YjqQtvxNbqBJ21w9U9xYQxvVzWiTcZAbGrTK7/2t44+sBV3Zkmwh ugZf2YqzHId3xeDM7FZjhIzvrZcAkmcG1GmnA+hcfrvmTqC2hmV6CqvF6cCW7rCPPe dM6xLFwScRSaw== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Lorenzo Pieralisi , Bjorn Helgaas Cc: =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Marc Zyngier , pali@kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Gregory CLEMENT , Miquel Raynal , =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH 14/18] PCI: aardvark: Add clock support Date: Sun, 20 Feb 2022 20:33:42 +0100 Message-Id: <20220220193346.23789-15-kabel@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220220193346.23789-1-kabel@kernel.org> References: <20220220193346.23789-1-kabel@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org From: Miquel Raynal The IP relies on a gated clock. When we will add S2RAM support, this clock will need to be resumed before any PCIe registers are accessed. Add support for this clock. Signed-off-by: Miquel Raynal Signed-off-by: Pali Rohár Signed-off-by: Marek Behún --- drivers/pci/controller/pci-aardvark.c | 32 +++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c index 41127a26c5bc..3b51f47abd72 100644 --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c @@ -8,6 +8,7 @@ * Author: Hezi Shahmoon */ +#include #include #include #include @@ -297,6 +298,7 @@ struct advk_pcie { struct timer_list link_irq_timer; struct pci_bridge_emul bridge; struct gpio_desc *reset_gpio; + struct clk *clk; struct phy *phy; }; @@ -1813,6 +1815,29 @@ static int advk_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) return of_irq_parse_and_map_pci(dev, slot, pin); } +static int advk_pcie_setup_clk(struct advk_pcie *pcie) +{ + struct device *dev = &pcie->pdev->dev; + int ret; + + pcie->clk = devm_clk_get(dev, NULL); + if (IS_ERR(pcie->clk) && (PTR_ERR(pcie->clk) == -EPROBE_DEFER)) + return PTR_ERR(pcie->clk); + + /* Old bindings miss the clock handle */ + if (IS_ERR(pcie->clk)) { + dev_warn(dev, "Clock unavailable (%ld)\n", PTR_ERR(pcie->clk)); + pcie->clk = NULL; + return 0; + } + + ret = clk_prepare_enable(pcie->clk); + if (ret) + dev_err(dev, "Clock initialization failed (%d)\n", ret); + + return ret; +} + static void advk_pcie_disable_phy(struct advk_pcie *pcie) { phy_power_off(pcie->phy); @@ -1998,6 +2023,10 @@ static int advk_pcie_probe(struct platform_device *pdev) slot_power_limit / 1000, (slot_power_limit / 100) % 10); + ret = advk_pcie_setup_clk(pcie); + if (ret) + return ret; + ret = advk_pcie_setup_phy(pcie); if (ret) return ret; @@ -2126,6 +2155,9 @@ static int advk_pcie_remove(struct platform_device *pdev) /* Disable phy */ advk_pcie_disable_phy(pcie); + /* Disable clock */ + clk_disable_unprepare(pcie->clk); + return 0; } -- 2.34.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5FC3DC433F5 for ; Sun, 20 Feb 2022 19:40:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yRCqHfD8HQIqNOqHdQWn8t3/uxlf1M5dgnBf8mVetMM=; b=IPQdVdXN/xAjGn 8aqc6IM6PeT81u1T0Hemfofrr7EZAIUaYQEz0yW9VZpoa+Ld3aVog4a5M4QooGOGt8yeJ279zd7Fm mCLiUtfWmCvizh6uMjv+kq4yyVgmyx35Gn6Gu+xP7LeeVbikn/BZEhjsgPAX6zHmIAawp+n+EGVvI 6UrMh5UcbphWR4jQ1FWTOGtTKFx5MjloBIGg1isvf+VTqeD3L48/mQDA+ShRLg/i4mn5FHZTOCqdV k7r6U6x9y/TxDiJxNipgtD0c5M+hn5RwzLwzanLLWskObwvL7xJ0BjxzS/TTaWXpnxu8xFMRbixVe 9g6WBktm+wHuSS1VXY2A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nLs3J-002DnJ-HK; Sun, 20 Feb 2022 19:39:25 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nLryV-002BLD-5X for linux-arm-kernel@lists.infradead.org; Sun, 20 Feb 2022 19:34:28 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C6D71B80DBE; Sun, 20 Feb 2022 19:34:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 670B7C340E8; Sun, 20 Feb 2022 19:34:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1645385664; bh=/PnS26xChDA5R/YR7kt1XShfm9aDXqQ1PCUmLWPS9NQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p23F61SS/A6CTlR3B8ruMMNQ/J+rEbBDadaEtLw8GomIwF88W90kcvdJoqhGeDORt 1d6IOlKMSqCrZenHzWV3oBkJDTtwXmKfCyveoiBXj9miVTeVvNhHCBDDNTvhSCTixA o6PgEaSclLMoZl2ZLcymvKPKfZCxvzJSd81ch1wX1JGlzspDfcAGEQy0XclaaRSRNI bOdoX665CXsDU4YjqQtvxNbqBJ21w9U9xYQxvVzWiTcZAbGrTK7/2t44+sBV3Zkmwh ugZf2YqzHId3xeDM7FZjhIzvrZcAkmcG1GmnA+hcfrvmTqC2hmV6CqvF6cCW7rCPPe dM6xLFwScRSaw== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Lorenzo Pieralisi , Bjorn Helgaas Cc: =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Marc Zyngier , pali@kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Gregory CLEMENT , Miquel Raynal , =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH 14/18] PCI: aardvark: Add clock support Date: Sun, 20 Feb 2022 20:33:42 +0100 Message-Id: <20220220193346.23789-15-kabel@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220220193346.23789-1-kabel@kernel.org> References: <20220220193346.23789-1-kabel@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220220_113427_553654_AC01D39A X-CRM114-Status: GOOD ( 16.75 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org RnJvbTogTWlxdWVsIFJheW5hbCA8bWlxdWVsLnJheW5hbEBib290bGluLmNvbT4KClRoZSBJUCBy ZWxpZXMgb24gYSBnYXRlZCBjbG9jay4gV2hlbiB3ZSB3aWxsIGFkZCBTMlJBTSBzdXBwb3J0LCB0 aGlzCmNsb2NrIHdpbGwgbmVlZCB0byBiZSByZXN1bWVkIGJlZm9yZSBhbnkgUENJZSByZWdpc3Rl cnMgYXJlCmFjY2Vzc2VkLiBBZGQgc3VwcG9ydCBmb3IgdGhpcyBjbG9jay4KClNpZ25lZC1vZmYt Ynk6IE1pcXVlbCBSYXluYWwgPG1pcXVlbC5yYXluYWxAYm9vdGxpbi5jb20+ClNpZ25lZC1vZmYt Ynk6IFBhbGkgUm9ow6FyIDxwYWxpQGtlcm5lbC5vcmc+ClNpZ25lZC1vZmYtYnk6IE1hcmVrIEJl aMO6biA8a2FiZWxAa2VybmVsLm9yZz4KLS0tCiBkcml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaS1h YXJkdmFyay5jIHwgMzIgKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAxIGZpbGUgY2hhbmdl ZCwgMzIgaW5zZXJ0aW9ucygrKQoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIv cGNpLWFhcmR2YXJrLmMgYi9kcml2ZXJzL3BjaS9jb250cm9sbGVyL3BjaS1hYXJkdmFyay5jCmlu ZGV4IDQxMTI3YTI2YzViYy4uM2I1MWY0N2FiZDcyIDEwMDY0NAotLS0gYS9kcml2ZXJzL3BjaS9j b250cm9sbGVyL3BjaS1hYXJkdmFyay5jCisrKyBiL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNp LWFhcmR2YXJrLmMKQEAgLTgsNiArOCw3IEBACiAgKiBBdXRob3I6IEhlemkgU2hhaG1vb24gPGhl emkuc2hhaG1vb25AbWFydmVsbC5jb20+CiAgKi8KIAorI2luY2x1ZGUgPGxpbnV4L2Nsay5oPgog I2luY2x1ZGUgPGxpbnV4L2RlbGF5Lmg+CiAjaW5jbHVkZSA8bGludXgvZ3Bpby9jb25zdW1lci5o PgogI2luY2x1ZGUgPGxpbnV4L2ludGVycnVwdC5oPgpAQCAtMjk3LDYgKzI5OCw3IEBAIHN0cnVj dCBhZHZrX3BjaWUgewogCXN0cnVjdCB0aW1lcl9saXN0IGxpbmtfaXJxX3RpbWVyOwogCXN0cnVj dCBwY2lfYnJpZGdlX2VtdWwgYnJpZGdlOwogCXN0cnVjdCBncGlvX2Rlc2MgKnJlc2V0X2dwaW87 CisJc3RydWN0IGNsayAqY2xrOwogCXN0cnVjdCBwaHkgKnBoeTsKIH07CiAKQEAgLTE4MTMsNiAr MTgxNSwyOSBAQCBzdGF0aWMgaW50IGFkdmtfcGNpZV9tYXBfaXJxKGNvbnN0IHN0cnVjdCBwY2lf ZGV2ICpkZXYsIHU4IHNsb3QsIHU4IHBpbikKIAkJcmV0dXJuIG9mX2lycV9wYXJzZV9hbmRfbWFw X3BjaShkZXYsIHNsb3QsIHBpbik7CiB9CiAKK3N0YXRpYyBpbnQgYWR2a19wY2llX3NldHVwX2Ns ayhzdHJ1Y3QgYWR2a19wY2llICpwY2llKQoreworCXN0cnVjdCBkZXZpY2UgKmRldiA9ICZwY2ll LT5wZGV2LT5kZXY7CisJaW50IHJldDsKKworCXBjaWUtPmNsayA9IGRldm1fY2xrX2dldChkZXYs IE5VTEwpOworCWlmIChJU19FUlIocGNpZS0+Y2xrKSAmJiAoUFRSX0VSUihwY2llLT5jbGspID09 IC1FUFJPQkVfREVGRVIpKQorCQlyZXR1cm4gUFRSX0VSUihwY2llLT5jbGspOworCisJLyogT2xk IGJpbmRpbmdzIG1pc3MgdGhlIGNsb2NrIGhhbmRsZSAqLworCWlmIChJU19FUlIocGNpZS0+Y2xr KSkgeworCQlkZXZfd2FybihkZXYsICJDbG9jayB1bmF2YWlsYWJsZSAoJWxkKVxuIiwgUFRSX0VS UihwY2llLT5jbGspKTsKKwkJcGNpZS0+Y2xrID0gTlVMTDsKKwkJcmV0dXJuIDA7CisJfQorCisJ cmV0ID0gY2xrX3ByZXBhcmVfZW5hYmxlKHBjaWUtPmNsayk7CisJaWYgKHJldCkKKwkJZGV2X2Vy cihkZXYsICJDbG9jayBpbml0aWFsaXphdGlvbiBmYWlsZWQgKCVkKVxuIiwgcmV0KTsKKworCXJl dHVybiByZXQ7Cit9CisKIHN0YXRpYyB2b2lkIGFkdmtfcGNpZV9kaXNhYmxlX3BoeShzdHJ1Y3Qg YWR2a19wY2llICpwY2llKQogewogCXBoeV9wb3dlcl9vZmYocGNpZS0+cGh5KTsKQEAgLTE5OTgs NiArMjAyMywxMCBAQCBzdGF0aWMgaW50IGFkdmtfcGNpZV9wcm9iZShzdHJ1Y3QgcGxhdGZvcm1f ZGV2aWNlICpwZGV2KQogCQkJIHNsb3RfcG93ZXJfbGltaXQgLyAxMDAwLAogCQkJIChzbG90X3Bv d2VyX2xpbWl0IC8gMTAwKSAlIDEwKTsKIAorCXJldCA9IGFkdmtfcGNpZV9zZXR1cF9jbGsocGNp ZSk7CisJaWYgKHJldCkKKwkJcmV0dXJuIHJldDsKKwogCXJldCA9IGFkdmtfcGNpZV9zZXR1cF9w aHkocGNpZSk7CiAJaWYgKHJldCkKIAkJcmV0dXJuIHJldDsKQEAgLTIxMjYsNiArMjE1NSw5IEBA IHN0YXRpYyBpbnQgYWR2a19wY2llX3JlbW92ZShzdHJ1Y3QgcGxhdGZvcm1fZGV2aWNlICpwZGV2 KQogCS8qIERpc2FibGUgcGh5ICovCiAJYWR2a19wY2llX2Rpc2FibGVfcGh5KHBjaWUpOwogCisJ LyogRGlzYWJsZSBjbG9jayAqLworCWNsa19kaXNhYmxlX3VucHJlcGFyZShwY2llLT5jbGspOwor CiAJcmV0dXJuIDA7CiB9CiAKLS0gCjIuMzQuMQoKCl9fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fCmxpbnV4LWFybS1rZXJuZWwgbWFpbGluZyBsaXN0CmxpbnV4 LWFybS1rZXJuZWxAbGlzdHMuaW5mcmFkZWFkLm9yZwpodHRwOi8vbGlzdHMuaW5mcmFkZWFkLm9y Zy9tYWlsbWFuL2xpc3RpbmZvL2xpbnV4LWFybS1rZXJuZWwK