Received: by 2002:a05:7208:3003:b0:81:def:69cd with SMTP id f3csp4173644rba; Tue, 2 Apr 2024 09:19:33 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUFiMnOvWUJpyusDKRDq93wpGIzm0UlKqLE5CIMWFWEI84hpxYN7TT/NX+yKyfiiFvUYC/UMapRpUkei4OeqRjC486DKxDDk0rY9aA+Bw== X-Google-Smtp-Source: AGHT+IHCq9NfYETUQIcvvbynVmnEL/YJoay+xKDc8KJBeBZkwhzYFcBZo0gpSGXqx3irzZJFUBci X-Received: by 2002:a17:906:5290:b0:a46:e0a8:d5d3 with SMTP id c16-20020a170906529000b00a46e0a8d5d3mr8015810ejm.22.1712074772903; Tue, 02 Apr 2024 09:19:32 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1712074772; cv=pass; d=google.com; s=arc-20160816; b=lah8Y8hJIGeIFzvqVjlzqmXw+fxgsS000i6FboQQJJrJ/nCiU8j0/4Wm+0o6T5bG1p CQMp7jbRGvhaAIJbUbybZGrqUzP2Ur+0OsHZdVRr568aweqn3YImrgY44I5q2dt1itFi 4b96yzrdwhRwj+bGGhCbjW4hEkEX5DFJFw4GZPi/9C8CFtIR61nJBeWV3HckLGlpDGtv W3p7r8v53qxcAqHiksX/eega6b9SX9hI0QPsZbOKzOt7gdN2kdlKcOZ2yuQoOF7kg8tv UVfVkxAGedrgYyrqoqMyzyxGiMLMo+oP1xATPwtYku8+iMErWE2qakxOZ44Yy8m+cnoY TJJQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:in-reply-to:date:subject:cc:to:from:user-agent :references:dkim-signature; bh=DqVKcjjjgSIpddqjwQ2CGc9pCIQg9j3BatZ4Fu6ZpaY=; fh=RfH5mctUb49QU0C3pEWXc2d3/bB0c8oDmG+AZK+BKpY=; b=YPIwixFfs0az0JOVnCqJmZm9kBQu6cBfzoG5BWeA39jU6ZBqlvU3tThuiwX9aD5BHP rTDUSS2Eq1ox4JK4O464WrvpWr1Yw+5ej4OL+jZeJr3cAR7P1yESAvVPaQXKIYfkZ/30 qq1g4DVb6mM4POQkkzXytmcY1XHhp/SiGN0SaMK8aDmDo7PJxMUeGr1n5/OAXVhSXDPh c3yCfJCsZwVDl07ee5pRxlOrhaHWai2mtQzkIUEfTqcuWI/pmXzDz2GDePOdR8DwS+ph 9bJRGncpUv847p/Ct/GFOoZhXvnmDfM6DTNYORbS/Azzt8vAYw7Jalgwv6IkJ2m4sPnr JOHA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@baylibre-com.20230601.gappssmtp.com header.s=20230601 header.b=IRTlAWCl; arc=pass (i=1 spf=pass spfdomain=baylibre.com dkim=pass dkdomain=baylibre-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-128341-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-128341-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id c3-20020a170906d18300b00a472619c57asi5570976ejz.919.2024.04.02.09.19.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 09:19:32 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-128341-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@baylibre-com.20230601.gappssmtp.com header.s=20230601 header.b=IRTlAWCl; arc=pass (i=1 spf=pass spfdomain=baylibre.com dkim=pass dkdomain=baylibre-com.20230601.gappssmtp.com); spf=pass (google.com: domain of linux-kernel+bounces-128341-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-128341-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 2FA401F23CAE for ; Tue, 2 Apr 2024 16:19:32 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B4EF414AD38; Tue, 2 Apr 2024 16:19:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b="IRTlAWCl" Received: from mail-lf1-f49.google.com (mail-lf1-f49.google.com [209.85.167.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 68CB114AD1D for ; Tue, 2 Apr 2024 16:19:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712074762; cv=none; b=DN86T4aLfuSMNikFHTikh1dI0+kDMYFVWcuva2r1I6CcmG/xz0j9VRa7038ThGzvROC/vSd4u3gF3Iq31vgP8McoAY5dZ639g0F0NzipaxlHza+xcO9aZC5/TaSiLwMeaSdHxOO8TeIPzH+ruT3OwtAa7k2qE1Zhwj+2yccWuOY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712074762; c=relaxed/simple; bh=M+SJ/IZg8X9D6NSqLRepbzhfP67azb24Md2VPIhItzw=; h=References:From:To:Cc:Subject:Date:In-reply-to:Message-ID: MIME-Version:Content-Type; b=XbsI002bVk3mntMOGHEwHHRDbwEUfUvpCvIez48lOR8RN2jQdguTDY5dZX0d+64PB5ZssjfEwzr/wh7Ta7yUY6iNHwsvbmDC2yG9ueJT3pvWsFwXn4iUsYrU3zvcpnNlWOvrmLKMqwNtQUe+X+FI2ZCT01TO1fv+OUGN+K0BtQI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com; spf=pass smtp.mailfrom=baylibre.com; dkim=pass (2048-bit key) header.d=baylibre-com.20230601.gappssmtp.com header.i=@baylibre-com.20230601.gappssmtp.com header.b=IRTlAWCl; arc=none smtp.client-ip=209.85.167.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=baylibre.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=baylibre.com Received: by mail-lf1-f49.google.com with SMTP id 2adb3069b0e04-513cf9bacf1so6780587e87.0 for ; Tue, 02 Apr 2024 09:19:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20230601.gappssmtp.com; s=20230601; t=1712074756; x=1712679556; darn=vger.kernel.org; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:from:to:cc:subject:date:message-id:reply-to; bh=DqVKcjjjgSIpddqjwQ2CGc9pCIQg9j3BatZ4Fu6ZpaY=; b=IRTlAWClHt3hKD1kYRX+kqC+xWwnTfJnbqiZuUgkbypuulvW2ud9oKWcoI4mNl7QSD tFmlXqx/xzYh6NWtdAHuFbiO04vy852cguecej+pnx96X0kxlv8V4fNzHzG/RLHoaSg3 5DmkI+E+Ipjp36U0Q44ciuRWxEgqvSnh1207arNFaykesCknaOX1TYFDr4oPL2jF+Hf8 zfhv9xWHu6k9GQ5pIdcUOb/MVWTgFkcFtweo03bypOknccDSZgJt8bNERslt3ThDEZH/ pDGf3fEnV4/W7+U509EGNrU8AWrYoxhopRNLlH+IiJU+QAL1NDX2oKty300saMl2qcA5 p6Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712074756; x=1712679556; h=mime-version:message-id:in-reply-to:date:subject:cc:to:from :user-agent:references:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=DqVKcjjjgSIpddqjwQ2CGc9pCIQg9j3BatZ4Fu6ZpaY=; b=St2oC92H1+lGTExv4ernprw/t3jtDKNEYGUvQdhqdiL6t1eGzF/r1oWb3MbMZaLTVK t6t82osJDTPr1T8mmLKK2JtFp3YJzj4UcT65X/vNPGYtQVq2PZVGu81wRZzmAb6twkPn 5gWpR7iYB9DSwjYbdi4J2z0uBj4YtqpsK/JxAKUb2RGezxnXQfm+TUuEZtFjzWCaI+yU MNBU2wvNZm/b1zMRd8QPzRzPvVmek0EA6KhOCIl+Xalio51/6nyt7+jzKBRREAPMDP/L FNZ9ievjZnDgGjDPCRYcyK2R5E5xxsQO6ReON8YT7lvnLewoV74w0sZ3GnyYV5X63eYr 1/RA== X-Forwarded-Encrypted: i=1; AJvYcCVIZ4lO7iAw7yV6hnsIAevGxfJJkApimpGVuao8VSTNGwJ3w4gLQrdeaFhTQg9ldFF+TfbhG1GlTfmUdFegaWAAkMYtZFCluHnt/uae X-Gm-Message-State: AOJu0Yy/iASCBnq/JNpDUeTIa6qdZMnUGqlW9M9Y7N+SqdbdWuHP/xJX YRq29wgekifjVtxEEfJMcB9P1YJ8tpi5H/5giV+KJwUWDgeqf8OVQJrSW2/SKsU= X-Received: by 2002:ac2:5501:0:b0:516:a0a2:ba1b with SMTP id j1-20020ac25501000000b00516a0a2ba1bmr5810843lfk.47.1712074756395; Tue, 02 Apr 2024 09:19:16 -0700 (PDT) Received: from localhost ([2a01:e0a:3c5:5fb1:2b3:4f20:7b45:be58]) by smtp.gmail.com with ESMTPSA id q15-20020a7bce8f000000b0041547cdfbc7sm9601778wmj.0.2024.04.02.09.19.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 09:19:15 -0700 (PDT) References: <20240329205904.25002-1-ddrokosov@salutedevices.com> <20240329205904.25002-7-ddrokosov@salutedevices.com> <1jv850hyvm.fsf@starbuckisacylon.baylibre.com> <20240402110538.ayectwxnhlu6o65d@CAB-WSD-L081021> <1jr0fnj11b.fsf@starbuckisacylon.baylibre.com> <20240402161110.v7t72s6t7m3bzifi@CAB-WSD-L081021> User-agent: mu4e 1.10.8; emacs 29.2 From: Jerome Brunet To: Dmitry Rokosov Cc: Jerome Brunet , neil.armstrong@linaro.org, mturquette@baylibre.com, sboyd@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, khilman@baylibre.com, martin.blumenstingl@googlemail.com, kernel@salutedevices.com, rockosov@gmail.com, linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH v1 6/6] clk: meson: a1: add Amlogic A1 CPU clock controller driver Date: Tue, 02 Apr 2024 18:17:05 +0200 In-reply-to: <20240402161110.v7t72s6t7m3bzifi@CAB-WSD-L081021> Message-ID: <1jr0fnpwjg.fsf@starbuckisacylon.baylibre.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain On Tue 02 Apr 2024 at 19:11, Dmitry Rokosov wrote: > On Tue, Apr 02, 2024 at 04:11:12PM +0200, Jerome Brunet wrote: >> >> On Tue 02 Apr 2024 at 14:05, Dmitry Rokosov wrote: >> >> > Hello Jerome, >> > >> > On Tue, Apr 02, 2024 at 11:35:49AM +0200, Jerome Brunet wrote: >> >> >> >> On Fri 29 Mar 2024 at 23:58, Dmitry Rokosov wrote: >> >> >> >> > The CPU clock controller plays a general role in the Amlogic A1 SoC >> >> > family by generating CPU clocks. As an APB slave module, it offers the >> >> > capability to inherit the CPU clock from two sources: the internal fixed >> >> > clock known as 'cpu fixed clock' and the external input provided by the >> >> > A1 PLL clock controller, referred to as 'syspll'. >> >> > >> >> > It is important for the driver to handle cpu_clk rate switching >> >> > effectively by transitioning to the CPU fixed clock to avoid any >> >> > potential execution freezes. >> >> > >> >> > Signed-off-by: Dmitry Rokosov >> >> > --- >> >> > drivers/clk/meson/Kconfig | 10 ++ >> >> > drivers/clk/meson/Makefile | 1 + >> >> > drivers/clk/meson/a1-cpu.c | 324 +++++++++++++++++++++++++++++++++++++ >> >> > drivers/clk/meson/a1-cpu.h | 16 ++ >> >> > 4 files changed, 351 insertions(+) >> >> > create mode 100644 drivers/clk/meson/a1-cpu.c >> >> > create mode 100644 drivers/clk/meson/a1-cpu.h >> >> > >> >> > diff --git a/drivers/clk/meson/Kconfig b/drivers/clk/meson/Kconfig >> >> > index 80c4a18c83d2..148d4495eee3 100644 >> >> > --- a/drivers/clk/meson/Kconfig >> >> > +++ b/drivers/clk/meson/Kconfig >> >> > @@ -111,6 +111,16 @@ config COMMON_CLK_AXG_AUDIO >> >> > Support for the audio clock controller on AmLogic A113D devices, >> >> > aka axg, Say Y if you want audio subsystem to work. >> >> > >> >> > +config COMMON_CLK_A1_CPU >> >> > + tristate "Amlogic A1 SoC CPU controller support" >> >> > + depends on ARM64 >> >> > + select COMMON_CLK_MESON_REGMAP >> >> > + select COMMON_CLK_MESON_CLKC_UTILS >> >> > + help >> >> > + Support for the CPU clock controller on Amlogic A113L based >> >> > + device, A1 SoC Family. Say Y if you want A1 CPU clock controller >> >> > + to work. >> >> > + >> >> > config COMMON_CLK_A1_PLL >> >> > tristate "Amlogic A1 SoC PLL controller support" >> >> > depends on ARM64 >> >> > diff --git a/drivers/clk/meson/Makefile b/drivers/clk/meson/Makefile >> >> > index 4968fc7ad555..2a06eb0303d6 100644 >> >> > --- a/drivers/clk/meson/Makefile >> >> > +++ b/drivers/clk/meson/Makefile >> >> > @@ -18,6 +18,7 @@ obj-$(CONFIG_COMMON_CLK_MESON_AUDIO_RSTC) += meson-audio-rstc.o >> >> > >> >> > obj-$(CONFIG_COMMON_CLK_AXG) += axg.o axg-aoclk.o >> >> > obj-$(CONFIG_COMMON_CLK_AXG_AUDIO) += axg-audio.o >> >> > +obj-$(CONFIG_COMMON_CLK_A1_CPU) += a1-cpu.o >> >> > obj-$(CONFIG_COMMON_CLK_A1_PLL) += a1-pll.o >> >> > obj-$(CONFIG_COMMON_CLK_A1_PERIPHERALS) += a1-peripherals.o >> >> > obj-$(CONFIG_COMMON_CLK_A1_AUDIO) += a1-audio.o >> >> > diff --git a/drivers/clk/meson/a1-cpu.c b/drivers/clk/meson/a1-cpu.c >> >> > new file mode 100644 >> >> > index 000000000000..5f5d8ae112e5 >> >> > --- /dev/null >> >> > +++ b/drivers/clk/meson/a1-cpu.c >> >> > @@ -0,0 +1,324 @@ >> >> > +// SPDX-License-Identifier: GPL-2.0+ >> >> > +/* >> >> > + * Amlogic A1 SoC family CPU Clock Controller driver. >> >> > + * >> >> > + * Copyright (c) 2024, SaluteDevices. All Rights Reserved. >> >> > + * Author: Dmitry Rokosov >> >> > + */ >> >> > + >> >> > +#include >> >> > +#include >> >> > +#include >> >> > +#include >> >> > +#include "a1-cpu.h" >> >> > +#include "clk-regmap.h" >> >> > +#include "meson-clkc-utils.h" >> >> > + >> >> > +#include >> >> > + >> >> > +static u32 cpu_fsource_sel_table[] = { 0, 1, 2 }; >> >> > +static const struct clk_parent_data cpu_fsource_sel_parents[] = { >> >> > + { .fw_name = "xtal" }, >> >> > + { .fw_name = "fclk_div2" }, >> >> > + { .fw_name = "fclk_div3" }, >> >> > +}; >> >> > + >> >> > +static struct clk_regmap cpu_fsource_sel0 = { >> >> > + .data = &(struct clk_regmap_mux_data) { >> >> > + .offset = CPUCTRL_CLK_CTRL0, >> >> > + .mask = 0x3, >> >> > + .shift = 0, >> >> > + .table = cpu_fsource_sel_table, >> >> > + }, >> >> > + .hw.init = &(struct clk_init_data) { >> >> > + .name = "cpu_fsource_sel0", >> >> > + .ops = &clk_regmap_mux_ops, >> >> > + .parent_data = cpu_fsource_sel_parents, >> >> > + .num_parents = ARRAY_SIZE(cpu_fsource_sel_parents), >> >> > + .flags = CLK_SET_RATE_PARENT, >> >> > + }, >> >> > +}; >> >> > + >> >> > +static struct clk_regmap cpu_fsource_div0 = { >> >> > + .data = &(struct clk_regmap_div_data) { >> >> > + .offset = CPUCTRL_CLK_CTRL0, >> >> > + .shift = 4, >> >> > + .width = 6, >> >> > + }, >> >> > + .hw.init = &(struct clk_init_data) { >> >> > + .name = "cpu_fsource_div0", >> >> > + .ops = &clk_regmap_divider_ops, >> >> > + .parent_hws = (const struct clk_hw *[]) { >> >> > + &cpu_fsource_sel0.hw >> >> > + }, >> >> > + .num_parents = 1, >> >> > + .flags = CLK_SET_RATE_PARENT, >> >> > + }, >> >> > +}; >> >> > + >> >> > +static struct clk_regmap cpu_fsel0 = { >> >> > + .data = &(struct clk_regmap_mux_data) { >> >> > + .offset = CPUCTRL_CLK_CTRL0, >> >> > + .mask = 0x1, >> >> > + .shift = 2, >> >> > + }, >> >> > + .hw.init = &(struct clk_init_data) { >> >> > + .name = "cpu_fsel0", >> >> > + .ops = &clk_regmap_mux_ops, >> >> > + .parent_hws = (const struct clk_hw *[]) { >> >> > + &cpu_fsource_sel0.hw, >> >> > + &cpu_fsource_div0.hw, >> >> > + }, >> >> > + .num_parents = 2, >> >> > + .flags = CLK_SET_RATE_PARENT, >> >> > + }, >> >> > +}; >> >> > + >> >> > +static struct clk_regmap cpu_fsource_sel1 = { >> >> > + .data = &(struct clk_regmap_mux_data) { >> >> > + .offset = CPUCTRL_CLK_CTRL0, >> >> > + .mask = 0x3, >> >> > + .shift = 16, >> >> > + .table = cpu_fsource_sel_table, >> >> > + }, >> >> > + .hw.init = &(struct clk_init_data) { >> >> > + .name = "cpu_fsource_sel1", >> >> > + .ops = &clk_regmap_mux_ops, >> >> > + .parent_data = cpu_fsource_sel_parents, >> >> > + .num_parents = ARRAY_SIZE(cpu_fsource_sel_parents), >> >> > + .flags = CLK_SET_RATE_PARENT, >> >> > + }, >> >> > +}; >> >> > + >> >> > +static struct clk_regmap cpu_fsource_div1 = { >> >> > + .data = &(struct clk_regmap_div_data) { >> >> > + .offset = CPUCTRL_CLK_CTRL0, >> >> > + .shift = 20, >> >> > + .width = 6, >> >> > + }, >> >> > + .hw.init = &(struct clk_init_data) { >> >> > + .name = "cpu_fsource_div1", >> >> > + .ops = &clk_regmap_divider_ops, >> >> > + .parent_hws = (const struct clk_hw *[]) { >> >> > + &cpu_fsource_sel1.hw >> >> > + }, >> >> > + .num_parents = 1, >> >> > + .flags = CLK_SET_RATE_PARENT, >> >> > + }, >> >> > +}; >> >> > + >> >> > +static struct clk_regmap cpu_fsel1 = { >> >> > + .data = &(struct clk_regmap_mux_data) { >> >> > + .offset = CPUCTRL_CLK_CTRL0, >> >> > + .mask = 0x1, >> >> > + .shift = 18, >> >> > + }, >> >> > + .hw.init = &(struct clk_init_data) { >> >> > + .name = "cpu_fsel1", >> >> > + .ops = &clk_regmap_mux_ops, >> >> > + .parent_hws = (const struct clk_hw *[]) { >> >> > + &cpu_fsource_sel1.hw, >> >> > + &cpu_fsource_div1.hw, >> >> > + }, >> >> > + .num_parents = 2, >> >> > + .flags = CLK_SET_RATE_PARENT, >> >> > + }, >> >> > +}; >> >> > + >> >> > +static struct clk_regmap cpu_fclk = { >> >> > + .data = &(struct clk_regmap_mux_data) { >> >> > + .offset = CPUCTRL_CLK_CTRL0, >> >> > + .mask = 0x1, >> >> > + .shift = 10, >> >> > + }, >> >> > + .hw.init = &(struct clk_init_data) { >> >> > + .name = "cpu_fclk", >> >> > + .ops = &clk_regmap_mux_ops, >> >> > + .parent_hws = (const struct clk_hw *[]) { >> >> > + &cpu_fsel0.hw, >> >> > + &cpu_fsel1.hw, >> >> > + }, >> >> > + .num_parents = 2, >> >> > + .flags = CLK_SET_RATE_PARENT, >> >> > + }, >> >> > +}; >> >> > + >> >> > +static struct clk_regmap cpu_clk = { >> >> > + .data = &(struct clk_regmap_mux_data) { >> >> > + .offset = CPUCTRL_CLK_CTRL0, >> >> > + .mask = 0x1, >> >> > + .shift = 11, >> >> > + }, >> >> > + .hw.init = &(struct clk_init_data) { >> >> > + .name = "cpu_clk", >> >> > + .ops = &clk_regmap_mux_ops, >> >> > + .parent_data = (const struct clk_parent_data []) { >> >> > + { .hw = &cpu_fclk.hw }, >> >> > + { .fw_name = "sys_pll", }, >> >> > + }, >> >> > + .num_parents = 2, >> >> > + .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, >> >> > + }, >> >> > +}; >> >> > + >> >> > +/* Array of all clocks registered by this provider */ >> >> > +static struct clk_hw *a1_cpu_hw_clks[] = { >> >> > + [CLKID_CPU_FSOURCE_SEL0] = &cpu_fsource_sel0.hw, >> >> > + [CLKID_CPU_FSOURCE_DIV0] = &cpu_fsource_div0.hw, >> >> > + [CLKID_CPU_FSEL0] = &cpu_fsel0.hw, >> >> > + [CLKID_CPU_FSOURCE_SEL1] = &cpu_fsource_sel1.hw, >> >> > + [CLKID_CPU_FSOURCE_DIV1] = &cpu_fsource_div1.hw, >> >> > + [CLKID_CPU_FSEL1] = &cpu_fsel1.hw, >> >> > + [CLKID_CPU_FCLK] = &cpu_fclk.hw, >> >> > + [CLKID_CPU_CLK] = &cpu_clk.hw, >> >> > +}; >> >> > + >> >> > +static struct clk_regmap *const a1_cpu_regmaps[] = { >> >> > + &cpu_fsource_sel0, >> >> > + &cpu_fsource_div0, >> >> > + &cpu_fsel0, >> >> > + &cpu_fsource_sel1, >> >> > + &cpu_fsource_div1, >> >> > + &cpu_fsel1, >> >> > + &cpu_fclk, >> >> > + &cpu_clk, >> >> > +}; >> >> > + >> >> > +static struct regmap_config a1_cpu_regmap_cfg = { >> >> > + .reg_bits = 32, >> >> > + .val_bits = 32, >> >> > + .reg_stride = 4, >> >> > + .max_register = CPUCTRL_CLK_CTRL1, >> >> > +}; >> >> > + >> >> > +static struct meson_clk_hw_data a1_cpu_clks = { >> >> > + .hws = a1_cpu_hw_clks, >> >> > + .num = ARRAY_SIZE(a1_cpu_hw_clks), >> >> > +}; >> >> > + >> >> > +struct a1_cpu_clk_nb_data { >> >> > + const struct clk_ops *mux_ops; >> >> >> >> That's fishy ... >> >> >> >> > + struct clk_hw *cpu_clk; >> >> > + struct notifier_block nb; >> >> > + u8 parent; >> >> > +}; >> >> > + >> >> > +#define MESON_A1_CPU_CLK_GET_PARENT(nbd) \ >> >> > + ((nbd)->mux_ops->get_parent((nbd)->cpu_clk)) >> >> > +#define MESON_A1_CPU_CLK_SET_PARENT(nbd, index) \ >> >> > + ((nbd)->mux_ops->set_parent((nbd)->cpu_clk, index)) >> >> >> >> ... Directly going for the mux ops ??!?? No way ! >> >> >> >> We have a framework to handle the clocks, the whole point is to use it, >> >> not bypass it ! >> >> >> > >> > I suppose you understand my approach, which is quite similar to what is >> > happening in the Mediatek driver: >> > >> > https://elixir.bootlin.com/linux/latest/source/drivers/clk/mediatek/clk-mux.c#L295 >> > >> > Initially, I attempted to set the parent using the clk_set_parent() API. >> > However, I encountered a problem with recursive calling of the >> > notifier_block. This issue arises because the parent triggers >> > notifications for its children, leading to repeated calls to the >> > notifier_block. >> > >> > I find it puzzling why I cannot call an internal function or callback >> > within the internal driver context. After all, the notifier block is >> > just a part of the set_rate() flow. From a global Clock Control >> > Framework perspective, the context should not change. >> >> I don't care what MTK is doing TBH. Forcefully calling ops on a clock, >> hoping they are going to match with the clock type is wrong. >> >> There is a clk_hw API. Please it. >> > > Yes, if sys_pll has a notifier_block instead of cpu_clk, there will be > no problem with the clk_hw API. > > I will rework that point. > >> > >> >> > + >> >> > +static int meson_a1_cpu_clk_notifier_cb(struct notifier_block *nb, >> >> > + unsigned long event, void *data) >> >> > +{ >> >> > + struct a1_cpu_clk_nb_data *nbd; >> >> > + int ret = 0; >> >> > + >> >> > + nbd = container_of(nb, struct a1_cpu_clk_nb_data, nb); >> >> > + >> >> > + switch (event) { >> >> > + case PRE_RATE_CHANGE: >> >> > + nbd->parent = MESON_A1_CPU_CLK_GET_PARENT(nbd); >> >> > + /* Fallback to the CPU fixed clock */ >> >> > + ret = MESON_A1_CPU_CLK_SET_PARENT(nbd, 0); >> >> > + /* Wait for clock propagation */ >> >> > + udelay(100); >> >> > + break; >> >> > + >> >> > + case POST_RATE_CHANGE: >> >> > + case ABORT_RATE_CHANGE: >> >> > + /* Back to the original parent clock */ >> >> > + ret = MESON_A1_CPU_CLK_SET_PARENT(nbd, nbd->parent); >> >> > + /* Wait for clock propagation */ >> >> > + udelay(100); >> >> > + break; >> >> > + >> >> > + default: >> >> > + pr_warn("Unknown event %lu for %s notifier block\n", >> >> > + event, clk_hw_get_name(nbd->cpu_clk)); >> >> > + break; >> >> > + } >> >> > + >> >> > + return notifier_from_errno(ret); >> >> > +} >> >> > + >> >> > +static struct a1_cpu_clk_nb_data a1_cpu_clk_nb_data = { >> >> > + .mux_ops = &clk_regmap_mux_ops, >> >> > + .cpu_clk = &cpu_clk.hw, >> >> > + .nb.notifier_call = meson_a1_cpu_clk_notifier_cb, >> >> > +}; >> >> > + >> >> > +static int meson_a1_dvfs_setup(struct platform_device *pdev) >> >> > +{ >> >> > + struct device *dev = &pdev->dev; >> >> > + struct clk *notifier_clk; >> >> > + int ret; >> >> > + >> >> > + /* Setup clock notifier for cpu_clk */ >> >> > + notifier_clk = devm_clk_hw_get_clk(dev, &cpu_clk.hw, "dvfs"); >> >> > + if (IS_ERR(notifier_clk)) >> >> > + return dev_err_probe(dev, PTR_ERR(notifier_clk), >> >> > + "can't get cpu_clk as notifier clock\n"); >> >> > + >> >> > + ret = devm_clk_notifier_register(dev, notifier_clk, >> >> > + &a1_cpu_clk_nb_data.nb); >> >> > + if (ret) >> >> > + return dev_err_probe(dev, ret, >> >> > + "can't register cpu_clk notifier\n"); >> >> > + >> >> > + return ret; >> >> > +} >> >> > + >> >> > +static int meson_a1_cpu_probe(struct platform_device *pdev) >> >> > +{ >> >> > + struct device *dev = &pdev->dev; >> >> > + void __iomem *base; >> >> > + struct regmap *map; >> >> > + int clkid, i, err; >> >> > + >> >> > + base = devm_platform_ioremap_resource(pdev, 0); >> >> > + if (IS_ERR(base)) >> >> > + return dev_err_probe(dev, PTR_ERR(base), >> >> > + "can't ioremap resource\n"); >> >> > + >> >> > + map = devm_regmap_init_mmio(dev, base, &a1_cpu_regmap_cfg); >> >> > + if (IS_ERR(map)) >> >> > + return dev_err_probe(dev, PTR_ERR(map), >> >> > + "can't init regmap mmio region\n"); >> >> > + >> >> > + /* Populate regmap for the regmap backed clocks */ >> >> > + for (i = 0; i < ARRAY_SIZE(a1_cpu_regmaps); i++) >> >> > + a1_cpu_regmaps[i]->map = map; >> >> > + >> >> > + for (clkid = 0; clkid < a1_cpu_clks.num; clkid++) { >> >> > + err = devm_clk_hw_register(dev, a1_cpu_clks.hws[clkid]); >> >> > + if (err) >> >> > + return dev_err_probe(dev, err, >> >> > + "clock[%d] registration failed\n", >> >> > + clkid); >> >> > + } >> >> > + >> >> > + err = devm_of_clk_add_hw_provider(dev, meson_clk_hw_get, &a1_cpu_clks); >> >> > + if (err) >> >> > + return dev_err_probe(dev, err, "can't add clk hw provider\n"); >> >> >> >> I wonder if there is a window of opportunity to poke the syspll without >> >> your notifier here. That being said, the situation would be similar on g12. >> >> >> > >> > Yes, I have taken into account what you did in the G12A CPU clock >> > relations. My thoughts were that it might not be applicable for the A1 >> > case. This is because the sys_pll should be located in a different >> > driver from a logical perspective. Consequently, we cannot configure the >> > sys_pll notifier block to manage the cpu_clk from a different driver. >> > However, if I were to move the sys_pll clock object to the A1 CPU clock >> > controller, I believe the g12a sys_pll notifier approach would work. >> > >> >> I fail to see the connection between the number of device and the >> approach you took. >> >> >> >> > + >> >> > + return meson_a1_dvfs_setup(pdev); >> >> >> >> >> >> >> >> > +} >> >> > + >> >> > +static const struct of_device_id a1_cpu_clkc_match_table[] = { >> >> > + { .compatible = "amlogic,a1-cpu-clkc", }, >> >> > + {} >> >> > +}; >> >> > +MODULE_DEVICE_TABLE(of, a1_cpu_clkc_match_table); >> >> > + >> >> > +static struct platform_driver a1_cpu_clkc_driver = { >> >> > + .probe = meson_a1_cpu_probe, >> >> > + .driver = { >> >> > + .name = "a1-cpu-clkc", >> >> > + .of_match_table = a1_cpu_clkc_match_table, >> >> > + }, >> >> > +}; >> >> > + >> >> > +module_platform_driver(a1_cpu_clkc_driver); >> >> > +MODULE_AUTHOR("Dmitry Rokosov "); >> >> > +MODULE_LICENSE("GPL"); >> >> > diff --git a/drivers/clk/meson/a1-cpu.h b/drivers/clk/meson/a1-cpu.h >> >> > new file mode 100644 >> >> > index 000000000000..e9af4117e26f >> >> > --- /dev/null >> >> > +++ b/drivers/clk/meson/a1-cpu.h >> >> >> >> There is not point putting the definition here in a header >> >> These are clearly not going to be shared with another driver. >> >> >> >> Please drop this file >> >> >> > >> > The same approach was applied to the Peripherals and PLL A1 drivers. >> > Honestly, I am not a fan of having different file organization within a >> > single logical code folder. >> > >> > Please refer to: >> > >> > drivers/clk/meson/a1-peripherals.h >> > drivers/clk/meson/a1-pll.h >> >> I understand. There was a time where it made sense, some definition >> could have been shared back then. This is no longer the case and it >> would probably welcome a rework. >> >> ... and again, just pointing to another code does really invalidate my >> point. >> >> > >> >> > @@ -0,0 +1,16 @@ >> >> > +/* SPDX-License-Identifier: GPL-2.0+ */ >> >> > +/* >> >> > + * Amlogic A1 CPU Clock Controller internals >> >> > + * >> >> > + * Copyright (c) 2024, SaluteDevices. All Rights Reserved. >> >> > + * Author: Dmitry Rokosov >> >> > + */ >> >> > + >> >> > +#ifndef __A1_CPU_H >> >> > +#define __A1_CPU_H >> >> > + >> >> > +/* cpu clock controller register offset */ >> >> > +#define CPUCTRL_CLK_CTRL0 0x80 >> >> > +#define CPUCTRL_CLK_CTRL1 0x84 >> >> >> >> You are claiming the registers from 0x00 to 0x84 (included), but only >> >> using these 2 registers ? What is the rest ? Are you sure there is only >> >> clocks in there ? >> >> >> > >> > Yes, unfortunately, the register map for this IP is not described in the >> > A1 Datasheet. The only available information about it can be found in >> > the vendor clock driver, which provides details for only two registers >> > used to configure the CPU clock. >> > >> > From vendor kernel dtsi: >> > >> > clkc: clock-controller { >> > compatible = "amlogic,a1-clkc"; >> > #clock-cells = <1>; >> > reg = <0x0 0xfe000800 0x0 0x100>, >> > <0x0 0xfe007c00 0x0 0x21c>, >> > <0x0 0xfd000000 0x0 0x88>; <==== CPU clock regmap >> > reg-names = "basic", "pll", >> > "cpu_clk"; >> > clocks = <&xtal>; >> > clock-names = "core"; >> > status = "okay"; >> > }; >> > >> > From vendor clkc driver: >> > >> > /* >> > * CPU clok register offset >> > * APB_BASE: APB1_BASE_ADDR = 0xfd000000 >> > */ >> > >> > #define CPUCTRL_CLK_CTRL0 0x80 >> > #define CPUCTRL_CLK_CTRL1 0x84 >> >> If you had clock in 0x0 and 0x80, then I would agree claiming 0x0-0x88 >> is reasonable, even if you don't really know what is in between. It >> would be a fair assumption. >> >> It is not the case here. >> For all we know it could resets, power domains, etc ... >> > > However, we do not have any information indicating that the gap from > 0x00-0x80 contains additional registers. It is possible that there are > internal registers, but they are not mentioned in the vendor datasheet > or driver. Therefore, in this case, I personally prefer to rely on the > vendor mapping. I understand your preference. My request remains. -- Jerome