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 60A94C3F6B0 for ; Thu, 18 Aug 2022 13:52:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245305AbiHRNv7 (ORCPT ); Thu, 18 Aug 2022 09:51:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47134 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S245294AbiHRNv6 (ORCPT ); Thu, 18 Aug 2022 09:51:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DFD2E61128 for ; Thu, 18 Aug 2022 06:51:57 -0700 (PDT) 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 73E10615FB for ; Thu, 18 Aug 2022 13:51:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4456DC433D7; Thu, 18 Aug 2022 13:51:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660830716; bh=YOHpPreByGGoyZO9gaJvQCWGWwT25levFv1BixvDFn4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FljnI6DlzFT8ISKS5JMRv1+4awZwKejh4pnHTboWu6jaznWiXI91rnAOU9LAvCaPz 9bmQ6tKn7oSOTt/r9wqutoVYaUlU2kdPYaZOOxZGuZpHgPzr7eXBEXTFiUW0cnD9Ts OeGztvl37+8/lDNsUg/ikmsc9462O4Xpq8GKwddUYgAJxVuf+y0793criBIGZwWKw6 OtQGurMWybu9LVNYXFDHege+j5WrwOXMLlOWZSdiwInSxq6rbuy45a7UE8xkkMhdvU WPoLX94fpq87zPCm/URbaTC0oewdqmi7bdFRDKBwpA4HYAFeRrm12a6+dCdw1P7YOc A/Ex9YrRnU50w== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Lorenzo Pieralisi , Bjorn Helgaas Cc: =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , pali@kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Miquel Raynal , =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH 06/11] PCI: aardvark: Add clock support Date: Thu, 18 Aug 2022 15:51:35 +0200 Message-Id: <20220818135140.5996-7-kabel@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220818135140.5996-1-kabel@kernel.org> References: <20220818135140.5996-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 03e318bc171f..3beafc893969 100644 --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c @@ -9,6 +9,7 @@ */ #include +#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; }; @@ -1809,6 +1811,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); @@ -2000,6 +2025,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; @@ -2122,6 +2151,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.35.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 B37A1C00140 for ; Thu, 18 Aug 2022 14:03:10 +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=7m4eBqhAh08ce+LtdjFGTcKzyh850WLmWyxYnUeuAck=; b=CH6SoUJJGD2nqx yboolM2KMIRnXxVcmw+7moreuQG/wYbUzuaJt3xGtQpsyPK2fcqqQhzkhA7dxvXq5+fwFqso16RBd EmKWK7LuKdmqEOPXPaqEUirlrOwvrG+D/tByUrd6NegWQzxf1ScrX6EIcVvv1Zd8LW4o3beb3UHTI crcx7hFy32kECOTc3FIf2J2Bu7oX5XlfQ6oDm8msAKJ7nSM5pMrMNwVV0lE4VXi2oOkBPUEWB1a6U g0cGqX0DmtIKd4nStEBelk605YQPO3iJwVRtgYq5NmSARCqsWuraJmGjledbV7162wJrctY/8ZkRn lbleic1Bd7cpXWJvc4IA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOg5u-005ofx-Go; Thu, 18 Aug 2022 14:01:58 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oOfwE-005iTi-JH for linux-arm-kernel@lists.infradead.org; Thu, 18 Aug 2022 13:52:00 +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 3451AB8219D; Thu, 18 Aug 2022 13:51:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4456DC433D7; Thu, 18 Aug 2022 13:51:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660830716; bh=YOHpPreByGGoyZO9gaJvQCWGWwT25levFv1BixvDFn4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FljnI6DlzFT8ISKS5JMRv1+4awZwKejh4pnHTboWu6jaznWiXI91rnAOU9LAvCaPz 9bmQ6tKn7oSOTt/r9wqutoVYaUlU2kdPYaZOOxZGuZpHgPzr7eXBEXTFiUW0cnD9Ts OeGztvl37+8/lDNsUg/ikmsc9462O4Xpq8GKwddUYgAJxVuf+y0793criBIGZwWKw6 OtQGurMWybu9LVNYXFDHege+j5WrwOXMLlOWZSdiwInSxq6rbuy45a7UE8xkkMhdvU WPoLX94fpq87zPCm/URbaTC0oewdqmi7bdFRDKBwpA4HYAFeRrm12a6+dCdw1P7YOc A/Ex9YrRnU50w== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Lorenzo Pieralisi , Bjorn Helgaas Cc: =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , pali@kernel.org, linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Miquel Raynal , =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH 06/11] PCI: aardvark: Add clock support Date: Thu, 18 Aug 2022 15:51:35 +0200 Message-Id: <20220818135140.5996-7-kabel@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220818135140.5996-1-kabel@kernel.org> References: <20220818135140.5996-1-kabel@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220818_065158_994174_02909577 X-CRM114-Status: GOOD ( 17.43 ) 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 ZGV4IDAzZTMxOGJjMTcxZi4uM2JlYWZjODkzOTY5IDEwMDY0NAotLS0gYS9kcml2ZXJzL3BjaS9j b250cm9sbGVyL3BjaS1hYXJkdmFyay5jCisrKyBiL2RyaXZlcnMvcGNpL2NvbnRyb2xsZXIvcGNp LWFhcmR2YXJrLmMKQEAgLTksNiArOSw3IEBACiAgKi8KIAogI2luY2x1ZGUgPGxpbnV4L2JpdGZp ZWxkLmg+CisjaW5jbHVkZSA8bGludXgvY2xrLmg+CiAjaW5jbHVkZSA8bGludXgvZGVsYXkuaD4K ICNpbmNsdWRlIDxsaW51eC9ncGlvL2NvbnN1bWVyLmg+CiAjaW5jbHVkZSA8bGludXgvaW50ZXJy dXB0Lmg+CkBAIC0yOTcsNiArMjk4LDcgQEAgc3RydWN0IGFkdmtfcGNpZSB7CiAJc3RydWN0IHRp bWVyX2xpc3QgbGlua19pcnFfdGltZXI7CiAJc3RydWN0IHBjaV9icmlkZ2VfZW11bCBicmlkZ2U7 CiAJc3RydWN0IGdwaW9fZGVzYyAqcmVzZXRfZ3BpbzsKKwlzdHJ1Y3QgY2xrICpjbGs7CiAJc3Ry dWN0IHBoeSAqcGh5OwogfTsKIApAQCAtMTgwOSw2ICsxODExLDI5IEBAIHN0YXRpYyBpbnQgYWR2 a19wY2llX21hcF9pcnEoY29uc3Qgc3RydWN0IHBjaV9kZXYgKmRldiwgdTggc2xvdCwgdTggcGlu KQogCQlyZXR1cm4gb2ZfaXJxX3BhcnNlX2FuZF9tYXBfcGNpKGRldiwgc2xvdCwgcGluKTsKIH0K IAorc3RhdGljIGludCBhZHZrX3BjaWVfc2V0dXBfY2xrKHN0cnVjdCBhZHZrX3BjaWUgKnBjaWUp Cit7CisJc3RydWN0IGRldmljZSAqZGV2ID0gJnBjaWUtPnBkZXYtPmRldjsKKwlpbnQgcmV0Owor CisJcGNpZS0+Y2xrID0gZGV2bV9jbGtfZ2V0KGRldiwgTlVMTCk7CisJaWYgKElTX0VSUihwY2ll LT5jbGspICYmIChQVFJfRVJSKHBjaWUtPmNsaykgPT0gLUVQUk9CRV9ERUZFUikpCisJCXJldHVy biBQVFJfRVJSKHBjaWUtPmNsayk7CisKKwkvKiBPbGQgYmluZGluZ3MgbWlzcyB0aGUgY2xvY2sg aGFuZGxlICovCisJaWYgKElTX0VSUihwY2llLT5jbGspKSB7CisJCWRldl93YXJuKGRldiwgIkNs b2NrIHVuYXZhaWxhYmxlICglbGQpXG4iLCBQVFJfRVJSKHBjaWUtPmNsaykpOworCQlwY2llLT5j bGsgPSBOVUxMOworCQlyZXR1cm4gMDsKKwl9CisKKwlyZXQgPSBjbGtfcHJlcGFyZV9lbmFibGUo cGNpZS0+Y2xrKTsKKwlpZiAocmV0KQorCQlkZXZfZXJyKGRldiwgIkNsb2NrIGluaXRpYWxpemF0 aW9uIGZhaWxlZCAoJWQpXG4iLCByZXQpOworCisJcmV0dXJuIHJldDsKK30KKwogc3RhdGljIHZv aWQgYWR2a19wY2llX2Rpc2FibGVfcGh5KHN0cnVjdCBhZHZrX3BjaWUgKnBjaWUpCiB7CiAJcGh5 X3Bvd2VyX29mZihwY2llLT5waHkpOwpAQCAtMjAwMCw2ICsyMDI1LDEwIEBAIHN0YXRpYyBpbnQg YWR2a19wY2llX3Byb2JlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJCQkgc2xvdF9w b3dlcl9saW1pdCAvIDEwMDAsCiAJCQkgKHNsb3RfcG93ZXJfbGltaXQgLyAxMDApICUgMTApOwog CisJcmV0ID0gYWR2a19wY2llX3NldHVwX2NsayhwY2llKTsKKwlpZiAocmV0KQorCQlyZXR1cm4g cmV0OworCiAJcmV0ID0gYWR2a19wY2llX3NldHVwX3BoeShwY2llKTsKIAlpZiAocmV0KQogCQly ZXR1cm4gcmV0OwpAQCAtMjEyMiw2ICsyMTUxLDkgQEAgc3RhdGljIGludCBhZHZrX3BjaWVfcmVt b3ZlKHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCiAJLyogRGlzYWJsZSBwaHkgKi8KIAlh ZHZrX3BjaWVfZGlzYWJsZV9waHkocGNpZSk7CiAKKwkvKiBEaXNhYmxlIGNsb2NrICovCisJY2xr X2Rpc2FibGVfdW5wcmVwYXJlKHBjaWUtPmNsayk7CisKIAlyZXR1cm4gMDsKIH0KIAotLSAKMi4z NS4xCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KbGlu dXgtYXJtLWtlcm5lbCBtYWlsaW5nIGxpc3QKbGludXgtYXJtLWtlcm5lbEBsaXN0cy5pbmZyYWRl YWQub3JnCmh0dHA6Ly9saXN0cy5pbmZyYWRlYWQub3JnL21haWxtYW4vbGlzdGluZm8vbGludXgt YXJtLWtlcm5lbAo=