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=-14.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS 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 09A4BC433DB for ; Tue, 9 Mar 2021 01:37:18 +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 8A4E7650CB for ; Tue, 9 Mar 2021 01:37:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8A4E7650CB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org 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:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Message-ID:Subject:Cc:To: From:Date:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References:List-Owner; bh=t0v/IP0mSFel+EsQgioRv1p4lia1D5s5NTn59iRvLE4=; b=nErjD6uL9jsbjka/zFzcjVPrk wjJkEbuoasFeihQ5qvsZ1iVM/XL5bGJdX9xTpJDVOyy5Zff8uJwBld1qjavBdhisiOT7dZw2YzFGy DG3QVUBO0c7RqmDCB35/tyOGuuXbzpp0zdotN6rtNORxV5XuDRF4pVheesgFnEvRyQgBBfXspAlTM cUBazyGZcsmAdY7hsM488LAgYXYSaXmA21RTSNY3Z2lkrCvxbuyJ9bQTmXoAKqa8WdyOs5NhoxNBJ IAdehWq9+7xXWPqKCbQd7piurcVFukdOQ6AgMnpiAqFysW4dayV7y1b9cMH//l/qGdm4FphcULc/I yLOLTFKZw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lJRGz-003bCn-CM; Tue, 09 Mar 2021 01:34:58 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lJRGv-003bBu-2v; Tue, 09 Mar 2021 01:34:55 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id B6A33650CB; Tue, 9 Mar 2021 01:34:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615253689; bh=N9DEEHqSHBgZ7+31sSiczhaBg08b9xHQZ6OF+C2d/W8=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=EYhPzqZaIgbsLCun9w6l6lU+tPHQ6B3/XXZD49glBvlioU7kg6/K69MAifpl4pFdB VM8TS7AAHL+JYi/LqYfIRx/JJMK+d4f1yi+dgC4O1UV+/3xugywBbeZ1MyDju4gCKR o8xH0eOOA8CAs1YjBv0MyO2igOrbHNjrG3DRZZH2S2O38PnXANwmdFdtghPLjLoflu rsPjXM65dpEhQZe0AvWRNLhXXp1FIB38JsoNFguXq7Pe58p3DUsvG0s1Dy1v7oQaXW k3RGk567HK8E+Z2yx1F9iJ8GnqSG5C/dNHAsCW9ZlzKB03eim7xtiBn1rG1FptKiib sFB2n6/QoNaKw== Date: Mon, 8 Mar 2021 19:34:47 -0600 From: Bjorn Helgaas To: Jim Quinlan Cc: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , bcm-kernel-feedback-list@broadcom.com, james.quinlan@broadcom.com, Lorenzo Pieralisi , Rob Herring , Bjorn Helgaas , Florian Fainelli , Philipp Zabel , Jim Quinlan , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , open list Subject: Re: [PATCH v4 2/2] nPCI: brcmstb: Use reset/rearm instead of deassert/assert Message-ID: <20210309013447.GA1831980@bjorn-Precision-5520> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210308195037.1503-3-jim2101024@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210309_013453_587081_133686B2 X-CRM114-Status: GOOD ( 21.50 ) 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="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 If you update this, please fix the s/nPCI: /PCI: / in the subject On Mon, Mar 08, 2021 at 02:50:37PM -0500, Jim Quinlan wrote: > 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. You say "also" below, but the paragraph above doesn't tell us the *first* thing this patch does. It just tells us that some chips use "rescal" and that "rescal" implements a "pulse reset". I guess you're replacing reset_control_deassert() with reset_control_reset(), and reset_control_assert() with reset_control_rearm(). It's not obvious to me that those are equivalent or why it's safe to do this for all chips, including those that don't use the "rescal" (since it sounds like only certain chips have that). > 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