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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4633DCCA47B for ; Tue, 12 Jul 2022 01:11:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230435AbiGLBLL (ORCPT ); Mon, 11 Jul 2022 21:11:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36476 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229633AbiGLBLJ (ORCPT ); Mon, 11 Jul 2022 21:11:09 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A6C92AE2D; Mon, 11 Jul 2022 18:11:01 -0700 (PDT) X-UUID: 1c10ff92a9794e58b73b293aa83f8d9e-20220712 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.8,REQID:5be57030-041f-43e8-b8de-830f453f1e96,OB:0,LO B:0,IP:0,URL:0,TC:0,Content:0,EDM:0,RT:0,SF:0,FILE:0,RULE:Release_Ham,ACTI ON:release,TS:0 X-CID-META: VersionHash:0f94e32,CLOUDID:7dd50164-0b3f-4b2c-b3a6-ed5c044366a0,C OID:IGNORED,Recheck:0,SF:nil,TC:nil,Content:0,EDM:-3,IP:nil,URL:0,File:nil ,QS:nil,BEC:nil,COL:0 X-UUID: 1c10ff92a9794e58b73b293aa83f8d9e-20220712 Received: from mtkexhb01.mediatek.inc [(172.21.101.102)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1317145924; Tue, 12 Jul 2022 09:10:56 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.15; Tue, 12 Jul 2022 09:10:54 +0800 Received: from mhfsdcap04 (10.17.3.154) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 12 Jul 2022 09:10:53 +0800 Message-ID: <5b0a5dca4605dcebb01d38494f1b413038bcb169.camel@mediatek.com> Subject: Re: [PATCH net v3] stmmac: dwmac-mediatek: fix clock issue From: Biao Huang To: Matthias Brugger , David Miller CC: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "Eric Dumazet" , Jakub Kicinski , "Paolo Abeni" , Maxime Coquelin , AngeloGioacchino Del Regno , , , , , , Date: Tue, 12 Jul 2022 09:10:53 +0800 In-Reply-To: <78beb398-01ed-400e-e79c-0bcdcbc279d0@gmail.com> References: <20220708083937.27334-1-biao.huang@mediatek.com> <20220708083937.27334-2-biao.huang@mediatek.com> <14bf5e6b-4230-fffc-4134-c3015cf4d262@gmail.com> <410b8c62ea399b51c11021c4838bd6a62d542703.camel@mediatek.com> <78beb398-01ed-400e-e79c-0bcdcbc279d0@gmail.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.28.5-0ubuntu0.18.04.2 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Dear Matthias, Thanks for your comments. On Fri, 2022-07-08 at 13:37 +0200, Matthias Brugger wrote: > Hi Biao Huang, > > On 08/07/2022 11:46, Biao Huang wrote: > > Dear Mattias, > > Thanks for your comments. > > > > On Fri, 2022-07-08 at 11:22 +0200, Matthias Brugger wrote: > > > > > > On 08/07/2022 10:39, Biao Huang wrote: > > > > Since clocks are handled in mediatek_dwmac_clks_config(), > > > > remove the clocks configuration in init()/exit(), and > > > > invoke mediatek_dwmac_clks_config instead. > > > > > > > > This issue is found in suspend/resume test. > > > > > > > > > > Commit message is rather confusing. Basically you are moving the > > > clock enable > > > into probe instead of init and remove it from exit. That means, > > > clocks get > > > enabled earlier and don't get disabled if the module gets > > > unloaded. > > > That doesn't > > > sound correct, I think we would at least need to disable the > > > clocks > > > in remove > > > function. > > > > there is pm_runtime support in driver, and clocks will be > > disabled/enabled in stmmac_runtime_suspend/stmmac_runtime_resume. > > > > stmmac_dvr_probe() invoke pm_runtime_put(device) at the end, and > > disable clocks, but no clock enable at the beginning. > > so vendor's probe entry should enable clocks to ensure normal > > behavior. > > > > As to clocks in remove function, we did not test it > > We should implement a vendor specified remove function who will > > take > > care of clocks rather than invoke stmmac_pltfr_remove directly. > > > > Anyway, we miss the clock handling case in remove function, > > and will > > test it and feed back. > > Right, sorry I'm not familiar with the stmmac driver stack, yes > suspend/resume > is fine. Thanks for clarification. > > stmmac_pltfr_remove will disable stmmac_clk and pclk but not the rest > of the > clocks. So I think you will need to have specific remove function to > disable them. Yes, I'll rewrite the commit message and test remove function, if need any modification, will add them in next send. Best Regards! Biao > > > > > > > I suppose that suspend calls exit and that there was a problem > > > when > > > we disable > > > the clocks there. Is this a HW issue that has no other possible > > > fix? > > > > Not a HW issue. suspend/resume will disable/enable clocks by > > invoking > > stmmac_pltfr_noirq_suspend/stmmac_pltfr_noirq_resume --> > > pm_runtime_force_suspend/pm_runtime_force_resume--> > > mediatek_dwmac_clks_config, so old clock handling in init/exit is > > no > > longer a proper choice. > > > > Got it, thanks for clarification. > > Best regards, > Matthias > > > Best Regards! > > Biao > > > > > > > > Regards, > > > Matthias > > > > > > > Fixes: 3186bdad97d5 ("stmmac: dwmac-mediatek: add platform > > > > level > > > > clocks management") > > > > Signed-off-by: Biao Huang > > > > --- > > > > .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 36 +++++-- > > > > ------- > > > > ----- > > > > 1 file changed, 9 insertions(+), 27 deletions(-) > > > > > > > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac- > > > > mediatek.c > > > > b/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c > > > > index 6ff88df58767..e86f3e125cb4 100644 > > > > --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c > > > > +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c > > > > @@ -576,32 +576,7 @@ static int mediatek_dwmac_init(struct > > > > platform_device *pdev, void *priv) > > > > } > > > > } > > > > > > > > - ret = clk_bulk_prepare_enable(variant->num_clks, plat- > > > > >clks); > > > > - if (ret) { > > > > - dev_err(plat->dev, "failed to enable clks, err > > > > = %d\n", > > > > ret); > > > > - return ret; > > > > - } > > > > - > > > > - ret = clk_prepare_enable(plat->rmii_internal_clk); > > > > - if (ret) { > > > > - dev_err(plat->dev, "failed to enable rmii > > > > internal clk, > > > > err = %d\n", ret); > > > > - goto err_clk; > > > > - } > > > > - > > > > return 0; > > > > - > > > > -err_clk: > > > > - clk_bulk_disable_unprepare(variant->num_clks, plat- > > > > >clks); > > > > - return ret; > > > > -} > > > > - > > > > -static void mediatek_dwmac_exit(struct platform_device *pdev, > > > > void > > > > *priv) > > > > -{ > > > > - struct mediatek_dwmac_plat_data *plat = priv; > > > > - const struct mediatek_dwmac_variant *variant = plat- > > > > >variant; > > > > - > > > > - clk_disable_unprepare(plat->rmii_internal_clk); > > > > - clk_bulk_disable_unprepare(variant->num_clks, plat- > > > > >clks); > > > > } > > > > > > > > static int mediatek_dwmac_clks_config(void *priv, bool > > > > enabled) > > > > @@ -643,7 +618,6 @@ static int > > > > mediatek_dwmac_common_data(struct > > > > platform_device *pdev, > > > > plat->addr64 = priv_plat->variant->dma_bit_mask; > > > > plat->bsp_priv = priv_plat; > > > > plat->init = mediatek_dwmac_init; > > > > - plat->exit = mediatek_dwmac_exit; > > > > plat->clks_config = mediatek_dwmac_clks_config; > > > > if (priv_plat->variant->dwmac_fix_mac_speed) > > > > plat->fix_mac_speed = priv_plat->variant- > > > > > dwmac_fix_mac_speed; > > > > > > > > @@ -712,13 +686,21 @@ static int mediatek_dwmac_probe(struct > > > > platform_device *pdev) > > > > mediatek_dwmac_common_data(pdev, plat_dat, priv_plat); > > > > mediatek_dwmac_init(pdev, priv_plat); > > > > > > > > + ret = mediatek_dwmac_clks_config(priv_plat, true); > > > > + if (ret) > > > > + return ret; > > > > + > > > > ret = stmmac_dvr_probe(&pdev->dev, plat_dat, > > > > &stmmac_res); > > > > if (ret) { > > > > stmmac_remove_config_dt(pdev, plat_dat); > > > > - return ret; > > > > + goto err_drv_probe; > > > > } > > > > > > > > return 0; > > > > + > > > > +err_drv_probe: > > > > + mediatek_dwmac_clks_config(priv_plat, false); > > > > + return ret; > > > > } > > > > > > > > static const struct of_device_id mediatek_dwmac_match[] = {