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 4AFEAC433EF for ; Wed, 13 Jul 2022 12:11:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236358AbiGMMLt (ORCPT ); Wed, 13 Jul 2022 08:11:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60158 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231236AbiGMMLr (ORCPT ); Wed, 13 Jul 2022 08:11:47 -0400 Received: from mail-qt1-x82f.google.com (mail-qt1-x82f.google.com [IPv6:2607:f8b0:4864:20::82f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AC4CF8940; Wed, 13 Jul 2022 05:11:46 -0700 (PDT) Received: by mail-qt1-x82f.google.com with SMTP id x11so561734qtv.9; Wed, 13 Jul 2022 05:11:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :cc:references:from:in-reply-to:content-transfer-encoding; bh=mQ/hcGr/I/V5gOxH9+3HtKc0WRnaD95esCjmTcO4bQ0=; b=FojwuT6sStHpE+uVYaLsaIIQad4I8HewXV7sDZTXbpuvLEXufIWG1ufnuRB4cMYyrz kPOha1HctNi444O/CECbg2EoAhrjZmGgxNVFHD7lVLdK/PjolGofJE+qgGrOlW1woIlQ JYGpYoVSxSjDrFE5ImvMQW+sEj+hNdRAYU6+/EU7ibVtPwJOake8jcjZ5xTfPSsdChIZ rfKZQzXtJzQlYU821MXv/QWkkZhUhL5xT/bTMvVhfQeeO9MCgoXK8WnblnnfdxOagYex G8U5s7/vMXpdFqGlPBx6CZMa0+adjTZHfVn/kHN+8qI4SM8geqkQmo8uZnFT0urSGFo/ XVMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=mQ/hcGr/I/V5gOxH9+3HtKc0WRnaD95esCjmTcO4bQ0=; b=kf7yp358dOyBP8VJ7S129L2zvY0KlXQ9gypSqUKXkpHGdwFPPgfpC474bDGypjXTeJ lFFGxOPOwkZ/N4N7ngf+T8zJk0m9BGxxfffNV4JUR91iImfDxbQxE4kNyWbDYoLNcwql VAV1DVpKgS11bEmQeZwYkEaGbbA64R9lG9Vw07Wpkr6Cfq06/m+xJj2pbTHuyG+s/pNP VYN46ooJZ0yuFxfwOPZe9La0e8CGXM2fQ5EiJn/u3uIIVDKnvwV9S0MwIMfFDT+ZXA3a FgV9M2nQYTifhZLAUVQ2cG75cxltkkgP7t+FkB7VESc7rylIE6JVB6u5eISkEKfxWa8a j0ow== X-Gm-Message-State: AJIora9McBVIO5ul3NNsBxgjM0ZYCm7PCOkFbPqmBuA23FIm7pKHTCUY 7Fp0MxANbhDvhjoSFqzCe3A= X-Google-Smtp-Source: AGRyM1tQvQdoyjFYZfS1liJSgb+wrsI4bYFX7V+tmV4z8j3UvfsmISCnmKU2aLt9KbpEZgAIYIuBuQ== X-Received: by 2002:ac8:5cd3:0:b0:316:f772:f0b8 with SMTP id s19-20020ac85cd3000000b00316f772f0b8mr2587700qta.162.1657714305566; Wed, 13 Jul 2022 05:11:45 -0700 (PDT) Received: from [192.168.43.228] ([193.86.92.180]) by smtp.gmail.com with ESMTPSA id h13-20020a05620a400d00b006b5bbd8cb92sm630846qko.55.2022.07.13.05.11.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 Jul 2022 05:11:44 -0700 (PDT) Message-ID: Date: Wed, 13 Jul 2022 14:11:39 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.11.0 Subject: Re: [PATCH net v4 1/3] stmmac: dwmac-mediatek: fix clock issue Content-Language: en-US To: Biao Huang , David Miller Cc: Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Maxime Coquelin , AngeloGioacchino Del Regno , netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, macpaul.lin@mediatek.com, Jisheng Zhang , Mohammad Athari Bin Ismail References: <20220713101002.10970-1-biao.huang@mediatek.com> <20220713101002.10970-2-biao.huang@mediatek.com> From: Matthias Brugger In-Reply-To: <20220713101002.10970-2-biao.huang@mediatek.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 13/07/2022 12:10, Biao Huang wrote: > The pm_runtime takes care of the clock handling in current > stmmac drivers, and dwmac-mediatek implement the > mediatek_dwmac_clks_config() as the callback for pm_runtime. > > Then, stripping duplicated clocks handling in old init()/exit() > to fix clock issue in suspend/resume test. > > As to clocks in probe/remove, vendor need symmetric handling to > ensure clocks balance. > > Test pass, including suspend/resume and ko insertion/remove. > > Fixes: 3186bdad97d5 ("stmmac: dwmac-mediatek: add platform level clocks management") > Signed-off-by: Biao Huang > --- > .../ethernet/stmicro/stmmac/dwmac-mediatek.c | 49 ++++++++----------- > 1 file changed, 21 insertions(+), 28 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-mediatek.c > index 6ff88df58767..ca8ab290013c 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,32 @@ 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 int mediatek_dwmac_remove(struct platform_device *pdev) > +{ > + struct mediatek_dwmac_plat_data *priv_plat = get_stmmac_bsp_priv(&pdev->dev); > + int ret; > + > + ret = stmmac_pltfr_remove(pdev); > + mediatek_dwmac_clks_config(priv_plat, false); > + We enalbe the clocks after calling stmmac_probe_config_dt(), so we should disable them before calling stmmac_pltfr_remove(), correct? Other then that: Reviewed-by: Matthias Brugger > + return ret; > } > > static const struct of_device_id mediatek_dwmac_match[] = { > @@ -733,7 +726,7 @@ MODULE_DEVICE_TABLE(of, mediatek_dwmac_match); > > static struct platform_driver mediatek_dwmac_driver = { > .probe = mediatek_dwmac_probe, > - .remove = stmmac_pltfr_remove, > + .remove = mediatek_dwmac_remove, > .driver = { > .name = "dwmac-mediatek", > .pm = &stmmac_pltfr_pm_ops,