Received-SPF: pass (google.com: domain of linux-kernel+bounces-177348-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Peng Fan <peng.fan@nxp.com>
To: Sascha Hauer <s.hauer@pengutronix.de>, "Peng Fan (OSS)"
	<peng.fan@oss.nxp.com>
CC: Abel Vesa <abelvesa@kernel.org>, Michael Turquette
	<mturquette@baylibre.com>, Stephen Boyd <sboyd@kernel.org>, Shawn Guo
	<shawnguo@kernel.org>, Pengutronix Kernel Team <kernel@pengutronix.de>, Fabio
 Estevam <festevam@gmail.com>, Jacky Bai <ping.bai@nxp.com>, Ye Li
	<ye.li@nxp.com>, Aisheng Dong <aisheng.dong@nxp.com>,
	"linux-clk@vger.kernel.org" <linux-clk@vger.kernel.org>,
	"imx@lists.linux.dev" <imx@lists.linux.dev>,
	"linux-arm-kernel@lists.infradead.org"
	<linux-arm-kernel@lists.infradead.org>, "linux-kernel@vger.kernel.org"
	<linux-kernel@vger.kernel.org>, Abel Vesa <abel.vesa@linaro.org>
Subject: RE: [PATCH v2 01/17] clk: imx: composite-8m: Enable gate clk with
 mcore_booted
Thread-Topic: [PATCH v2 01/17] clk: imx: composite-8m: Enable gate clk with
 mcore_booted
Thread-Index: AQHaorn/IJcAguxNukGP/b7YV5Q9pbGUuy4AgAAe3+A=
Date: Mon, 13 May 2024 08:31:22 +0000
Message-ID:
 <DU0PR04MB941709208F206C9CADF320A288E22@DU0PR04MB9417.eurprd04.prod.outlook.com>
References: <20240510-imx-clk-v2-0-c998f315d29c@nxp.com>
 <20240510-imx-clk-v2-1-c998f315d29c@nxp.com>
 <ZkG1put2k33K4c_b@pengutronix.de>
In-Reply-To: <ZkG1put2k33K4c_b@pengutronix.de>
Accept-Language: en-US
Content-Language: en-US
x-ms-exchange-antispam-messagedata-chunkcount: 1
x-ms-exchange-antispam-messagedata-0:
 =?us-ascii?Q?n1r7v8NLsws1KuvMBUJbtfB1lr5u2z/r577dUfzdwYlDXvtH4JvvvBBteE95?=
 =?us-ascii?Q?0ZF+5ApYc4UR8M+x4xMjGELy06KGaJURroXvzx+z4RyPyFBfJpNWEAiIfjCT?=
 =?us-ascii?Q?Z5bqAbmgb0ARXOsaf0IPeaLLL2OLrZ5q8RNMwS6z8ogDLvgXNSNWteV7zpcv?=
 =?us-ascii?Q?Wf/WktDI0IJCl35c70MItP7nr2kensutqH+WY3rXItG+/geDZgFQQR415msG?=
 =?us-ascii?Q?XlgaUCqjcWxQLVLpg7tqEtKwu/QDhfGmKycOwOEThSsouu0UQVpJBiulxGu4?=
 =?us-ascii?Q?8/BtFz9aVn+Cw9TeLqzH9I07biFbKl+urKBxUH+7hVGvkG1t5sj60dkB9Pkl?=
 =?us-ascii?Q?eQQfewIVmlkZnP/dzYSm9HmKsuiSGnAC8B2RbIcbcdSXMBBGrOxEKxdPCZtu?=
 =?us-ascii?Q?iug5+ZDefMClPgaU6LjFt9u/PbpM/pf4wSQsLu9z9qlEbnQGy6fIWXF8+xYj?=
 =?us-ascii?Q?k+cKhXRsXf37s0eLD2Qn8A9gflTcq1r/RuyZ99tUsXXEAXfDRd2Do9cTDW2F?=
 =?us-ascii?Q?h7j1BM73ktL7/GddcpmlwzQHSy9SLfJyaHd+uRMDDuO//aSU+BSKdXI1UM+a?=
 =?us-ascii?Q?1xbj1uAnYd53kxhuTisDAFZJe+bdcCaIx/9qP0JgMIsV+4sTSVe8vKO+CLwY?=
 =?us-ascii?Q?zt5kQOjVuE+GS3XWyGvhhICqgGCU+Wd5ftK2dV7FH81aJVpxhFVqkf7ovxAc?=
 =?us-ascii?Q?vCQa3G2QU7D3xmdf44DDYQSZqaq/IbnxV1N+RYdG+YD//AmIqhI/ays7x/LX?=
 =?us-ascii?Q?OZXmns7ZV7yAQZw/B0RZPysBqgBD8YXMfZ5jMqTmqb6AxBMiECF1U6CdS9RT?=
 =?us-ascii?Q?ZPkV1fQJX7sGu5kPL5zWbtCMkIXeyjj7UEV8KgO3hcuoh0MYw2oPhfJr4dW4?=
 =?us-ascii?Q?iDJ6+sVedgbQoEEequxrgNdeRmnXU1tWUoGOV5wbif8geP+vFg0zgjLf6N5x?=
 =?us-ascii?Q?ZaU8KVVVLy+G3gMCpyjFbT0YOYK6lULiF3NU1cHkBpsSE1k5H3TPKTNrEmNz?=
 =?us-ascii?Q?VermrfEzSgqRBOdSTXDYkPoPUGXrV0QNlb5BekzjeVhJITx1ZX5qwT+U/iiV?=
 =?us-ascii?Q?vbV/8BnqIrNWM+tCfrnnUkA+kkUsIzehYXL979D579MQTXpp4OPo5U66tLpG?=
 =?us-ascii?Q?55VmSBqNH6UbVuxWc7SZQ0YSCOaNs2bNs+0D27/aWPzxXBD/+AZBjSSTdzK4?=
 =?us-ascii?Q?qM/uXK4ma9Y5bu7b65MC/sfwQieJf7gz6xDMvFWK+nc5LHV5tWxdTG1CHSZk?=
 =?us-ascii?Q?VEJIBWHYlXNR7qUKQyUaz/CJGL50ZRDrJ0oKNdHwMYycqlPaDk2qc03bUiVL?=
 =?us-ascii?Q?qNl6xMASCUSIHkUN1NuwbCoFWpeFx32eE0XrhMDy9XRci+52jIsc7r3f2u3K?=
 =?us-ascii?Q?+0YhgtwFTjXanYVYOcVVEOrJGYjSEmhplo3WbZ3Xq/56BjkunQdCL755QBHx?=
 =?us-ascii?Q?hu3CNq0BIunahBY7jLTRhoXg/31NsIkEI7e46wxh1kMjshnRQjpzVfXEsips?=
 =?us-ascii?Q?9+1tYYzIZNW1Lp9Vu8EFK9bqWBFc+wKwcoPkUWZ/TQrN61/BJ3HFOtiKPNxj?=
 =?us-ascii?Q?5cbFeunrNj4QK8vgMRY=3D?=
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-AuthSource: DU0PR04MB9417.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fa03e10b-d80c-4262-aee5-08dc7327125b
X-MS-Exchange-CrossTenant-originalarrivaltime: 13 May 2024 08:31:22.8186
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: 9UTw9F6amFhYJFUzAprMocJ69xKxYwcvb+zmUr/7Bbp4e4t+OIlGDXpYaUnpEoTLHUgmlD6zDUyvZ0mnTaN50Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB8258

> Subject: Re: [PATCH v2 01/17] clk: imx: composite-8m: Enable gate clk wit=
h
> mcore_booted
>
> On Fri, May 10, 2024 at 05:18:56PM +0800, Peng Fan (OSS) wrote:
> > From: Peng Fan <peng.fan@nxp.com>
> >
> > Bootloader might disable some CCM ROOT Slices. So if mcore_booted set
> > with display CCM ROOT disabled by Bootloader, kernel display BLK CTRL
> > driver imx8m_blk_ctrl_driver_init may hang the system because the BUS
> > clk is disabled.
> >
> > Add back gate ops, but with disable doing nothing, then the CCM ROOT
> > will be enabled when used.
> >
> > Fixes: 489bbee0c983 ("clk: imx: composite-8m: Enable gate clk with
> > mcore_booted")
>
> I can't find this commitish anywhere, also the subject looks like this pa=
tch
> fixes itself.

My bad. Picked the first commit when I use --pretty=3Dfixes.

>
> > Reviewed-by: Ye Li <ye.li@nxp.com>
> > Reviewed-by: Jacky Bai <ping.bai@nxp.com>
> > Signed-off-by: Peng Fan <peng.fan@nxp.com>
> > ---
> >  drivers/clk/imx/clk-composite-8m.c | 53
> > ++++++++++++++++++++++++++++++--------
> >  1 file changed, 42 insertions(+), 11 deletions(-)
> >
> > diff --git a/drivers/clk/imx/clk-composite-8m.c
> > b/drivers/clk/imx/clk-composite-8m.c
> > index 8cc07d056a83..f187582ba491 100644
> > --- a/drivers/clk/imx/clk-composite-8m.c
> > +++ b/drivers/clk/imx/clk-composite-8m.c
> > @@ -204,6 +204,34 @@ static const struct clk_ops
> imx8m_clk_composite_mux_ops =3D {
> >     .determine_rate =3D imx8m_clk_composite_mux_determine_rate,
> >  };
> >
> > +static int imx8m_clk_composite_gate_enable(struct clk_hw *hw) {
> > +   struct clk_gate *gate =3D to_clk_gate(hw);
> > +   unsigned long flags;
> > +   u32 val;
> > +
> > +   spin_lock_irqsave(gate->lock, flags);
> > +
> > +   val =3D readl(gate->reg);
> > +   val |=3D BIT(gate->bit_idx);
> > +   writel(val, gate->reg);
> > +
> > +   spin_unlock_irqrestore(gate->lock, flags);
> > +
> > +   return 0;
> > +}
> > +
> > +static void imx8m_clk_composite_gate_disable(struct clk_hw *hw) {
> > +   /* composite clk requires the disable hook */ }
> > +
> > +static const struct clk_ops imx8m_clk_composite_gate_ops =3D {
> > +   .enable =3D imx8m_clk_composite_gate_enable,
> > +   .disable =3D imx8m_clk_composite_gate_disable,
> > +   .is_enabled =3D clk_gate_is_enabled,
> > +};
> > +
> >  struct clk_hw *__imx8m_clk_hw_composite(const char *name,
> >                                     const char * const *parent_names,
> >                                     int num_parents, void __iomem
> *reg, @@ -217,6 +245,7 @@ struct
> > clk_hw *__imx8m_clk_hw_composite(const char *name,
> >     struct clk_mux *mux;
> >     const struct clk_ops *divider_ops;
> >     const struct clk_ops *mux_ops;
> > +   const struct clk_ops *gate_ops;
> >
> >     mux =3D kzalloc(sizeof(*mux), GFP_KERNEL);
> >     if (!mux)
> > @@ -257,20 +286,22 @@ struct clk_hw
> *__imx8m_clk_hw_composite(const char *name,
> >     div->flags =3D CLK_DIVIDER_ROUND_CLOSEST;
> >
> >     /* skip registering the gate ops if M4 is enabled */
>
> This comment doesn't seems to become inaccurate with this patch.

Right. Drop it in v3.

>
> > -   if (!mcore_booted) {
> > -           gate =3D kzalloc(sizeof(*gate), GFP_KERNEL);
> > -           if (!gate)
> > -                   goto free_div;
> > -
> > -           gate_hw =3D &gate->hw;
> > -           gate->reg =3D reg;
> > -           gate->bit_idx =3D PCG_CGC_SHIFT;
> > -           gate->lock =3D &imx_ccm_lock;
> > -   }
> > +   gate =3D kzalloc(sizeof(*gate), GFP_KERNEL);
> > +   if (!gate)
> > +           goto free_div;
> > +
> > +   gate_hw =3D &gate->hw;
> > +   gate->reg =3D reg;
> > +   gate->bit_idx =3D PCG_CGC_SHIFT;
> > +   gate->lock =3D &imx_ccm_lock;
> > +   if (!mcore_booted)
> > +           gate_ops =3D &clk_gate_ops;
> > +   else
> > +           gate_ops =3D &imx8m_clk_composite_gate_ops;
>
> Please use positive logic. It's easier to read.

Sure. update in v3.

Thanks,
Peng.
>
> Sascha
>
> --
> Pengutronix e.K.                           |                             =
|
> Steuerwalder Str. 21                       |
> http://www.p/
> engutronix.de%2F&data=3D05%7C02%7Cpeng.fan%40nxp.com%7C86a2a0908b
> 83408401af08dc73178043%7C686ea1d3bc2b4c6fa92cd99c5c301635%7C0
> %7C0%7C638511791969660985%7CUnknown%7CTWFpbGZsb3d8eyJWIjoi
> MC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C0%
> 7C%7C%7C&sdata=3DeJJ8rdenU2ACBFUBX0CKKFzhkIQA999b7rpOuMkqgoU%3
> D&reserved=3D0  |
> 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    =
|
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 =
|