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=-7.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,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 D2A3EC282E3 for ; Fri, 24 May 2019 07:07:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9712320879 for ; Fri, 24 May 2019 07:07:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=st.com header.i=@st.com header.b="OG3jSL1i" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389066AbfEXHHw (ORCPT ); Fri, 24 May 2019 03:07:52 -0400 Received: from mx07-00178001.pphosted.com ([62.209.51.94]:2122 "EHLO mx07-00178001.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388869AbfEXHHw (ORCPT ); Fri, 24 May 2019 03:07:52 -0400 Received: from pps.filterd (m0046037.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x4O71fNu007790; Fri, 24 May 2019 09:07:32 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=st.com; h=subject : to : cc : references : from : message-id : date : mime-version : in-reply-to : content-type : content-transfer-encoding; s=STMicroelectronics; bh=KgYz8lOxNFe9GYsbnWGU1e/GbH4dagg7a0sGq3pqCSE=; b=OG3jSL1iKU0eVTv0A0JLy4hhXLT9kgBxURJsh6RYps7WQY0OPv2F3yHCjBd5uYpg+A4q MEq92hoDZWhCciu1gJ6JFguKPZw8xS/UZUR2sZCMwtsgzo1X0CW2dLb/sAcrXcP6PvZq y3C3Tfkn+L4gg+mqbi9KTMUOErn/K+o6uV/+blIiBPn32JmSbDL/145K00pgVqEUynLa YDJckO8lEiJ5ABs+seAGcDkHfGgV+rFYMybhZJL0bepOURua/3TvwHiWNFXlU7gc4tRk VIELxlOeYGo7reJLqHtRUgdyt6t1olwqaQI2IBdHQ545P1tkx/vbLvhmahllcoY/egAr aQ== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com with ESMTP id 2snrve64ab-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT); Fri, 24 May 2019 09:07:32 +0200 Received: from zeta.dmz-eu.st.com (zeta.dmz-eu.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id C60F34D; Fri, 24 May 2019 07:07:29 +0000 (GMT) Received: from Webmail-eu.st.com (sfhdag3node2.st.com [10.75.127.8]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 8D72315B0; Fri, 24 May 2019 07:07:29 +0000 (GMT) Received: from [10.48.0.204] (10.75.127.49) by SFHDAG3NODE2.st.com (10.75.127.8) with Microsoft SMTP Server (TLS) id 15.0.1347.2; Fri, 24 May 2019 09:07:28 +0200 Subject: Re: [v4, PATCH 2/3] net: stmmac: fix csr_clk can't be zero issue To: Biao Huang , Jose Abreu CC: Giuseppe Cavallaro , Maxime Coquelin , Matthias Brugger , , , , , , , , References: <1558679169-26752-1-git-send-email-biao.huang@mediatek.com> <1558679169-26752-3-git-send-email-biao.huang@mediatek.com> From: Alexandre Torgue Message-ID: <120eba91-6d7f-1365-6b1c-e8365e54136c@st.com> Date: Fri, 24 May 2019 09:07:28 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <1558679169-26752-3-git-send-email-biao.huang@mediatek.com> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [10.75.127.49] X-ClientProxiedBy: SFHDAG6NODE3.st.com (10.75.127.18) To SFHDAG3NODE2.st.com (10.75.127.8) X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-05-24_01:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Biao On 5/24/19 8:26 AM, Biao Huang wrote: > The specific clk_csr value can be zero, and > stmmac_clk is necessary for MDC clock which can be set dynamically. > So, change the condition from plat->clk_csr to plat->stmmac_clk to > fix clk_csr can't be zero issue. > > Fixes: cd7201f477b9 ("stmmac: MDC clock dynamically based on the csr clock input") > Signed-off-by: Biao Huang > --- > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 6 +++--- > .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 5 ++++- > 2 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > index 06487a6..b2feb6c 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > @@ -4380,10 +4380,10 @@ int stmmac_dvr_probe(struct device *device, > * set the MDC clock dynamically according to the csr actual > * clock input. > */ > - if (!priv->plat->clk_csr) > - stmmac_clk_csr_set(priv); > - else > + if (priv->plat->clk_csr >= 0) > priv->clk_csr = priv->plat->clk_csr; > + else > + stmmac_clk_csr_set(priv); > > stmmac_check_pcs_mode(priv); > > diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c > index 3031f2b..f45bfbe 100644 > --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c > +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c > @@ -408,7 +408,10 @@ struct plat_stmmacenet_data * > /* Default to phy auto-detection */ > plat->phy_addr = -1; > > - /* Get clk_csr from device tree */ > + /* Default to get clk_csr from stmmac_clk_crs_set(), > + * or get clk_csr from device tree. > + */ > + plat->clk_csr = -1; > of_property_read_u32(np, "clk_csr", &plat->clk_csr); > > /* "snps,phy-addr" is not a standard property. Mark it as deprecated > Acked-by: Alexandre TORGUE thanks Alex