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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 74C39D41D70 for ; Tue, 12 Nov 2024 09:01:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:References :In-Reply-To:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=0IIJyT14NGIVAnSJSMpd1AA+5+rhzC3sGEyGeNV+OF4=; b=4DcFhbnQPi+TQb lx9f4uiZ00oBvDHBT1siVNcAamD+/yzi6tM8cHeSWZ9DG9YZLohIA0Som5ydx+gUjgKXwSqkJa1HK YuPlCkBUgwKm3RWgyctXVgjJ14zPA7IYh7znctY3jsQrimzkzDnOFI+5yZI9doNkjKkmTvvaH0zCC m5ckO4gsiJqf/abK/J6JfTgb2h24CreSLEca3sUAbUUlBs5kro/oKm/wDIGnc9GlppJktterBu3zA mBTiCZqxnuZgTkQ71Q/0HsKg64xwtXN3eGQ5AnJmsXF4BfDAZwmwiJmJ3h+kydfppfgpicI+tMbVT ma46ZLWOWM/YEfN18T3Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tAmm5-00000002jtn-0yK6; Tue, 12 Nov 2024 09:01:25 +0000 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tAmln-00000002jqv-3WXi for linux-amlogic@lists.infradead.org; Tue, 12 Nov 2024 09:01:09 +0000 Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-43159c9f617so42424155e9.2 for ; Tue, 12 Nov 2024 01:01:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1731402066; x=1732006866; darn=lists.infradead.org; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=3+TtAQsVgXDwctL5sBfUVcDPzwKUnoyfz2xxI/nsWjs=; b=HVvLW/K2V/hoLSdFn22B8J26ksG9Q0hdyWwynxWdSfKIbljmQMeWMbT73I9Plde3ZS 3oL/5+fXAH3fFlkJdPHVd8xL46AMs1KgDxCeZdXbFp/6bs0ym8Rv04d08G+U25odV+KL Oj3Mbw7sCKbJxgw5bqFi52Iqte1XUO3CKHu22fv2pAffcXg/o42wJSVpSB6+dheXcT9I 2bZhjxqi8/v0ODwXTS9cIRBnH8m6Vkz4BWszVJ+hwCMJAkbsCc3jxTUnP+ixStzmtRf0 x2JwUL8MTPP4Tnv1z11+jmvIH89WiBVDW6nBxQyACwLTJckRNuQEFRV0hPhNr17x1Bgn th5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731402066; x=1732006866; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=3+TtAQsVgXDwctL5sBfUVcDPzwKUnoyfz2xxI/nsWjs=; b=WI0ZqSNyPai3vaEjz/QrMAmxq+CDyduKWPFG2hMZUkmz1B+Cb120xqgMDVfyJuEtWh /6iwMYznGt6SIF9X7Qlt5y1HwBaaGYw3xq0Knbvyu6z6Vs5i3vYGN9HhunrTtPxG4lVh UmYd4J53d+EjaS6jG1EbFPeUb8pJK4kPub82pMhtICDgPG6Ij8W/j66OApCfSWUon9MT /J1O5WUaoP+wE3O9am8MMi0EpdxCevfo3qi0yOruQ4Wp8n9kjv0RtmvtCjIgIP6Fb5W5 tgJzlnXqANrZ9I97O4wO9YiNNu0uDwSFj+UdxJeHeN7wBt5KRGCQZsT5FaS5LkgEzDmF IHzA== X-Forwarded-Encrypted: i=1; AJvYcCXoxy/5P2t1Kf5LHIob+3suLn6QUgNBPTjpbD+2Be3oE4aN1BvQ8eUSua9HACuACA4mYfNBT1YFf3g9b/1s@lists.infradead.org X-Gm-Message-State: AOJu0YxdQhggTXt3baehmG1/xZqHePY2ztqSw86pXVb8eOaXsAHTDChr vrHHGeq4heTMQqTbs4w/oOIEfW2Psm1ZvlRu4YwqNMcraYxN8UVpxJ65tOUivp8= X-Google-Smtp-Source: AGHT+IEA5cfAoCh5Q8+PAz96uymNYJ6xunb785oDm9AKsMKAvU0zwCKrZWHgfv7ZSJ9ItrqqJvbouA== X-Received: by 2002:a05:600c:1f94:b0:431:5ab3:d28d with SMTP id 5b1f17b1804b1-432b75036eemr135759245e9.9.1731402066108; Tue, 12 Nov 2024 01:01:06 -0800 (PST) Received: from localhost ([2a01:e0a:3c5:5fb1:50f9:1df6:c2b9:a468]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-432b054bab8sm199950805e9.16.2024.11.12.01.01.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Nov 2024 01:01:05 -0800 (PST) From: Jerome Brunet To: Chuan Liu via B4 Relay Cc: Neil Armstrong , Michael Turquette , Stephen Boyd , Kevin Hilman , Martin Blumenstingl , Jian Hu , Dmitry Rokosov , Yu Tu , chuan.liu@amlogic.com, linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] clk: meson: Fix children of ro_clk may be tampered with In-Reply-To: <20241111-fix_childclk_of_roclk_has_been_tampered_with-v1-1-f8c1b6ffdcb0@amlogic.com> (Chuan Liu via's message of "Mon, 11 Nov 2024 17:37:28 +0800") References: <20241111-fix_childclk_of_roclk_has_been_tampered_with-v1-1-f8c1b6ffdcb0@amlogic.com> Date: Tue, 12 Nov 2024 10:01:05 +0100 Message-ID: <1jr07g25da.fsf@starbuckisacylon.baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20241112_010107_922767_E15C050A X-CRM114-Status: GOOD ( 26.00 ) X-BeenThere: linux-amlogic@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-amlogic" Errors-To: linux-amlogic-bounces+linux-amlogic=archiver.kernel.org@lists.infradead.org On Mon 11 Nov 2024 at 17:37, Chuan Liu via B4 Relay wrote: > From: Chuan Liu > > When setting the rate of a clock using clk_regmap_divider_ro_ops, the > rate of its children may be tampered with. > > Fixes: 84af914404db ("clk: meson: a1: add Amlogic A1 Peripherals clock controller driver") > Fixes: 87173557d2f6 ("clk: meson: clk-pll: remove od parameters") > Fixes: 085a4ea93d54 ("clk: meson: g12a: add peripheral clock controller") > Fixes: 64aa7008e957 ("clk: meson: add a driver for the Meson8/8b/8m2 DDR clock controller") > Fixes: 57b55c76aaf1 ("clk: meson: S4: add support for Amlogic S4 SoC peripheral clock controller") > Fixes: e787c9c55eda ("clk: meson: S4: add support for Amlogic S4 SoC PLL clock driver") Think about stable trying to pick up this ... > Signed-off-by: Chuan Liu > --- > Background: During the execution of clk_set_rate(), the function > clk_core_round_rate_nolock() is called to calculate the matching rate > and save it to 'core->new_rate'. At the same time, it recalculates and > updates its 'child->newrate'. Finally, clk_change_rate() is called to > set all 'new_rates'. > > In clk_regmap_divider_ro_ops, there is an implementation of > 'determine_rate'. If a clock (name as 'ro_divider') that references > clk_regmap_divider_ro_ops is not configured with CLK_DIVIDER_READ_ONLY, > it will result in the calculation of an incorrect core->new_rate and > potentially tamper with child->newrate, ultimately leading to the > corruption of the rate for 'ro_divider's' children. A slitghtly more simple way to put it, is that ro_ops have the regular determine_rate function, so it can actually alter the rate. That should be in the commit description, not where it will be dropped. Requiring the flag in addition to ro_ops in redundant. Plus, it is not the platform that should be fixed but the divider driver. Just put the content of the CLK_DIVIDER_READ_ONLY if clause into a function, clk_regmap_div_ro_determine_rate(), and use it - directly for ro_ops - under if clause for regular ops. > --- > drivers/clk/meson/a1-peripherals.c | 2 ++ > drivers/clk/meson/axg.c | 5 +++-- > drivers/clk/meson/g12a.c | 23 ++++++++++++++--------- > drivers/clk/meson/gxbb.c | 18 ++++++++++-------- > drivers/clk/meson/meson8-ddr.c | 2 +- > drivers/clk/meson/meson8b.c | 4 +++- > drivers/clk/meson/s4-peripherals.c | 2 ++ > drivers/clk/meson/s4-pll.c | 2 +- > 8 files changed, 36 insertions(+), 22 deletions(-) > > diff --git a/drivers/clk/meson/a1-peripherals.c b/drivers/clk/meson/a1-peripherals.c > index 7aa6abb2eb1f..eedf7c2bf970 100644 > --- a/drivers/clk/meson/a1-peripherals.c > +++ b/drivers/clk/meson/a1-peripherals.c > @@ -266,6 +266,7 @@ static struct clk_regmap sys_b_div = { > .offset = SYS_CLK_CTRL0, > .shift = 16, > .width = 10, > + .flags = CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "sys_b_div", > @@ -314,6 +315,7 @@ static struct clk_regmap sys_a_div = { > .offset = SYS_CLK_CTRL0, > .shift = 0, > .width = 10, > + .flags = CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "sys_a_div", > diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c > index 1b08daf579b2..eb86c4d10046 100644 > --- a/drivers/clk/meson/axg.c > +++ b/drivers/clk/meson/axg.c > @@ -71,7 +71,7 @@ static struct clk_regmap axg_fixed_pll = { > .offset = HHI_MPLL_CNTL, > .shift = 16, > .width = 2, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "fixed_pll", > @@ -130,7 +130,7 @@ static struct clk_regmap axg_sys_pll = { > .offset = HHI_SYS_PLL_CNTL, > .shift = 16, > .width = 2, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "sys_pll", > @@ -471,6 +471,7 @@ static struct clk_regmap axg_mpll_prediv = { > .offset = HHI_MPLL_CNTL5, > .shift = 12, > .width = 1, > + .flags = CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "mpll_prediv", > diff --git a/drivers/clk/meson/g12a.c b/drivers/clk/meson/g12a.c > index d3539fe9f7af..c7c9fdfd021f 100644 > --- a/drivers/clk/meson/g12a.c > +++ b/drivers/clk/meson/g12a.c > @@ -76,7 +76,7 @@ static struct clk_regmap g12a_fixed_pll = { > .offset = HHI_FIX_PLL_CNTL0, > .shift = 16, > .width = 2, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "fixed_pll", > @@ -443,6 +443,7 @@ static struct clk_regmap g12a_cpu_clk_mux1_div = { > .offset = HHI_SYS_CPU_CLK_CNTL0, > .shift = 20, > .width = 6, > + .flags = CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "cpu_clk_dyn1_div", > @@ -627,6 +628,7 @@ static struct clk_regmap g12b_cpub_clk_mux1_div = { > .offset = HHI_SYS_CPUB_CLK_CNTL, > .shift = 20, > .width = 6, > + .flags = CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "cpub_clk_dyn1_div", > @@ -746,6 +748,7 @@ static struct clk_regmap sm1_dsu_clk_mux0_div = { > .offset = HHI_SYS_CPU_CLK_CNTL5, > .shift = 4, > .width = 6, > + .flags = CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "dsu_clk_dyn0_div", > @@ -781,6 +784,7 @@ static struct clk_regmap sm1_dsu_clk_mux1_div = { > .offset = HHI_SYS_CPU_CLK_CNTL5, > .shift = 20, > .width = 6, > + .flags = CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "dsu_clk_dyn1_div", > @@ -1198,7 +1202,7 @@ static struct clk_regmap g12a_cpu_clk_apb_div = { > .offset = HHI_SYS_CPU_CLK_CNTL1, > .shift = 3, > .width = 3, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "cpu_clk_apb_div", > @@ -1232,7 +1236,7 @@ static struct clk_regmap g12a_cpu_clk_atb_div = { > .offset = HHI_SYS_CPU_CLK_CNTL1, > .shift = 6, > .width = 3, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "cpu_clk_atb_div", > @@ -1266,7 +1270,7 @@ static struct clk_regmap g12a_cpu_clk_axi_div = { > .offset = HHI_SYS_CPU_CLK_CNTL1, > .shift = 9, > .width = 3, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "cpu_clk_axi_div", > @@ -1300,7 +1304,7 @@ static struct clk_regmap g12a_cpu_clk_trace_div = { > .offset = HHI_SYS_CPU_CLK_CNTL1, > .shift = 20, > .width = 3, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "cpu_clk_trace_div", > @@ -1736,7 +1740,7 @@ static struct clk_regmap sm1_gp1_pll = { > .shift = 16, > .width = 3, > .flags = (CLK_DIVIDER_POWER_OF_TWO | > - CLK_DIVIDER_ROUND_CLOSEST), > + CLK_DIVIDER_ROUND_CLOSEST | CLK_DIVIDER_READ_ONLY), > }, > .hw.init = &(struct clk_init_data){ > .name = "gp1_pll", > @@ -1999,7 +2003,7 @@ static struct clk_regmap g12a_hdmi_pll_od = { > .offset = HHI_HDMI_PLL_CNTL0, > .shift = 16, > .width = 2, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "hdmi_pll_od", > @@ -2017,7 +2021,7 @@ static struct clk_regmap g12a_hdmi_pll_od2 = { > .offset = HHI_HDMI_PLL_CNTL0, > .shift = 18, > .width = 2, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "hdmi_pll_od2", > @@ -2035,7 +2039,7 @@ static struct clk_regmap g12a_hdmi_pll = { > .offset = HHI_HDMI_PLL_CNTL0, > .shift = 20, > .width = 2, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "hdmi_pll", > @@ -4048,6 +4052,7 @@ static struct clk_regmap g12a_ts_div = { > .offset = HHI_TS_CLK_CNTL, > .shift = 0, > .width = 8, > + .flags = CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "ts_div", > diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c > index 262c318edbd5..e2b419100e0c 100644 > --- a/drivers/clk/meson/gxbb.c > +++ b/drivers/clk/meson/gxbb.c > @@ -131,7 +131,7 @@ static struct clk_regmap gxbb_fixed_pll = { > .offset = HHI_MPLL_CNTL, > .shift = 16, > .width = 2, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "fixed_pll", > @@ -267,7 +267,7 @@ static struct clk_regmap gxbb_hdmi_pll_od = { > .offset = HHI_HDMI_PLL_CNTL2, > .shift = 16, > .width = 2, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "hdmi_pll_od", > @@ -285,7 +285,7 @@ static struct clk_regmap gxbb_hdmi_pll_od2 = { > .offset = HHI_HDMI_PLL_CNTL2, > .shift = 22, > .width = 2, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "hdmi_pll_od2", > @@ -303,7 +303,7 @@ static struct clk_regmap gxbb_hdmi_pll = { > .offset = HHI_HDMI_PLL_CNTL2, > .shift = 18, > .width = 2, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "hdmi_pll", > @@ -321,7 +321,7 @@ static struct clk_regmap gxl_hdmi_pll_od = { > .offset = HHI_HDMI_PLL_CNTL + 8, > .shift = 21, > .width = 2, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "hdmi_pll_od", > @@ -339,7 +339,7 @@ static struct clk_regmap gxl_hdmi_pll_od2 = { > .offset = HHI_HDMI_PLL_CNTL + 8, > .shift = 23, > .width = 2, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "hdmi_pll_od2", > @@ -357,7 +357,7 @@ static struct clk_regmap gxl_hdmi_pll = { > .offset = HHI_HDMI_PLL_CNTL + 8, > .shift = 19, > .width = 2, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "hdmi_pll", > @@ -413,7 +413,7 @@ static struct clk_regmap gxbb_sys_pll = { > .offset = HHI_SYS_PLL_CNTL, > .shift = 10, > .width = 2, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "sys_pll", > @@ -703,6 +703,7 @@ static struct clk_regmap gxbb_mpll_prediv = { > .offset = HHI_MPLL_CNTL5, > .shift = 12, > .width = 1, > + .flags = CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "mpll_prediv", > @@ -911,6 +912,7 @@ static struct clk_regmap gxbb_mpeg_clk_div = { > .offset = HHI_MPEG_CLK_CNTL, > .shift = 0, > .width = 7, > + .flags = CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "mpeg_clk_div", > diff --git a/drivers/clk/meson/meson8-ddr.c b/drivers/clk/meson/meson8-ddr.c > index 4b73ea244b63..950f323072fb 100644 > --- a/drivers/clk/meson/meson8-ddr.c > +++ b/drivers/clk/meson/meson8-ddr.c > @@ -65,7 +65,7 @@ static struct clk_regmap meson8_ddr_pll = { > .offset = AM_DDR_PLL_CNTL, > .shift = 16, > .width = 2, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "ddr_pll", > diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c > index e4b474c5f86c..4dba11c0ab7e 100644 > --- a/drivers/clk/meson/meson8b.c > +++ b/drivers/clk/meson/meson8b.c > @@ -104,7 +104,7 @@ static struct clk_regmap meson8b_fixed_pll = { > .offset = HHI_MPLL_CNTL, > .shift = 16, > .width = 2, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "fixed_pll", > @@ -457,6 +457,7 @@ static struct clk_regmap meson8b_mpll_prediv = { > .offset = HHI_MPLL_CNTL5, > .shift = 12, > .width = 1, > + .flags = CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "mpll_prediv", > @@ -635,6 +636,7 @@ static struct clk_regmap meson8b_mpeg_clk_div = { > .offset = HHI_MPEG_CLK_CNTL, > .shift = 0, > .width = 7, > + .flags = CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "mpeg_clk_div", > diff --git a/drivers/clk/meson/s4-peripherals.c b/drivers/clk/meson/s4-peripherals.c > index c930cf0614a0..470431355e25 100644 > --- a/drivers/clk/meson/s4-peripherals.c > +++ b/drivers/clk/meson/s4-peripherals.c > @@ -175,6 +175,7 @@ static struct clk_regmap s4_sysclk_b_div = { > .offset = CLKCTRL_SYS_CLK_CTRL0, > .shift = 16, > .width = 10, > + .flags = CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "sysclk_b_div", > @@ -221,6 +222,7 @@ static struct clk_regmap s4_sysclk_a_div = { > .offset = CLKCTRL_SYS_CLK_CTRL0, > .shift = 0, > .width = 10, > + .flags = CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "sysclk_a_div", > diff --git a/drivers/clk/meson/s4-pll.c b/drivers/clk/meson/s4-pll.c > index d8e621e79428..5dc051afc06a 100644 > --- a/drivers/clk/meson/s4-pll.c > +++ b/drivers/clk/meson/s4-pll.c > @@ -72,7 +72,7 @@ static struct clk_regmap s4_fixed_pll = { > .offset = ANACTRL_FIXPLL_CTRL0, > .shift = 16, > .width = 2, > - .flags = CLK_DIVIDER_POWER_OF_TWO, > + .flags = CLK_DIVIDER_POWER_OF_TWO | CLK_DIVIDER_READ_ONLY, > }, > .hw.init = &(struct clk_init_data){ > .name = "fixed_pll", > > --- > base-commit: 664988eb47dd2d6ae1d9e4188ec91832562f8f26 > change-id: 20241111-fix_childclk_of_roclk_has_been_tampered_with-61dbcc623746 > > Best regards, -- Jerome _______________________________________________ linux-amlogic mailing list linux-amlogic@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-amlogic