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 B424EC433E0 for ; Mon, 8 Mar 2021 19:52:37 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 51E4964F11 for ; Mon, 8 Mar 2021 19:52:37 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 51E4964F11 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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id: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=XqNfLWs24a41L1h2h3AoHExd6lA3dXweLs2b30pQ+GQ=; b=MYMlP0pteVSEeLlzOnve61jy9P VS0N1JjS3Z04AeHuZS3Y+ha/ZZfwuLSCfqJSBrzUoqzRCKrojgCy8KKYnD6u0Gf0B5DTPcwwyntjT suTfb7t+Yr0VNSY5rJDNApesFkjm70z7GxrW1NTjSrC6knjCO0plHhqygkZK1RYFLj5xxsdF66Z6O vzmeQRrMmj1pxBPx7HT42o2W0Tkvx98oBr8g6WplhClkR3KVf7hmsgtac51Wu4i9DcoSkM7rZQPQL zmtrF5Movtma1tV9JNN/Iv7n+/0NIxCFzlREkiBXeVYugQ6tInlW3MTVqI/7vYd6rPEbIc9ZA8lFR P5JIl4hg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lJLuN-002EIa-Q8; Mon, 08 Mar 2021 19:51:16 +0000 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lJLuH-002EFX-St; Mon, 08 Mar 2021 19:51:11 +0000 Received: by mail-pg1-x52c.google.com with SMTP id o38so7099079pgm.9; Mon, 08 Mar 2021 11:51:09 -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=/+NBgR0Z5yrS58Bggiyd+j9wPJr74kCoUvf/RIiAgNk=; b=VM+pM5Dcl/Ls/N16ob7UqRP/K3ZdK0Gz1OCS3pfu8zz+1tggjbucQBuzhb34V9vLQ2 ZUnATgMwO54XP714nNsBW3TaCZL5jOvO85yYLfvXGy4LXzshDuSnsso1PLS0NUGErNg+ ZWSocLsViJ+AsSS8NtfXOr1+eAbehhHNRzUzOtU9NQD3T7v5CX7/X6waDQcCmFJRG9hF 9uuX7PAaCHiEpBsmsxCCt6nnLyS4fPqr+4u86Fdlijf5rFx/dPw4Ig0HXLenk0NeVRYr mRg2VrfLLszbhgYQuSj17EJMlnUwgemW4KF2xXJM+D2BN+hc4iGYIG2kqQKmr9CwMaiu A0+w== 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=/+NBgR0Z5yrS58Bggiyd+j9wPJr74kCoUvf/RIiAgNk=; b=BYlODmhaCAyN7H6iaJPN+DCO/jM6QMkwoh3eIfAjbVhw+Hl0X/WhTl4y2AJmAs1NgW IwOcH/+K93ddi8uVhc8+w4RlCoLj30Z6Dsmg24SjiIrmbiEQlirb9NMbKqoFVlClrTtd RrALvf2hIN0kTbXzQ0pTTgvpzZqXfT+nbFazWY/g+S+oaMvpPmM+OaR+EmnUrh+ZWSRx Qv3yApS4qXATN9gQMiTPjCYLl7b9pmnbtnt8Fml8wQy3/LWgsbAhuc8cEc+XytSH1cvl nVKz9Xtd66yTfytMjDZBNhdyGnRQRjUwOl7rmvDxhRNY8ufzbEhd4gWgPe4YZ3hnblwZ La+A== X-Gm-Message-State: AOAM533x8ntdH7I+zrn4FFRS6qB7+MIF4cW21sO34n5cQJuhEzUDU4Kk 3B4syide7RICDcTIxg+5+EQ= X-Google-Smtp-Source: ABdhPJzmKRDABDycNrQRPTO6rfvDsYszgYqz5VbgomS4l3y3yE9pGPvE7GSmZF/hJU3ZtQZQF0JA4A== X-Received: by 2002:a63:225f:: with SMTP id t31mr13774607pgm.371.1615233068431; Mon, 08 Mar 2021 11:51:08 -0800 (PST) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id y1sm64685pjr.3.2021.03.08.11.51.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 11:51:07 -0800 (PST) From: Jim Quinlan To: Bjorn Helgaas , linux-pci@vger.kernel.org, Nicolas Saenz Julienne , bcm-kernel-feedback-list@broadcom.com, james.quinlan@broadcom.com, jim2101024@gmail.com Cc: Lorenzo Pieralisi , Rob Herring , Bjorn Helgaas , Florian Fainelli , Philipp Zabel , Jim Quinlan , linux-rpi-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v4 2/2] nPCI: brcmstb: Use reset/rearm instead of deassert/assert Date: Mon, 8 Mar 2021 14:50:37 -0500 Message-Id: <20210308195037.1503-3-jim2101024@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210308195037.1503-1-jim2101024@gmail.com> References: <20210308195037.1503-1-jim2101024@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210308_195110_135332_0AA3F049 X-CRM114-Status: GOOD ( 13.37 ) 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: , 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. Fixes: 740d6c3708a9 ("PCI: brcmstb: Add control of rescal reset") Signed-off-by: Jim Quinlan Acked-by: Florian Fainelli --- 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 e330e6811f0b..18f23cba7e3a 100644 --- a/drivers/pci/controller/pcie-brcmstb.c +++ b/drivers/pci/controller/pcie-brcmstb.c @@ -1148,6 +1148,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; @@ -1163,9 +1164,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); @@ -1180,14 +1185,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; } @@ -1197,7 +1204,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); } @@ -1278,13 +1285,13 @@ static int brcm_pcie_probe(struct platform_device *pdev) return PTR_ERR(pcie->perst_reset); } - 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