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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY,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 ED7BBC43381 for ; Fri, 22 Mar 2019 06:03:07 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 BBB6B213F2 for ; Fri, 22 Mar 2019 06:03:07 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="obce+89u" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BBB6B213F2 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-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=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JqmY/WV+NhwfX7Vp3Xn4GVCzATU0AkvoITRG7cW7jqE=; b=obce+89urpvmjJ yQIlX5hgq06Asb1o+h9w369zp+BKMcz+FMApQ/iRysh/kk+CtTItaKoYG+zR5qRvG27+QjcMA3VDN Gwbfi+KIfZsEMZ3/uDWjQyrPK56NrGp+iFouQ0oMmznAUqIMpwGpiutVgJuutNj6xfdbhswogkKNk pG2bLoNls3QAvYAQ73OvMQNJkvpk/aw/QneEQd8jPpDtQbbPYIcT88maYt5CNXUcBOlWssViXoUVn opZJGdpB/Ud1Bli0PM6KxtXr/BSzgXuoqTvINqkbSSIg1a3IlYLA8zBf3/4fLjtV5BsSPdEKlB3Rw shotZFVMmq9S2H8lg01Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h7DGf-0004T3-CW; Fri, 22 Mar 2019 06:03:01 +0000 Received: from mailgw01.mediatek.com ([216.200.240.184]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h7DGb-0004S4-M7; Fri, 22 Mar 2019 06:02:59 +0000 X-UUID: 5783bd36662146caa0b9344f28c4db6f-20190321 X-UUID: 5783bd36662146caa0b9344f28c4db6f-20190321 Received: from mtkcas67.mediatek.inc [(172.29.193.45)] by mailgw01.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 1174639201; Thu, 21 Mar 2019 22:02:52 -0800 Received: from MTKMBS01DR.mediatek.inc (172.21.101.111) by MTKMBS62DR.mediatek.inc (172.29.94.18) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Thu, 21 Mar 2019 23:02:51 -0700 Received: from MTKCAS06.mediatek.inc (172.21.101.30) by mtkmbs01dr.mediatek.inc (172.21.101.111) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 22 Mar 2019 14:02:49 +0800 Received: from [172.21.77.4] (172.21.77.4) by MTKCAS06.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Fri, 22 Mar 2019 14:02:43 +0800 Message-ID: <1553234563.21474.6.camel@mtksdaap41> Subject: Re: [PATCH v6 1/8] drm/mediatek: recalculate hdmi phy clock of MT2701 by querying hardware From: CK Hu To: wangyan wang Date: Fri, 22 Mar 2019 14:02:43 +0800 In-Reply-To: <1553138590.18216.26.camel@mtksdaap41> References: <20190225020912.29120-1-wangyan.wang@mediatek.com> <20190225020912.29120-2-wangyan.wang@mediatek.com> <1551866854.1001.6.camel@mtksdaap41> <1553138590.18216.26.camel@mtksdaap41> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190321_230257_731633_B80B6110 X-CRM114-Status: GOOD ( 23.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ryder Lee , Philipp Zabel , srv_heupstream@mediatek.com, chunhui dai , Stephen Boyd , Michael Turquette , Sean Wang , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, David Airlie , linux-mediatek@lists.infradead.org, Daniel Vetter , Matthias Brugger , Colin Ian King , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi, Wangyan: On Thu, 2019-03-21 at 11:23 +0800, CK Hu wrote: > Hi, Wangyan: > > On Wed, 2019-03-06 at 18:07 +0800, CK Hu wrote: > > Hi, Wangyan: > > > > On Mon, 2019-02-25 at 10:09 +0800, wangyan wang wrote: > > > From: chunhui dai > > > > > > Recalculate the rate of this clock, by querying hardware. > > > > > > Signed-off-by: chunhui dai > > > Signed-off-by: wangyan wang > > > --- > > > drivers/gpu/drm/mediatek/mtk_hdmi_phy.c | 7 ++---- > > > drivers/gpu/drm/mediatek/mtk_hdmi_phy.h | 3 +-- > > > drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c | 35 ++++++++++++++++++++++++++ > > > drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c | 8 ++++++ > > > 4 files changed, 46 insertions(+), 7 deletions(-) > > > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c b/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c > > > index 4ef9c57ffd44..13c5e65b9ead 100644 > > > --- a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c > > > +++ b/drivers/gpu/drm/mediatek/mtk_hdmi_phy.c > > > @@ -29,12 +29,9 @@ long mtk_hdmi_pll_round_rate(struct clk_hw *hw, unsigned long rate, > > > return rate; > > > } > > > > > > -unsigned long mtk_hdmi_pll_recalc_rate(struct clk_hw *hw, > > > - unsigned long parent_rate) > > > +u32 mtk_hdmi_phy_read(struct mtk_hdmi_phy *hdmi_phy, u32 offset) > > > { > > > - struct mtk_hdmi_phy *hdmi_phy = to_mtk_hdmi_phy(hw); > > > - > > > - return hdmi_phy->pll_rate; > > > + return readl(hdmi_phy->regs + offset); Inside mtk_hdmi_pll_recalc_rate(), there is just one function, why not directly call readl() in the caller function? > > > } > > > > > > void mtk_hdmi_phy_clear_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset, > > > diff --git a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.h b/drivers/gpu/drm/mediatek/mtk_hdmi_phy.h > > > index f39b1fc66612..fdad8b17a915 100644 > > > --- a/drivers/gpu/drm/mediatek/mtk_hdmi_phy.h > > > +++ b/drivers/gpu/drm/mediatek/mtk_hdmi_phy.h > > > @@ -41,6 +41,7 @@ struct mtk_hdmi_phy { > > > unsigned int ibias_up; > > > }; > > > > > > +u32 mtk_hdmi_phy_read(struct mtk_hdmi_phy *hdmi_phy, u32 offset); > > > void mtk_hdmi_phy_clear_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset, > > > u32 bits); > > > void mtk_hdmi_phy_set_bits(struct mtk_hdmi_phy *hdmi_phy, u32 offset, > > > @@ -50,8 +51,6 @@ void mtk_hdmi_phy_mask(struct mtk_hdmi_phy *hdmi_phy, u32 offset, > > > struct mtk_hdmi_phy *to_mtk_hdmi_phy(struct clk_hw *hw); > > > long mtk_hdmi_pll_round_rate(struct clk_hw *hw, unsigned long rate, > > > unsigned long *parent_rate); > > > -unsigned long mtk_hdmi_pll_recalc_rate(struct clk_hw *hw, > > > - unsigned long parent_rate); > > > > > > extern struct platform_driver mtk_hdmi_phy_driver; > > > extern struct mtk_hdmi_phy_conf mtk_hdmi_phy_8173_conf; > > > diff --git a/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c b/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c > > > index fcc42dc6ea7f..b25c9dfc432a 100644 > > > --- a/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c > > > +++ b/drivers/gpu/drm/mediatek/mtk_mt2701_hdmi_phy.c > > > @@ -153,6 +153,41 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, > > > RG_HDMITX_DRV_IBIAS_MASK); > > > return 0; > > > } > > > +static unsigned long mtk_hdmi_pll_recalc_rate(struct clk_hw *hw, > > > + unsigned long parent_rate) > > > +{ > > > + struct mtk_hdmi_phy *hdmi_phy = to_mtk_hdmi_phy(hw); > > > + unsigned long out_rate, val; > > > + > > > + val = (mtk_hdmi_phy_read(hdmi_phy, HDMI_CON6) > > > + & RG_HTPLL_PREDIV_MASK) >> RG_HTPLL_PREDIV; > > > + switch (val) { > > > + case 0x00: > > > + out_rate = parent_rate; > > > + break; > > > + case 0x01: > > > + out_rate = parent_rate / 2; > > > + break; > > > + default: > > > + out_rate = parent_rate / 4; > > > + break; > > > + } > > > + > > > + val = (mtk_hdmi_phy_read(hdmi_phy, HDMI_CON6) > > > + & RG_HTPLL_FBKDIV_MASK) >> RG_HTPLL_FBKDIV; > > > + out_rate *= (val + 1) * 2; > > > + val = (mtk_hdmi_phy_read(hdmi_phy, HDMI_CON2) > > > + & RG_HDMITX_TX_POSDIV_MASK); > > > + > > > + out_rate >>= (val >> RG_HDMITX_TX_POSDIV); > > > + > > > + if (mtk_hdmi_phy_read(hdmi_phy, HDMI_CON2) & RG_HDMITX_EN_TX_POSDIV) > > > + out_rate = out_rate / 5; > > > + > > > > All the register you read here is set in mtk_hdmi_pll_set_rate(), so I > > think you could determine the out_rate in mtk_hdmi_pll_set_rate(). > > As offline discuss, you mention that when > cat /sys/kernel/debug/ckl/clk_summary, mtk_hdmi_pll_recalc_rate() is > called, so read register to get the real clock. The clk_summary call > clk_core_get_rate() to get rate, and clk_core_get_rate() would check the > flag CLK_GET_RATE_NOCACHE to call __clk_recalc_rates(), but mtk_hdmi_phy > does not have this flag, so this function would not be called when > clk_summary. So I still think you could determine the out_rate in > mtk_hdmi_pll_set_rate(). As offline discuss, recalc_rate is defined as follow: * @recalc_rate Recalculate the rate of this clock, by querying hardware. The * parent rate is an input parameter. It is up to the caller to * ensure that the prepare_mutex is held across this call. * Returns the calculated rate. Optional, but recommended - if * this op is not set then clock rate will be initialized to 0. So it looks that recalc_rate is expected to query hardware to get the out_rate. So this implementation is OK. > > Regards, > CK > > > > > Regards, > > CK > > > > > + hdmi_phy->pll_rate = out_rate; I think you don't need to assign hdmi_phy->pll_rate in MT2701 because it's useless in MT2701. Regards, CK > > > + > > > + return hdmi_phy->pll_rate; > > > +} > > > > > > static const struct clk_ops mtk_hdmi_phy_pll_ops = { > > > .prepare = mtk_hdmi_pll_prepare, > > > diff --git a/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c b/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c > > > index ed5916b27658..cb23c1e4692a 100644 > > > --- a/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c > > > +++ b/drivers/gpu/drm/mediatek/mtk_mt8173_hdmi_phy.c > > > @@ -285,6 +285,14 @@ static int mtk_hdmi_pll_set_rate(struct clk_hw *hw, unsigned long rate, > > > return 0; > > > } > > > > > > +static unsigned long mtk_hdmi_pll_recalc_rate(struct clk_hw *hw, > > > + unsigned long parent_rate) > > > +{ > > > + struct mtk_hdmi_phy *hdmi_phy = to_mtk_hdmi_phy(hw); > > > + > > > + return hdmi_phy->pll_rate; > > > +} > > > + > > > static const struct clk_ops mtk_hdmi_phy_pll_ops = { > > > .prepare = mtk_hdmi_pll_prepare, > > > .unprepare = mtk_hdmi_pll_unprepare, > > > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel