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=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 1CD29C43381 for ; Fri, 12 Mar 2021 20:47:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D471F64F4F for ; Fri, 12 Mar 2021 20:47:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235039AbhCLUqz (ORCPT ); Fri, 12 Mar 2021 15:46:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234990AbhCLUq3 (ORCPT ); Fri, 12 Mar 2021 15:46:29 -0500 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5A5A9C061574; Fri, 12 Mar 2021 12:46:29 -0800 (PST) Received: by mail-pj1-x102f.google.com with SMTP id nh23-20020a17090b3657b02900c0d5e235a8so11645364pjb.0; Fri, 12 Mar 2021 12:46:29 -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=S1RYFyHGpmuSBGVIKtF2cRB9Rxzfh1Zoo7ktedPdj8k=; b=OfLEhdslmGxo+bf0qx9JW1v1Ahu1izq8hxueThidOekrhcwQdNDNnpG0oR9jbskhCn qtb+ouMqjIA78dC1ABjMCAWI5gX+9YqPlmUALycYdMf4kwzju1QxLcgrWbcFdImRueWZ D+jx/VBsZAY7FhXdBWPaJr9QTY6gHULzkbY4+MS+SczGW+Iqbjs6pOMAMTXj/7vfsFaI L+dujKdHxCRr2RMRI+favzmJAtJbzKLEMXsGza3sbyRtGqn9D+m/zVBf1xZeI5/bOJlf I5Hnf01xXcs+Ig9CKqF+57JWwbKajfIxmA39dCxr9SX/dWAReF6jQ1Fqevgo9WXBt6y4 jplw== 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=S1RYFyHGpmuSBGVIKtF2cRB9Rxzfh1Zoo7ktedPdj8k=; b=SHUki64fRf42YkML9lYA4j4ClOoRYlgF2GEhVBHW3au4eHzewgd8LOXSADkUfZ7OC1 m/h7pImdT0WkG5YWJh9k6mO09e9fUDI8TuWJDj3VVn31LyjC+p/BXNXqBi7rIZdlB1hd zuJ6PraExiJ6uYhd321va1MEJmFQpY+L/o4UL1UlwhTMnCShzhGbbyYpEh6EYAp4fZaU xlr8d3pM7dImCM1UUCzxpq3dVVcMkjaU/JOdTdcvRgHzz9UwlV7U11it10Aw7Ks/VRZP Oy6ZBhYV4AUWnjEIUgH5nRvvBmggz+81CSthyz4VykJZ+4lw8z3O41918dIPsbWq1B/U jEjA== X-Gm-Message-State: AOAM533kxO1Aw+WLIPTqh2Qcsm65Ymu8haGn1EakTkmvgLykc7lGZ9CH +Js0mfOKZNeGKXGfIUUo091GV2L/q2I= X-Google-Smtp-Source: ABdhPJypoqz4Lq9DD5u+edyaYE5Ubq0+FVoG46J90KrJU59Cjl56/OUESzzqONi5G+pU7jP1qDWj4w== X-Received: by 2002:a17:90a:31cf:: with SMTP id j15mr110751pjf.41.1615581988954; Fri, 12 Mar 2021 12:46:28 -0800 (PST) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id i22sm2959613pjz.56.2021.03.12.12.46.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 12:46:28 -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 v5 2/2] PCI: brcmstb: Use reset/rearm instead of deassert/assert Date: Fri, 12 Mar 2021 15:45:55 -0500 Message-Id: <20210312204556.5387-3-jim2101024@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210312204556.5387-1-jim2101024@gmail.com> References: <20210312204556.5387-1-jim2101024@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Broadcom STB PCIe RC uses a reset control "rescal" for certain chips. The "rescal" implements a "pulse reset" so using assert/deassert is wrong for this device. Instead, we use reset/rearm. We need to use rearm so that we can reset it after a suspend/resume cycle; w/o using "rearm", the "rescal" device will only ever fire once. Of course for suspend/resume to work we also need to put the reset/rearm calls in the suspend and resume routines. 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..3b35d629035e 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 err_disable_clk; + ret = brcm_phy_start(pcie); if (ret) - goto err; + goto err_reset; /* 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 err_reset; if (pcie->msi) brcm_msi_set_regs(pcie->msi); return 0; -err: +err_reset: + reset_control_rearm(pcie->rescal); +err_disable_clk: 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 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 96379C433E6 for ; Fri, 12 Mar 2021 20:50:50 +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 B0ACD64F80 for ; Fri, 12 Mar 2021 20:50:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B0ACD64F80 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=J8z3/TOAD0t3M39fh0fUHeghqX25QjzJEzaB180jzPA=; b=jnZBiEc1vuk+t/1vC5uNZzRop2 zMkrFA8LKx/Clxm6B2rjm15vqXFF/KNYmOGyREwTtGWJYLrz7dAmXq606t8BArrQ9xa367hh82P3T R5ZREO/kssdJFUkA/odBH3ebrvYwoiPvhcVYsNE/c6b3YApxAYIAk4mYIVq2ahFE2lpgjlMQO7LuF NQeUyh79/PwVGYqHGkzx6a63ChLXJI6ibNIM13g2wru9dhsASKy/sfaCDNsciH5U+2kcpqJqKaY6E +uPPLEQmbCbiOAZWZ6trAKns8SAwgAzUJvQ2xvriAvkvBsLM7OIAe3x/i39gsKSvAW6ccjY7aoEU7 wKx1/8XA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lKoiR-00CNba-D6; Fri, 12 Mar 2021 20:48:59 +0000 Received: from mail-pj1-x1034.google.com ([2607:f8b0:4864:20::1034]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lKog2-00CNGv-Bt; Fri, 12 Mar 2021 20:46:57 +0000 Received: by mail-pj1-x1034.google.com with SMTP id kr3-20020a17090b4903b02900c096fc01deso11635689pjb.4; Fri, 12 Mar 2021 12:46:30 -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=S1RYFyHGpmuSBGVIKtF2cRB9Rxzfh1Zoo7ktedPdj8k=; b=OfLEhdslmGxo+bf0qx9JW1v1Ahu1izq8hxueThidOekrhcwQdNDNnpG0oR9jbskhCn qtb+ouMqjIA78dC1ABjMCAWI5gX+9YqPlmUALycYdMf4kwzju1QxLcgrWbcFdImRueWZ D+jx/VBsZAY7FhXdBWPaJr9QTY6gHULzkbY4+MS+SczGW+Iqbjs6pOMAMTXj/7vfsFaI L+dujKdHxCRr2RMRI+favzmJAtJbzKLEMXsGza3sbyRtGqn9D+m/zVBf1xZeI5/bOJlf I5Hnf01xXcs+Ig9CKqF+57JWwbKajfIxmA39dCxr9SX/dWAReF6jQ1Fqevgo9WXBt6y4 jplw== 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=S1RYFyHGpmuSBGVIKtF2cRB9Rxzfh1Zoo7ktedPdj8k=; b=QKuXDoc/Dz34tMTE+fNBiJyibR6COrq6CHIlB185CS+HJLq0ris9ECqh46UTX4DU3i E4FSYF7mLzbDIhi+X8uQNTZ1oiTIt+6NRri6YkBzdaiEYTUq4eYMSmqt0ZWSn9WDjw9n dDHfs2HM1VwNfVrHrzbtsotVofGaqLGhPXjT65vm5PbYQC6ns9eX5e51zqh5yMkrSEyI 4fVtMBNDPMMzUdUegk2Q+Vgk2xTAbHFA/aQk0VCxtGWMy8ejjexvJYb1xozxC1+kYgpJ eCUvgd7R2BvWdtjgbiiM9yrC/5OWKwzhBdfvJhAhVQqfNzGhLbdRaDP0X2jdcv3bdG8m Rq0w== X-Gm-Message-State: AOAM531pvzJVlP1oZEnrodjGTaxI6aySpfp6v0WkJ56eBxHoiQHbuLuG YjgVnhnSBNOPzX3483Kc/3I= X-Google-Smtp-Source: ABdhPJypoqz4Lq9DD5u+edyaYE5Ubq0+FVoG46J90KrJU59Cjl56/OUESzzqONi5G+pU7jP1qDWj4w== X-Received: by 2002:a17:90a:31cf:: with SMTP id j15mr110751pjf.41.1615581988954; Fri, 12 Mar 2021 12:46:28 -0800 (PST) Received: from stbsrv-and-01.and.broadcom.net ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id i22sm2959613pjz.56.2021.03.12.12.46.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Mar 2021 12:46:28 -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 v5 2/2] PCI: brcmstb: Use reset/rearm instead of deassert/assert Date: Fri, 12 Mar 2021 15:45:55 -0500 Message-Id: <20210312204556.5387-3-jim2101024@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210312204556.5387-1-jim2101024@gmail.com> References: <20210312204556.5387-1-jim2101024@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210312_204635_952811_1209AE64 X-CRM114-Status: GOOD ( 13.89 ) 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 Broadcom STB PCIe RC uses a reset control "rescal" for certain chips. The "rescal" implements a "pulse reset" so using assert/deassert is wrong for this device. Instead, we use reset/rearm. We need to use rearm so that we can reset it after a suspend/resume cycle; w/o using "rearm", the "rescal" device will only ever fire once. Of course for suspend/resume to work we also need to put the reset/rearm calls in the suspend and resume routines. 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..3b35d629035e 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 err_disable_clk; + ret = brcm_phy_start(pcie); if (ret) - goto err; + goto err_reset; /* 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 err_reset; if (pcie->msi) brcm_msi_set_regs(pcie->msi); return 0; -err: +err_reset: + reset_control_rearm(pcie->rescal); +err_disable_clk: 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