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=-16.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 D4FE5C433E3 for ; Fri, 26 Mar 2021 20:32:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CB0B561A0D for ; Fri, 26 Mar 2021 20:32:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230204AbhCZUbW (ORCPT ); Fri, 26 Mar 2021 16:31:22 -0400 Received: from mail.kernel.org ([198.145.29.99]:43692 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230174AbhCZUbH (ORCPT ); Fri, 26 Mar 2021 16:31:07 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8B69E61A0D; Fri, 26 Mar 2021 20:31:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616790666; bh=4sFgh402bJa1V+KKITowOoaqjf68udlldNqx7lLArHw=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=IFtqc0uvWV/YIYVDlZkMUetISgaDx0kNW2DHdO77M5yEfR0uKdmwSHI9uc6QaWXF1 8s2Dggbm40/8A7Cttp/pK6ZrscFSBQnMwc86o9QxV2m4xEjgd5SOAbVdsf19ER4d+o xtrCRavMZ9YfinYRCdd7lp9hKWh3ICBF91Ot4oz9rNIeYJcKSD90q0ovAYrWOeAS0u gvP+XTxaYzwF+5JBz78xc6hMpE4G0i1guLqSlPfDkQ76wETk6gV5QPf3TUvKEuXK+q skpNbaD7e0PqhjP+VLDDvFlAugH/Tpmqi8YXUoclwmEqDKW7PUyQeb5Fa1pnIWC2+j QCUeOyRPz9byQ== Date: Fri, 26 Mar 2021 15:31:05 -0500 From: Bjorn Helgaas To: Jim Quinlan , '@bjorn-Precision-5520 Cc: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Rob Herring , Mark Brown , bcm-kernel-feedback-list@broadcom.com, james.quinlan@broadcom.com, Lorenzo Pieralisi , Bjorn Helgaas , Florian Fainelli , Jim Quinlan , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , open list Subject: Re: [PATCH v3 6/6] PCI: brcmstb: Check return value of clk_prepare_enable() Message-ID: <20210326203105.GA906530@bjorn-Precision-5520> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210326191906.43567-7-jim2101024@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Mar 26, 2021 at 03:19:04PM -0400, Jim Quinlan wrote: > The check was missing on PCIe resume. "PCIe resume" isn't really a thing, per se. PCI/PCIe gives us device power states (D0, D3hot, etc), and Linux power management builds suspend/resume on top of those. Maybe: Check for failure of clk_prepare_enable() on device resume. > Signed-off-by: Jim Quinlan > Acked-by: Florian Fainelli > Fixes: 8195b7417018 ("PCI: brcmstb: Add suspend and resume pm_ops") > --- > drivers/pci/controller/pcie-brcmstb.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > index 2d9288399014..f6d9d785b301 100644 > --- a/drivers/pci/controller/pcie-brcmstb.c > +++ b/drivers/pci/controller/pcie-brcmstb.c > @@ -1396,7 +1396,9 @@ static int brcm_pcie_resume(struct device *dev) > int ret; > > base = pcie->base; > - clk_prepare_enable(pcie->clk); > + ret = clk_prepare_enable(pcie->clk); > + if (ret) > + return ret; This fix doesn't look like it depends on the EP regulator support. Maybe it should be a preparatory patch before patch 1/6? It could then easily be backported to kernels that contain 8195b7417018 but not EP regulator support. > ret = brcm_set_regulators(pcie, TURN_ON); > if (ret) > @@ -1535,7 +1537,9 @@ static int brcm_pcie_probe(struct platform_device *pdev) > > ret = brcm_pcie_get_regulators(pcie); > if (ret) { > - dev_err(pcie->dev, "failed to get regulators (err=%d)\n", ret); > + pcie->num_supplies = 0; > + if (ret != -EPROBE_DEFER) > + dev_err(pcie->dev, "failed to get regulators (err=%d)\n", ret); Looks like this hunk might belong somewhere else, e.g., in patch 2/6? The "Fixes:" line suggests that this patch could/should be backported to every kernel that contains 8195b7417018, but 8195b7417018 doesn't have pcie->num_supplies. > goto fail; > } > > -- > 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=-14.2 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,URIBL_BLOCKED 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 66E1EC433C1 for ; Fri, 26 Mar 2021 20:33:03 +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 20FDB61A10 for ; Fri, 26 Mar 2021 20:33:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 20FDB61A10 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=B5jtsVyHJt5LfIZKVSmfBewrbCXGTLbfJ/jb/2rvW0c=; b=QlCNCAQUFL7jYgHw6lsRHF+Uv 0v/yya8ecLMgzGBN0QCJjc6c6OWl/d54rhlOeAH/Jw/U+SL0YfEqx50JaeovxvaN/7CF2pMLsKs+R KEOeLPvRCEeu7YmxR5uW3607acJCmepSYeFW34gicg9VyFCqyUN0YO11dx483CFARLnQld2aNV77n lPfCNSYPDiqrh0shqbJ7+aVAZNiV/CM5x3/++9TWOwIkwvAc8zH2FoBo22n+i40/mWHlbGL9AdZXZ OdsXbiPW3RONMFnqQVofQ3ylerDeJtmNeZlylMzcucAM3b+oYpFHr0AmmS7uTeaObJ/ok3+d7bGT6 AlXUzz9UQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lPt6u-004JiZ-K3; Fri, 26 Mar 2021 20:31:12 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lPt6q-004Ji9-Gq; Fri, 26 Mar 2021 20:31:10 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 8B69E61A0D; Fri, 26 Mar 2021 20:31:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1616790666; bh=4sFgh402bJa1V+KKITowOoaqjf68udlldNqx7lLArHw=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=IFtqc0uvWV/YIYVDlZkMUetISgaDx0kNW2DHdO77M5yEfR0uKdmwSHI9uc6QaWXF1 8s2Dggbm40/8A7Cttp/pK6ZrscFSBQnMwc86o9QxV2m4xEjgd5SOAbVdsf19ER4d+o xtrCRavMZ9YfinYRCdd7lp9hKWh3ICBF91Ot4oz9rNIeYJcKSD90q0ovAYrWOeAS0u gvP+XTxaYzwF+5JBz78xc6hMpE4G0i1guLqSlPfDkQ76wETk6gV5QPf3TUvKEuXK+q skpNbaD7e0PqhjP+VLDDvFlAugH/Tpmqi8YXUoclwmEqDKW7PUyQeb5Fa1pnIWC2+j QCUeOyRPz9byQ== Date: Fri, 26 Mar 2021 15:31:05 -0500 From: Bjorn Helgaas To: Jim Quinlan , '@bjorn-Precision-5520 Cc: linux-pci@vger.kernel.org, Nicolas Saenz Julienne , Rob Herring , Mark Brown , bcm-kernel-feedback-list@broadcom.com, james.quinlan@broadcom.com, Lorenzo Pieralisi , Bjorn Helgaas , Florian Fainelli , Jim Quinlan , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , "moderated list:BROADCOM BCM2711/BCM2835 ARM ARCHITECTURE" , open list Subject: Re: [PATCH v3 6/6] PCI: brcmstb: Check return value of clk_prepare_enable() Message-ID: <20210326203105.GA906530@bjorn-Precision-5520> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210326191906.43567-7-jim2101024@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210326_203108_887198_4D8908C4 X-CRM114-Status: GOOD ( 20.17 ) 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 On Fri, Mar 26, 2021 at 03:19:04PM -0400, Jim Quinlan wrote: > The check was missing on PCIe resume. "PCIe resume" isn't really a thing, per se. PCI/PCIe gives us device power states (D0, D3hot, etc), and Linux power management builds suspend/resume on top of those. Maybe: Check for failure of clk_prepare_enable() on device resume. > Signed-off-by: Jim Quinlan > Acked-by: Florian Fainelli > Fixes: 8195b7417018 ("PCI: brcmstb: Add suspend and resume pm_ops") > --- > drivers/pci/controller/pcie-brcmstb.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/drivers/pci/controller/pcie-brcmstb.c b/drivers/pci/controller/pcie-brcmstb.c > index 2d9288399014..f6d9d785b301 100644 > --- a/drivers/pci/controller/pcie-brcmstb.c > +++ b/drivers/pci/controller/pcie-brcmstb.c > @@ -1396,7 +1396,9 @@ static int brcm_pcie_resume(struct device *dev) > int ret; > > base = pcie->base; > - clk_prepare_enable(pcie->clk); > + ret = clk_prepare_enable(pcie->clk); > + if (ret) > + return ret; This fix doesn't look like it depends on the EP regulator support. Maybe it should be a preparatory patch before patch 1/6? It could then easily be backported to kernels that contain 8195b7417018 but not EP regulator support. > ret = brcm_set_regulators(pcie, TURN_ON); > if (ret) > @@ -1535,7 +1537,9 @@ static int brcm_pcie_probe(struct platform_device *pdev) > > ret = brcm_pcie_get_regulators(pcie); > if (ret) { > - dev_err(pcie->dev, "failed to get regulators (err=%d)\n", ret); > + pcie->num_supplies = 0; > + if (ret != -EPROBE_DEFER) > + dev_err(pcie->dev, "failed to get regulators (err=%d)\n", ret); Looks like this hunk might belong somewhere else, e.g., in patch 2/6? The "Fixes:" line suggests that this patch could/should be backported to every kernel that contains 8195b7417018, but 8195b7417018 doesn't have pcie->num_supplies. > goto fail; > } > > -- > 2.17.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel