clk: Improve clock range handling
Subsystems (6)
v5 cover clk: Improve clock range handling
Hi,
This is a follow-up of the discussion here:
https://lore.kernel.org/linux-clk/20210319150355.xzw7ikwdaga2dwhv@gilmour/
and here:
https://lore.kernel.org/all/[email protected]/
While the initial proposal implemented a new API to temporarily raise and lower clock rates based on consumer workloads, Stephen suggested an alternative approach implemented here.
The main issue that needed to be addressed in our case was that in a situation where we would have multiple calls to clk_set_rate_range, we would end up with a clock at the maximum of the minimums being set. This would be expected, but the issue was that if one of the users was to relax or drop its requirements, the rate would be left unchanged, even though the ideal rate would have changed.
So something like
clk_set_rate(user1_clk, 1000);clk_set_min_rate(user1_clk, 2000);clk_set_min_rate(user2_clk, 3000);clk_set_min_rate(user2_clk, 1000);
Would leave the clock running at 3000Hz, while the minimum would now be 2000Hz.
This was mostly due to the fact that the core only triggers a rate change in clk_set_rate_range() if the current rate is outside of the boundaries, but not if it's within the new boundaries.
That series changes that and will trigger a rate change on every call, with the former rate being tried again. This way, providers have a chance to follow whatever policy they see fit for a given clock each time the boundaries change.
This series also implements some kunit tests, first to test a few rate related functions in the CCF, and then extends it to make sure that behaviour has some test coverage.
Let me know what you think
Maxime
Changes from v4:
- Rename the test file
- Move all the tests to the first patch, and fix them up as fixes are done
- Improved the test conditions
- Added more tests
- Improved commit messages
- Fixed a regression where two disjoints clock ranges would now be accepted
Changes from v3:
- Renamed the test file and Kconfig option
- Add option to .kunitconfig
- Switch to kunit_kzalloc
- Use KUNIT_EXPECT_* instead of KUNIT_ASSERT_* where relevant
- Test directly relevant calls instead of going through a temporary variable
- Switch to more precise KUNIT_ASSERT_* macros where relevant
Changes from v2:
- Rebased on current next
- Rewrote the whole thing according to Stephen reviews
- Implemented some kunit tests
Changes from v1:
- Return NULL in clk_request_start if clk pointer is NULL
- Test for clk_req pointer in clk_request_done
- Add another user in vc4
- Rebased on top of v5.15-rc1
Maxime Ripard (11):
clk: Introduce Kunit Tests for the framework
clk: Enforce that disjoints limits are invalid
clk: Always clamp the rounded rate
clk: Use clamp instead of open-coding our own
clk: Always set the rate on clk_set_range_rate
clk: Add clk_drop_range
clk: bcm: rpi: Add variant structure
clk: bcm: rpi: Set a default minimum rate
clk: bcm: rpi: Run some clocks at the minimum rate allowed drm/vc4: Add logging and comments
drm/vc4: hdmi: Remove clock rate initialization
drivers/clk/.kunitconfig | 1 + drivers/clk/Kconfig | 7 + drivers/clk/Makefile | 1 + drivers/clk/bcm/clk-raspberrypi.c | 125 ++++- drivers/clk/clk.c | 73 ++- drivers/clk/clk_test.c | 790 ++++++++++++++++++++++++++++++ drivers/gpu/drm/vc4/vc4_hdmi.c | 13 - drivers/gpu/drm/vc4/vc4_kms.c | 11 + include/linux/clk.h | 11 + 9 files changed, 978 insertions(+), 54 deletions(-) create mode 100644 drivers/clk/clk_test.c
Signature · 1 line
2.35.1
PATCH v5 1/11 clk: Introduce Kunit Tests for the framework
Let's test various parts of the rate-related clock API with the kunit testing framework.
--- drivers/clk/.kunitconfig | 1 + drivers/clk/Kconfig | 7 + drivers/clk/Makefile | 1 + drivers/clk/clk_test.c | 786 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 795 insertions(+) create mode 100644 drivers/clk/clk_test.c
drivers/clk/.kunitconfig +1 -0
@@ -1,3 +1,4 @@ CONFIG_KUNIT=y CONFIG_COMMON_CLK=y +CONFIG_CLK_KUNIT_TEST=y CONFIG_CLK_GATE_KUNIT_TEST=y
drivers/clk/Kconfig +7 -0
@@ -429,6 +429,13 @@ source "drivers/clk/xilinx/Kconfig" source "drivers/clk/zynqmp/Kconfig" # Kunit test cases +config CLK_KUNIT_TEST + tristate "Basic Clock Framework Kunit Tests" if !KUNIT_ALL_TESTS + depends on KUNIT + default KUNIT_ALL_TESTS + help + Kunit tests for the common clock framework. + config CLK_GATE_KUNIT_TEST tristate "Basic gate type Kunit test" if !KUNIT_ALL_TESTS depends on KUNIT
drivers/clk/Makefile +1 -0
@@ -2,6 +2,7 @@ # common clock types obj-$(CONFIG_HAVE_CLK) += clk-devres.o clk-bulk.o clkdev.o obj-$(CONFIG_COMMON_CLK) += clk.o +obj-$(CONFIG_CLK_KUNIT_TEST) += clk_test.o obj-$(CONFIG_COMMON_CLK) += clk-divider.o obj-$(CONFIG_COMMON_CLK) += clk-fixed-factor.o obj-$(CONFIG_COMMON_CLK) += clk-fixed-rate.o
drivers/clk/clk_test.c new file +786 -0
786 lines not on this page · raw message
Signature · 1 line
2.35.1
kernel test robot
build botRe: [PATCH v5 01/11] clk: Introduce Kunit Tests for the framework
I love your patch! Yet something to improve:
Hi Maxime,
I love your patch! Yet something to improve:
[auto build test ERROR on clk/clk-next]
[also build test ERROR on next-20220217]
[cannot apply to drm-intel/for-linux-next drm-tip/drm-tip drm-exynos/exynos-drm-next drm/drm-next tegra-drm/drm/tegra/for-next linus/master airlied/drm-next v5.17-rc5] [If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Maxime-Ripard/clk-Improve-clock-range-handling/20220222-212043 base: https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-next config: mips-allmodconfig (https://download.01.org/0day-ci/archive/20220223/[email protected]/config) compiler: mips-linux-gcc (GCC) 11.2.0
reproduce (this is a W=1 build):
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# https://github.com/0day-ci/linux/commit/377d67441dca4a3d5df1d3b5a5b63c9a29f9b8b0
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Maxime-Ripard/clk-Improve-clock-range-handling/20220222-212043 git checkout 377d67441dca4a3d5df1d3b5a5b63c9a29f9b8b0
# save the config file to linux build tree
mkdir build_dir
COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=mips SHELL=/bin/bash
If you fix the issue, kindly add following tag as appropriate
All errors (new ones prefixed by >>, old ones prefixed by <<):
>> ERROR: modpost: "clk_hw_create_clk" [drivers/clk/clk_test.ko] undefined!
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/[email protected]
PATCH v5 2/11 clk: Enforce that disjoints limits are invalid
In reply to Maxime RipardIf we were to have two users of the same clock, doing something like:
clk_set_rate_range(user1, 1000, 2000);clk_set_rate_range(user2, 3000, 4000);
The second call would fail with -EINVAL, preventing from getting in a situation where we end up with impossible limits.
However, this is never explicitly checked against and enforced, and works by relying on an undocumented behaviour of clk_set_rate().
Indeed, on the first clk_set_rate_range will make sure the current clock rate is within the new range, so it will be between 1000 and 2000Hz. On the second clk_set_rate_range(), it will consider (rightfully), that our current clock is outside of the 3000-4000Hz range, and will call clk_core_set_rate_nolock() to set it to 3000Hz.
clk_core_set_rate_nolock() will then call clk_calc_new_rates() that will eventually check that our rate 3000Hz rate is outside the min 3000Hz max 2000Hz range, will bail out, the error will propagate and we'll eventually return -EINVAL.
This solely relies on the fact that clk_calc_new_rates(), and in particular clk_core_determine_round_nolock(), won't modify the new rate allowing the error to be reported. That assumption won't be true for all drivers, and most importantly we'll break that assumption in a later patch.
It can also be argued that we shouldn't even reach the point where we're calling clk_core_set_rate_nolock().
Let's make an explicit check for disjoints range before we're doing anything.
--- drivers/clk/clk.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+)
drivers/clk/clk.c +24 -0
@@ -632,6 +632,24 @@ static void clk_core_get_boundaries(struct clk_core *core, *max_rate =min (*max_rate, clk_user->max_rate); } +static bool clk_core_check_boundaries (struct clk_core *core, +unsigned long min_rate, +unsigned long max_rate) +{ +struct clk *user; + +lockdep_assert_held (&prepare_lock); + +if (min_rate > core->max_rate || max_rate < core->min_rate) +return false; + +hlist_for_each_entry (user, &core->clks, clks_node) +if (min_rate > user->max_rate || max_rate < user->min_rate) +return false; + +return true; +} +void clk_hw_set_rate_range (struct clk_hw *hw,unsigned long min_rate,unsigned long max_rate) {
@@ -2348,6 +2366,11 @@ int clk_set_rate_range(struct clk *clk, unsigned long min, unsigned long max) clk->min_rate = min; clk->max_rate = max; +if (!clk_core_check_boundaries (clk->core, min, max)) { + ret = -EINVAL ; + goto out; + } + rate =clk_core_get_rate_nolock (clk->core);if (rate < min || rate > max) {/*
@@ -2376,6 +2399,7 @@ int clk_set_rate_range(struct clk *clk, unsigned long min, unsigned long max) } } +out:if (clk->exclusive_count)clk_core_rate_protect (clk->core);
Signature · 1 line
2.35.1
PATCH v5 3/11 clk: Always clamp the rounded rate
In reply to Maxime RipardThe current core while setting the min and max rate properly in the clk_request structure will not make sure that the requested rate is within these boundaries, leaving it to each and every driver to make sure it is.
It's not clear if this was on purpose or not, but this introduces some inconsistencies within the API.
For example, a user setting a range and then calling clk_round_rate() with a value outside of that range will get the same value back (ignoring any driver adjustements), effectively ignoring the range that was just set.
Another one, arguably worse, is that it also makes clk_round_rate() and clk_set_rate() behave differently if there's a range and the rate being used for both is outside that range. As we have seen, the rate will be returned unchanged by clk_round_rate(), but clk_set_rate() will error out returning -EINVAL.
Let's make sure the framework will always clamp the rate to the current range found on the clock, which will fix both these inconsistencies.
--- drivers/clk/clk.c | 2 ++ drivers/clk/clk_test.c | 46 +++++++++++++++++++++++++----------------- 2 files changed, 30 insertions(+), 18 deletions(-)
drivers/clk/clk.c +2 -0
@@ -1348,6 +1348,8 @@ static int clk_core_determine_round_nolock(struct clk_core *core,if (!core)return 0 ; + req->rate =clamp (req->rate, req->min_rate, req->max_rate); +/* * At this point, core protection will be disabled * - if the provider is not protected at all
drivers/clk/clk_test.c +28 -18
130 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v5 4/11 clk: Use clamp instead of open-coding our own
In reply to Maxime RipardThe code in clk_set_rate_range() will, if the current rate is outside of the new range, will force it to the minimum or maximum.
Since it's running under the condition that the rate is either lower than the minimum, or higher than the maximum, this is equivalent to using clamp, while being less readable. Let's switch to using clamp instead.
--- drivers/clk/clk.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/clk/clk.c +1 -5
@@ -2388,11 +2388,7 @@ int clk_set_rate_range(struct clk *clk, unsigned long min, unsigned long max)* this corner case when determining the rate */ -if (rate < min) - rate = min; -else - rate = max; - + rate =clamp (clk->core->req_rate, min, max); ret =clk_core_set_rate_nolock (clk->core, rate);if (ret) {/* rollback the changes */
Signature · 1 line
2.35.1
PATCH v5 5/11 clk: Always set the rate on clk_set_range_rate
In reply to Maxime RipardWhen we change a clock minimum or maximum using clk_set_rate_range(), clk_set_min_rate() or clk_set_max_rate(), the current code will only trigger a new rate change if the rate is outside of the new boundaries.
However, a clock driver might want to always keep the clock rate to one of its boundary, for example the minimum to keep the power consumption as low as possible.
Since they don't always get called though, clock providers don't have the opportunity to implement this behaviour.
Let's trigger a clk_set_rate() on the previous requested rate every time clk_set_rate_range() is called. That way, providers that care about the new boundaries have a chance to adjust the rate, while providers that don't care about those new boundaries will return the same rate than before, which will be ignored by clk_set_rate() and won't result in a new rate change.
--- drivers/clk/clk.c | 45 ++++++++++++++++---------------- drivers/clk/clk_test.c | 58 +++++++++++++++++++----------------------- 2 files changed, 49 insertions(+), 54 deletions(-)
drivers/clk/clk.c +23 -22
@@ -2373,28 +2373,29 @@ int clk_set_rate_range(struct clk *clk, unsigned long min, unsigned long max) goto out; } - rate =clk_core_get_rate_nolock (clk->core); -if (rate < min || rate > max) { -/* -* FIXME: -* We are in bit of trouble here, current rate is outside the -* the requested range. We are going try to request appropriate -* range boundary but there is a catch. It may fail for the -* usual reason (clock broken, clock protected, etc) but also -* because: -* - round_rate() was not favorable and fell on the wrong -* side of the boundary -* - the determine_rate() callback does not really check for -* this corner case when determining the rate -*/ - - rate =clamp (clk->core->req_rate, min, max); - ret =clk_core_set_rate_nolock (clk->core, rate); -if (ret) { -/* rollback the changes */ - clk->min_rate = old_min; - clk->max_rate = old_max; - } +/* +* Since the boundaries have been changed, let's give the +* opportunity to the provider to adjust the clock rate based on +* the new boundaries. +* +* We also need to handle the case where the clock is currently +* outside of the boundaries. Clamping the last requested rate +* to the current minimum and maximum will also handle this. +* +* FIXME: +* There is a catch. It may fail for the usual reason (clock +* broken, clock protected, etc) but also because: +* - round_rate() was not favorable and fell on the wrong +* side of the boundary +* - the determine_rate() callback does not really check for +* this corner case when determining the rate +*/ + rate =clamp (clk->core->req_rate, min, max); + ret =clk_core_set_rate_nolock (clk->core, rate); +if (ret) { +/* rollback the changes */ + clk->min_rate = old_min; + clk->max_rate = old_max; } out:
drivers/clk/clk_test.c +26 -32
104 lines not on this page · raw message
Signature · 1 line
2.35.1
PATCH v5 6/11 clk: Add clk_drop_range
In reply to Maxime RipardIn order to reset the range on a clock, we need to call clk_set_rate_range with a minimum of 0 and a maximum of ULONG_MAX. Since it's fairly inconvenient, let's introduce a clk_drop_range() function that will do just this.
--- drivers/clk/clk_test.c | 4 ++-- include/linux/clk.h | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-)
drivers/clk/clk_test.c +2 -2
@@ -640,7 +640,7 @@ static void clk_range_test_multiple_set_range_rate_maximized(struct kunit *test)KUNIT_EXPECT_EQ (test, rate,DUMMY_CLOCK_RATE_1 );KUNIT_ASSERT_EQ (test, -clk_set_rate_range (user2,0 ,ULONG_MAX ), +clk_drop_range (user2),0 ); rate =clk_get_rate (clk);
@@ -757,7 +757,7 @@ static void clk_range_test_multiple_set_range_rate_minimized(struct kunit *test)KUNIT_EXPECT_EQ (test, rate,DUMMY_CLOCK_RATE_2 );KUNIT_ASSERT_EQ (test, -clk_set_rate_range (user2,0 ,ULONG_MAX ), +clk_drop_range (user2),0 ); rate =clk_get_rate (clk);
include/linux/clk.h +11 -0
@@ -986,6 +986,17 @@ static inline void clk_bulk_disable_unprepare(int num_clks,clk_bulk_unprepare (num_clks, clks); } +/** +* clk_drop_range - Reset any range set on that clock +* @clk: clock source +* +* Returns success (0) or negative errno. +*/ +static inline int clk_drop_range (struct clk *clk) +{ +return clk_set_rate_range (clk,0 ,ULONG_MAX ); +} +/** * clk_get_optional - lookup and obtain a reference to an optional clock * producer.
Signature · 1 line
2.35.1
PATCH v5 7/11 clk: bcm: rpi: Add variant structure
In reply to Maxime RipardWe only export a bunch of firmware clocks, and some of them require special treatment.
This has been do so far using some tests on the clock id in various places, but this is fairly hard to extend and doesn't scale very well.
Since we'll need some more cases in the next patches, let's switch to a variant structure that defines the behaviour we need to have for a given clock.
--- drivers/clk/bcm/clk-raspberrypi.c | 62 +++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 16 deletions(-)
drivers/clk/bcm/clk-raspberrypi.c +46 -16
@@ -56,6 +56,8 @@ static char *rpi_firmware_clk_names[] = {#define RPI_FIRMWARE_STATE_ENABLE_BIT BIT(0)#define RPI_FIRMWARE_STATE_WAIT_BIT BIT(1) +struct raspberrypi_clk_variant ; +struct raspberrypi_clk {struct device *dev;struct rpi_firmware *firmware;
@@ -66,10 +68,36 @@ struct raspberrypi_clk_data {struct clk_hw hw;unsigned int id; +struct raspberrypi_clk_variant *variant;struct raspberrypi_clk *rpi; }; +struct raspberrypi_clk_variant { +bool export; +char *clkdev; +}; + +static struct raspberrypi_clk_variant +raspberrypi_clk_variants[RPI_FIRMWARE_NUM_CLK_ID ] = { + [RPI_FIRMWARE_ARM_CLK_ID ] = { + .export = true, + .clkdev ="cpu0" , + }, + [RPI_FIRMWARE_CORE_CLK_ID ] = { + .export = true, + }, + [RPI_FIRMWARE_M2MC_CLK_ID ] = { + .export = true, + }, + [RPI_FIRMWARE_V3D_CLK_ID ] = { + .export = true, + }, + [RPI_FIRMWARE_PIXEL_BVB_CLK_ID ] = { + .export = true, + }, +}; +/* * Structure of the message passed to Raspberry Pi's firmware in order to * change clock rates. The 'disable_turbo' option is only available to the ARM
@@ -183,7 +211,8 @@ static const struct clk_ops raspberrypi_firmware_clk_ops = {static struct clk_hw *raspberrypi_clk_register (struct raspberrypi_clk *rpi,unsigned int parent, -unsigned int id) +unsigned int id, +struct raspberrypi_clk_variant *variant) {struct raspberrypi_clk_data *data;struct clk_init_data init = {};
@@ -195,6 +224,7 @@ static struct clk_hw *raspberrypi_clk_register(struct raspberrypi_clk *rpi,return ERR_PTR (-ENOMEM ); data->rpi = rpi; data->id = id; + data->variant = variant; init.name = devm_kasprintf(rpi->dev, GFP_KERNEL, "fw-clk-%s",
@@ -228,9 +258,9 @@ static struct clk_hw *raspberrypi_clk_register(struct raspberrypi_clk *rpi,clk_hw_set_rate_range (&data->hw, min_rate, max_rate); -if (id ==RPI_FIRMWARE_ARM_CLK_ID ) { +if (variant->clkdev) { ret =devm_clk_hw_register_clkdev (rpi->dev, &data->hw, -NULL ,"cpu0" ); +NULL , variant->clkdev);if (ret) {dev_err (rpi->dev,"Failed to initialize clkdev\n" );return ERR_PTR (ret);
@@ -264,27 +294,27 @@ static int raspberrypi_discover_clocks(struct raspberrypi_clk *rpi,return ret;while (clks->id) { -struct clk_hw *hw; +struct raspberrypi_clk_variant *variant; + +if (clks->id >RPI_FIRMWARE_NUM_CLK_ID ) { +dev_err (rpi->dev,"Unknown clock id: %u" , clks->id); +return -EINVAL ; + } + + variant = &raspberrypi_clk_variants[clks->id]; +if (variant->export) { +struct clk_hw *hw; -switch (clks->id) { -case RPI_FIRMWARE_ARM_CLK_ID : -case RPI_FIRMWARE_CORE_CLK_ID : -case RPI_FIRMWARE_M2MC_CLK_ID : -case RPI_FIRMWARE_V3D_CLK_ID : -case RPI_FIRMWARE_PIXEL_BVB_CLK_ID : hw =raspberrypi_clk_register (rpi, clks->parent, - clks->id); + clks->id, variant);if (IS_ERR (hw))return PTR_ERR (hw); data->hws[clks->id] = hw; data->num = clks->id +1 ; - fallthrough; - -default : - clks++; -break ; } + + clks++; }return 0 ;
Signature · 1 line
2.35.1
PATCH v5 8/11 clk: bcm: rpi: Set a default minimum rate
In reply to Maxime RipardThe M2MC clock provides the state machine clock for both HDMI controllers.
However, if no HDMI monitor is plugged in at boot, its clock rate will be left at 0 by the firmware and will make any register access end up in a CPU stall, even though the clock was enabled.
We had some code in the HDMI controller to deal with this before, but it makes more sense to have it in the clock driver. Move it there.
--- drivers/clk/bcm/clk-raspberrypi.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+)
drivers/clk/bcm/clk-raspberrypi.c +26 -0
@@ -76,6 +76,7 @@ struct raspberrypi_clk_data {struct raspberrypi_clk_variant {bool export;char *clkdev; +unsigned long min_rate; }; static struct raspberrypi_clk_variant
@@ -89,6 +90,18 @@ raspberrypi_clk_variants[RPI_FIRMWARE_NUM_CLK_ID] = { }, [RPI_FIRMWARE_M2MC_CLK_ID] = { .export = true, + +/* +* If we boot without any cable connected to any of the +* HDMI connector, the firmware will skip the HSM +* initialization and leave it with a rate of 0, +* resulting in a bus lockup when we're accessing the +* registers even if it's enabled. +* +* Let's put a sensible default so that we don't end up +* in this situation. +*/ + .min_rate = 120000000, }, [RPI_FIRMWARE_V3D_CLK_ID] = { .export = true,
@@ -267,6 +280,19 @@ static struct clk_hw *raspberrypi_clk_register(struct raspberrypi_clk *rpi, } } +if (variant->min_rate) { +unsigned long rate; + +clk_hw_set_rate_range (&data->hw, variant->min_rate, max_rate); + + rate =raspberrypi_fw_get_rate (&data->hw,0 ); +if (rate < variant->min_rate) { + ret =raspberrypi_fw_set_rate (&data->hw, variant->min_rate,0 ); +if (ret) +return ERR_PTR (ret); + } + } +return &data->hw; }
Signature · 1 line
2.35.1
PATCH v5 9/11 clk: bcm: rpi: Run some clocks at the minimum rate allowed
In reply to Maxime RipardThe core clock and M2MC clocks are shared between some devices (Unicam controllers and the HVS, and the HDMI controllers, respectively) that will have various, varying, requirements depending on their current work load.
Since those loads can require a fairly high clock rate in extreme conditions (up to ~600MHz), we can end up running those clocks at their maximum frequency even though we no longer require such a high rate.
Fortunately, those devices don't require an exact rate but a minimum rate, and all the drivers are using clk_set_min_rate. Thus, we can just rely on the fact that the clk_request minimum (which is the aggregated minimum of all the clock users) is what we want at all times.
--- drivers/clk/bcm/clk-raspberrypi.c | 37 +++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+)
drivers/clk/bcm/clk-raspberrypi.c +37 -0
@@ -77,6 +77,7 @@ struct raspberrypi_clk_variant {bool export;char *clkdev;unsigned long min_rate; +bool minimize; }; static struct raspberrypi_clk_variant
@@ -87,6 +88,18 @@ raspberrypi_clk_variants[RPI_FIRMWARE_NUM_CLK_ID] = { }, [RPI_FIRMWARE_CORE_CLK_ID] = { .export = true, + +/* +* The clock is shared between the HVS and the CSI +* controllers, on the BCM2711 and will change depending +* on the pixels composited on the HVS and the capture +* resolution on Unicam. +* +* Since the rate can get quite large, and we need to +* coordinate between both driver instances, let's +* always use the minimum the drivers will let us. +*/ + .minimize = true, }, [RPI_FIRMWARE_M2MC_CLK_ID] = { .export = true,
@@ -102,6 +115,16 @@ raspberrypi_clk_variants[RPI_FIRMWARE_NUM_CLK_ID] = {* in this situation. */ .min_rate = 120000000, + +/* +* The clock is shared between the two HDMI controllers +* on the BCM2711 and will change depending on the +* resolution output on each. Since the rate can get +* quite large, and we need to coordinate between both +* driver instances, let's always use the minimum the +* drivers will let us. +*/ + .minimize = true, }, [RPI_FIRMWARE_V3D_CLK_ID] = { .export = true,
@@ -206,12 +229,26 @@ static int raspberrypi_fw_set_rate(struct clk_hw *hw, unsigned long rate,static int raspberrypi_fw_dumb_determine_rate (struct clk_hw *hw,struct clk_rate_request *req) { +struct raspberrypi_clk_data *data = + container_of(hw, struct raspberrypi_clk_data, hw); +struct raspberrypi_clk_variant *variant = data->variant; +/* * The firmware will do the rounding but that isn't part of * the interface with the firmware, so we just do our best * here. */ + req->rate =clamp (req->rate, req->min_rate, req->max_rate); + +/* +* We want to aggressively reduce the clock rate here, so let's +* just ignore the requested rate and return the bare minimum +* rate we can get away with. +*/ +if (variant->minimize && req->min_rate >0 ) + req->rate = req->min_rate; +return 0 ; }
Signature · 1 line
2.35.1
PATCH v5 10/11 drm/vc4: Add logging and comments
In reply to Maxime RipardThe HVS core clock isn't really obvious, so let's add a bunch more comments and some logging for easier debugging.
--- drivers/gpu/drm/vc4/vc4_kms.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
drivers/gpu/drm/vc4/vc4_kms.c +11 -0
@@ -389,8 +389,15 @@ static void vc4_atomic_commit_tail(struct drm_atomic_state *state)500000000 , new_hvs_state->core_clock_rate); +drm_dbg (dev,"Raising the core clock at %lu Hz\n" , core_rate); + +/* +* Do a temporary request on the core clock during the +* modeset. +*/ clk_set_min_rate (hvs->core_clk, core_rate); } +drm_atomic_helper_commit_modeset_disables (dev, state);vc4_ctm_commit (vc4, state);
@@ -416,6 +423,10 @@ static void vc4_atomic_commit_tail(struct drm_atomic_state *state)drm_dbg (dev,"Running the core clock at %lu Hz\n" , new_hvs_state->core_clock_rate); +/* +* Request a clock rate based on the current HVS +* requirements. +*/ clk_set_min_rate (hvs->core_clk, new_hvs_state->core_clock_rate); } }
Signature · 1 line
2.35.1
PATCH v5 11/11 drm/vc4: hdmi: Remove clock rate initialization
In reply to Maxime RipardNow that the clock driver makes sure we never end up with a rate of 0, the HDMI driver doesn't need to care anymore.
--- drivers/gpu/drm/vc4/vc4_hdmi.c | 13 ------------- 1 file changed, 13 deletions(-)
drivers/gpu/drm/vc4/vc4_hdmi.c +0 -13
@@ -2576,19 +2576,6 @@ static int vc4_hdmi_bind(struct device *dev, struct device *master, void *data) vc4_hdmi->disable_4kp60 = true; } -/* -* If we boot without any cable connected to the HDMI connector, -* the firmware will skip the HSM initialization and leave it -* with a rate of 0, resulting in a bus lockup when we're -* accessing the registers even if it's enabled. -* -* Let's put a sensible default at runtime_resume so that we -* don't end up in this situation. -*/ - ret =clk_set_min_rate (vc4_hdmi->hsm_clock,HSM_MIN_CLOCK_FREQ ); -if (ret) - goto err_put_ddc; -/* * We need to have the device powered up at this point to call * our reset hook and for the CEC init.
Signature · 1 line
2.35.1