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.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 512AAC433DB for ; Mon, 8 Mar 2021 20:10:05 +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 972E265268 for ; Mon, 8 Mar 2021 20:10:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 972E265268 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ideasonboard.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:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: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:List-Owner; bh=pSnc4JbUsIcylgL239u83bKJ8krFtIfNZyyc9Pp+YCc=; b=e1m//zNhnZng+w34So1URhrIg x6/ZgppGduDuSV4OcWoeaYfDSHEv3GZKVkUB9Xm/8NvGWyayQTKNpZWH2g8AgZd3I9xA5ziu+Dux7 EmJpbdddt5JDr9ezdr4D2Ae+EaXKEGg2zXkyhoyfxdawwWZlW1MR3xJphd16GwB6a64wQLoMK8Fhv hWAm8KO+lok2wdiVhNSZUS7Kav1cNOi7gsUD7SsDUM+jiLVg/V2yKz/zvU+t3KM5m9stQIseIhorA EjpcfgF/ELT/GUWvS6sN2VEdqnVZMTOVAzj+T+FHHNqXFRfevA3U/oFisfYfKFsKK35fLWfieW5n0 VZM6XGxTw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lJMA2-002P8s-6y; Mon, 08 Mar 2021 20:07:31 +0000 Received: from perceval.ideasonboard.com ([2001:4b98:dc2:55:216:3eff:fef7:d647]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lJM9o-002P1D-6B for linux-arm-kernel@lists.infradead.org; Mon, 08 Mar 2021 20:07:17 +0000 Received: from pendragon.ideasonboard.com (62-78-145-57.bb.dnainternet.fi [62.78.145.57]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 54C82E7B; Mon, 8 Mar 2021 21:07:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1615234028; bh=GP0ZO73fgCa0N7PUX0082crl8nWyEVV99FkSUPDVM1E=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=XB45rY/P50uxmMn2k/N6sb7d2DNBWe511Q8PeG21e3oyOzHUCPftTFWOWtb0H1g07 wCKPqY5fq8HnroIcjFlv/XvZLXVBQenMT6ri0FiSMlQlYPzswOK3cvaqcUjuGBdEY5 RwV4P542/yv81YYBtx+jIrDJoL4Fo2YNHdaQbZjA= Date: Mon, 8 Mar 2021 22:06:37 +0200 From: Laurent Pinchart To: Manish Narani Cc: anurag.kumar.vulisha@xilinx.com, kishon@ti.com, vkoul@kernel.org, michal.simek@xilinx.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH] phy: zynqmp: Handle the clock enable/disable properly Message-ID: References: <1615229356-26237-1-git-send-email-manish.narani@xilinx.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1615229356-26237-1-git-send-email-manish.narani@xilinx.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210308_200712_853914_15E08E59 X-CRM114-Status: GOOD ( 31.42 ) 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 Hi Manish, Thank you for the patch. On Tue, Mar 09, 2021 at 12:19:16AM +0530, Manish Narani wrote: > The current driver is not handling the clock enable/disable operations > properly. The clocks need to be handled correctly by enabling or > disabling at appropriate places. This patch adds code to handle the > same. > > Signed-off-by: Manish Narani > --- > drivers/phy/xilinx/phy-zynqmp.c | 40 +++++++++++++++++++++++++++++++++++++--- > 1 file changed, 37 insertions(+), 3 deletions(-) > > diff --git a/drivers/phy/xilinx/phy-zynqmp.c b/drivers/phy/xilinx/phy-zynqmp.c > index 2b65f84..0ec534e 100644 > --- a/drivers/phy/xilinx/phy-zynqmp.c > +++ b/drivers/phy/xilinx/phy-zynqmp.c > @@ -219,6 +219,7 @@ struct xpsgtr_dev { > struct mutex gtr_mutex; /* mutex for locking */ > struct xpsgtr_phy phys[NUM_LANES]; > const struct xpsgtr_ssc *refclk_sscs[NUM_LANES]; > + struct clk *clk[NUM_LANES]; > bool tx_term_fix; > unsigned int saved_icm_cfg0; > unsigned int saved_icm_cfg1; > @@ -818,11 +819,15 @@ static struct phy *xpsgtr_xlate(struct device *dev, > static int __maybe_unused xpsgtr_suspend(struct device *dev) > { > struct xpsgtr_dev *gtr_dev = dev_get_drvdata(dev); > + int i; i is never negative, so you can make it an unsigned int. > > /* Save the snapshot ICM_CFG registers. */ > gtr_dev->saved_icm_cfg0 = xpsgtr_read(gtr_dev, ICM_CFG0); > gtr_dev->saved_icm_cfg1 = xpsgtr_read(gtr_dev, ICM_CFG1); > > + for (i = 0; i < ARRAY_SIZE(gtr_dev->clk); i++) > + clk_disable(gtr_dev->clk[i]); Why is this only clk_disable(), and not clk_disable_unprepare() ? Same question for xpsgtr_resume(). > + > return 0; > } > > @@ -832,6 +837,13 @@ static int __maybe_unused xpsgtr_resume(struct device *dev) > unsigned int icm_cfg0, icm_cfg1; > unsigned int i; > bool skip_phy_init; > + int err; > + > + for (i = 0; i < ARRAY_SIZE(gtr_dev->clk); i++) { > + err = clk_enable(gtr_dev->clk[i]); > + if (err) > + return err; In case of error we need to disable the clocks that have been successfully enabled already. > + } > > icm_cfg0 = xpsgtr_read(gtr_dev, ICM_CFG0); > icm_cfg1 = xpsgtr_read(gtr_dev, ICM_CFG1); > @@ -865,6 +877,7 @@ static const struct dev_pm_ops xpsgtr_pm_ops = { > static int xpsgtr_get_ref_clocks(struct xpsgtr_dev *gtr_dev) > { > unsigned int refclk; > + int ret; > > for (refclk = 0; refclk < ARRAY_SIZE(gtr_dev->refclk_sscs); ++refclk) { > unsigned long rate; > @@ -882,6 +895,12 @@ static int xpsgtr_get_ref_clocks(struct xpsgtr_dev *gtr_dev) There's an error check above that needs to jump to err_clk_put too. > if (!clk) > continue; > > + gtr_dev->clk[refclk] = clk; > + > + ret = clk_prepare_enable(gtr_dev->clk[refclk]); > + if (ret) > + return ret; It would be nice to move the driver to runtime PM to keep the clocks disabled when the PHY isn't in use. It can be done in a separate patch. > + > /* > * Get the spread spectrum (SSC) settings for the reference > * clock rate. > @@ -899,11 +918,17 @@ static int xpsgtr_get_ref_clocks(struct xpsgtr_dev *gtr_dev) > dev_err(gtr_dev->dev, > "Invalid rate %lu for reference clock %u\n", > rate, refclk); > - return -EINVAL; > + goto err_clk_put; > } > } > > return 0; > + > +err_clk_put: > + for (refclk = 0; refclk < ARRAY_SIZE(gtr_dev->clk); refclk++) > + clk_disable_unprepare(gtr_dev->clk[refclk]); > + > + return -EINVAL; > } > > static int xpsgtr_probe(struct platform_device *pdev) > @@ -913,6 +938,7 @@ static int xpsgtr_probe(struct platform_device *pdev) > struct phy_provider *provider; > unsigned int port; > int ret; > + int i; unsigned int here too. > > gtr_dev = devm_kzalloc(&pdev->dev, sizeof(*gtr_dev), GFP_KERNEL); > if (!gtr_dev) > @@ -951,7 +977,8 @@ static int xpsgtr_probe(struct platform_device *pdev) > phy = devm_phy_create(&pdev->dev, np, &xpsgtr_phyops); > if (IS_ERR(phy)) { > dev_err(&pdev->dev, "failed to create PHY\n"); > - return PTR_ERR(phy); > + ret = PTR_ERR(phy); > + goto err_clk_put; > } > > gtr_phy->phy = phy; > @@ -962,9 +989,16 @@ static int xpsgtr_probe(struct platform_device *pdev) > provider = devm_of_phy_provider_register(&pdev->dev, xpsgtr_xlate); > if (IS_ERR(provider)) { > dev_err(&pdev->dev, "registering provider failed\n"); > - return PTR_ERR(provider); > + ret = PTR_ERR(provider); > + goto err_clk_put; > } > return 0; > + > +err_clk_put: > + for (i = 0; i < ARRAY_SIZE(gtr_dev->clk); i++) > + clk_disable_unprepare(gtr_dev->clk[i]); > + > + return ret; > } > > static const struct of_device_id xpsgtr_of_match[] = { -- Regards, Laurent Pinchart _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel