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 X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 08020C4361B for ; Wed, 16 Dec 2020 21:42:59 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A45FE23603 for ; Wed, 16 Dec 2020 21:42:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A45FE23603 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id: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=tr2VMN6fVidmEH8qGygZlj/4TibIao6RSM7jtW3axH8=; b=wmgPfj6NMjXISAKS3BbzhzFTc6 fJ4IXlMUYSUAMf4QsqkVCMGNPYoMaQgtjMMuFkwF5meFviC2LatmdqPHv+tYnZ3lt21c/at9Hib0z VMszby8/4hpkXZtEb/0/K/lEdmpvML31EIRq1JOzg0543czHYH+n6O9v9NjjMg6lsWrLXW+G4XwXF 8IZ+x1yFoTxXopfxLw9O2es9iZ6iNe0gVaLG2kRaGEpR7TfXjeI6rfZfZEmiy1W2hS3sWMZQZS3BK IXbd1qdR8K+mAtRrGSM4LVXkNFCGWL2W9cPTLqFFQDCcbmxGE6bnzCkvcK43Fft7Mf2LLDnYvEQl4 dzU4vg3g==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kpeYI-0005gM-To; Wed, 16 Dec 2020 21:41:42 +0000 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kpeYF-0005f2-Lh; Wed, 16 Dec 2020 21:41:40 +0000 Received: by mail-pl1-x634.google.com with SMTP id j1so13712206pld.3; Wed, 16 Dec 2020 13:41:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gebM/NY4tNWgCbFYoE1q1n2pn/ZSQVXoyJa8i4huQEA=; b=ZpFwhAYJnQOhYj1DBW6mjhUKcZBOXlH2zUWH77qTM+k+RpdLu/8zybD83BcsmaLI6r vmxaUel8bKoTlV8FmShRwhdvODKqLA/zW8465LYQf2AoZ8KYOX3j0LIMTWnZbpZv2QPV uQ0MkxZKWiJVwcmzXEu13yC+2tLKXj30Mb3JZZr1bgmoBANgsrm3jT4f3DDfOscUWd83 mBMbINTdhwgjEajSUDMKzzJj4m7B0kijTe0cvwCTQu64tVQLWkYpFrsrz3KaC6AXajKn B8+MI3qGApDzo0ATU31U66fQO6u8ddKP0T8h6jrbW1tyWCpXLqiyu+1I/buplOmaG8wm abBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gebM/NY4tNWgCbFYoE1q1n2pn/ZSQVXoyJa8i4huQEA=; b=YsO9VYi0mABveYSHKRKrvxZl80SBw+SqSzi3fK6Zy3tir1QGn43M3OKGZu4sKgPwye XZ3DG+rw58WqqpdNJd1wq64AgKVz2wO3/SO42j7APuewbIkHBHwlHDagtsCOB3JpqMTO n6HgAIxD8H5+s0Se4l0UuzXYtPeFouEkX3JQgVZbQzC8YIEZyMZpOQftb7/AgIQ6XgpH /vZ8Xi3+wyLMd7L0CsXMVNEF7FIl8iVIQDIA5CPJA+G+aR/HJxZD8rq4a0fzJEHXdtc6 rztIEWFIMW+Agx+08ks9XqRsa3BVyyfZwhoxeDR1OKFfaNHD4dEOnlCdgN2Oe3zodtCW 9F0g== X-Gm-Message-State: AOAM531eqI50vHU/XQPTHgo6eH95+3+6EP6FeDRKeD0rd9WwIAh6R2WX qLBKhC6qKvM11As6hG5ZbC8= X-Google-Smtp-Source: ABdhPJxU2B8fjTcmWTWUY6yEypICiX3JcviG8S60c0wlkzRuYMoWGQgdMUmJF+vNJF/AzJBFf+VNxw== X-Received: by 2002:a17:902:7c92:b029:dc:1425:e5af with SMTP id y18-20020a1709027c92b02900dc1425e5afmr5621721pll.3.1608154897573; Wed, 16 Dec 2020 13:41:37 -0800 (PST) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id h12sm3612237pgf.49.2020.12.16.13.41.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Dec 2020 13:41:37 -0800 (PST) From: Jim Quinlan X-Google-Original-From: Jim Quinlan To: Philipp Zabel , Hans de Goede , Jens Axboe , bcm-kernel-feedback-list@broadcom.com, james.quinlan@broadcom.com Subject: [RESEND PATCH v3 2/2] PCI: brcmstb: use reset/rearm instead of deassert/assert Date: Wed, 16 Dec 2020 16:41:05 -0500 Message-Id: <20201216214106.32851-3-james.quinlan@broadcom.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201216214106.32851-1-james.quinlan@broadcom.com> References: <20201216214106.32851-1-james.quinlan@broadcom.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201216_164139_749965_BA1C0557 X-CRM114-Status: GOOD ( 15.98 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , Lorenzo Pieralisi , "open list:PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS" , open list , Florian Fainelli , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , Bjorn Helgaas , Nicolas Saenz Julienne MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The Brcmstb PCIe RC uses a reset control "rescal" for certain chips. This reset implements a "pulse reset" so it matches more the reset/rearm calls instead of the deassert/assert calls. Also, add reset_control calls in suspend/resume functions. Signed-off-by: Jim Quinlan --- drivers/pci/controller/pcie-brcmstb.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c index d41257f43a8f..9f190db4cfcf 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -1127,6 +1127,7 @@ static int brcm_pcie_suspend(struct device *dev) brcm_pcie_turn_off(pcie); ret = brcm_phy_stop(pcie); + reset_control_rearm(pcie->rescal); clk_disable_unprepare(pcie->clk); return ret; @@ -1142,9 +1143,13 @@ static int brcm_pcie_resume(struct device *dev) base = pcie->base; clk_prepare_enable(pcie->clk); + ret = reset_control_reset(pcie->rescal); + if (ret) + goto err0; + ret = brcm_phy_start(pcie); if (ret) - goto err; + goto err1; /* Take bridge out of reset so we can access the SERDES reg */ pcie->bridge_sw_init_set(pcie, 0); @@ -1159,14 +1164,16 @@ static int brcm_pcie_resume(struct device *dev) ret = brcm_pcie_setup(pcie); if (ret) - goto err; + goto err1; if (pcie->msi) brcm_msi_set_regs(pcie->msi); return 0; -err: +err1: + reset_control_rearm(pcie->rescal); +err0: clk_disable_unprepare(pcie->clk); return ret; } @@ -1176,7 +1183,7 @@ static void __brcm_pcie_remove(struct brcm_pcie *pcie) brcm_msi_remove(pcie); brcm_pcie_turn_off(pcie); brcm_phy_stop(pcie); - reset_control_assert(pcie->rescal); + reset_control_rearm(pcie->rescal); clk_disable_unprepare(pcie->clk); } @@ -1251,13 +1258,13 @@ static int brcm_pcie_probe(struct platform_device *pdev) return PTR_ERR(pcie->rescal); } - ret = reset_control_deassert(pcie->rescal); + ret = reset_control_reset(pcie->rescal); if (ret) dev_err(&pdev->dev, "failed to deassert 'rescal'\n"); ret = brcm_phy_start(pcie); if (ret) { - reset_control_assert(pcie->rescal); + reset_control_rearm(pcie->rescal); clk_disable_unprepare(pcie->clk); return ret; } -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel