clk: test: Test clock-assigned-rates{-u64}
Subsystems (2)
Stephen Boyd
maintainercover clk: test: Test clock-assigned-rates{-u64}
Add some kunit tests for the clock-assigned-rates and clock-assigned-rates-64 DT properties. I think it may be possible to crush this down into more carefully chosen DT overlay applications of properties but this works for now.
This is based on a merge of the clk-assigned-rates and clk-kunit branches in clk.git
Stephen Boyd (3):
clk: test: Add test managed of_clk_add_hw_provider()
of: kunit: Extract some overlay boiler plate into macros
clk: test: Add KUnit tests for clock-assigned-rates{-u64} DT
properties
drivers/clk/Makefile | 14 + drivers/clk/clk_kunit_helpers.c | 30 ++ drivers/clk/clk_test.c | 321 ++++++++++++++++++ drivers/clk/kunit_clk_assigned_rates.h | 8 + .../kunit_clk_assigned_rates_multiple.dtso | 16 + ..._clk_assigned_rates_multiple_consumer.dtso | 20 ++ .../clk/kunit_clk_assigned_rates_null.dtso | 14 + ...unit_clk_assigned_rates_null_consumer.dtso | 18 + drivers/clk/kunit_clk_assigned_rates_one.dtso | 14 + ...kunit_clk_assigned_rates_one_consumer.dtso | 18 + ...kunit_clk_assigned_rates_u64_multiple.dtso | 16 + ..._assigned_rates_u64_multiple_consumer.dtso | 20 ++ .../clk/kunit_clk_assigned_rates_u64_one.dtso | 14 + ...t_clk_assigned_rates_u64_one_consumer.dtso | 18 + .../clk/kunit_clk_assigned_rates_without.dtso | 13 + ...t_clk_assigned_rates_without_consumer.dtso | 17 + .../clk/kunit_clk_assigned_rates_zero.dtso | 12 + ...unit_clk_assigned_rates_zero_consumer.dtso | 16 + include/kunit/clk.h | 4 + include/kunit/of.h | 14 +- 20 files changed, 613 insertions(+), 4 deletions(-) create mode 100644 drivers/clk/kunit_clk_assigned_rates.h create mode 100644 drivers/clk/kunit_clk_assigned_rates_multiple.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_multiple_consumer.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_null.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_null_consumer.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_one.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_one_consumer.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_u64_multiple.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_u64_multiple_consumer.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_u64_one.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_u64_one_consumer.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_without.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_without_consumer.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_zero.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_zero_consumer.dtso
base-commit: 76eb1b6085c2dbae07d584536fe6b1e06245da6a
Signature · 2 lines
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/ https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git
Stephen Boyd
maintainerPATCH 1/3 clk: test: Add test managed of_clk_add_hw_provider()
Add a test managed version of of_clk_add_hw_provider() that automatically unregisters the clk_hw provider upon test conclusion.
--- drivers/clk/clk_kunit_helpers.c | 30 ++++++++++++++++++++++++++++++ include/kunit/clk.h | 4 ++++ 2 files changed, 34 insertions(+)
drivers/clk/clk_kunit_helpers.c +30 -0
@@ -203,5 +203,35 @@ int of_clk_hw_register_kunit(struct kunit *test, struct device_node *node, struc }EXPORT_SYMBOL_GPL (of_clk_hw_register_kunit); +KUNIT_DEFINE_ACTION_WRAPPER (of_clk_del_provider_wrapper, + of_clk_del_provider, struct device_node *); + +/** +* of_clk_add_hw_provider_kunit() - Test managed of_clk_add_hw_provider() +* @test: The test context +* @np: Device node pointer associated with clock provider +* @get: Callback for decoding clk_hw +* @data: Context pointer for @get callback. +* +* Just like of_clk_add_hw_provider(), except the clk_hw provider is managed by +* the test case and is automatically unregistered after the test case +* concludes. +* +* Return: 0 on success or a negative errno value on failure. +*/ +int of_clk_add_hw_provider_kunit (struct kunit *test,struct device_node *np, +struct clk_hw *(*get)(struct of_phandle_args *clkspec,void *data), +void *data) +{ +int ret; + + ret =of_clk_add_hw_provider (np, get, data); +if (ret) +return ret; + +return kunit_add_action_or_reset (test, of_clk_del_provider_wrapper, np); +} +EXPORT_SYMBOL_GPL (of_clk_add_hw_provider_kunit); +MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("KUnit helpers for clk providers and consumers" );
include/kunit/clk.h +4 -0
@@ -25,4 +25,8 @@ int clk_hw_register_kunit(struct kunit *test, struct device *dev, struct clk_hwint of_clk_hw_register_kunit (struct kunit *test,struct device_node *node,struct clk_hw *hw); +int of_clk_add_hw_provider_kunit (struct kunit *test,struct device_node *np, +struct clk_hw *(*get)(struct of_phandle_args *clkspec,void *data), +void *data); +#endif
Signature · 2 lines
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/ https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git
Stephen Boyd
maintainerPATCH 2/3 of: kunit: Extract some overlay boiler plate into macros
In reply to Stephen BoydMake the lives of __of_overlay_apply_kunit() callers easier by extracting some of the boiler plate involved in referencing the DT overlays.
--- include/kunit/of.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
include/kunit/of.h +10 -4
@@ -62,6 +62,13 @@ static inline int __of_overlay_apply_kunit(struct kunit *test, &unused); } +#define of_overlay_begin (overlay_name) __dtbo_##overlay_name##_begin +#define of_overlay_end (overlay_name) __dtbo_##overlay_name##_end + +#define OF_OVERLAY_DECLARE (overlay_name) \ + extern uint8_t of_overlay_begin(overlay_name)[]; \ + extern uint8_t of_overlay_end(overlay_name)[] \ +/** * of_overlay_apply_kunit() - Test managed of_overlay_fdt_apply() for built-in overlays * @test: test context
@@ -104,12 +111,11 @@ static inline int __of_overlay_apply_kunit(struct kunit *test,*/ #define of_overlay_apply_kunit (test, overlay_name) \ ({ \ - extern uint8_t __dtbo_##overlay_name##_begin[]; \ - extern uint8_t __dtbo_##overlay_name##_end[]; \ + OF_OVERLAY_DECLARE(overlay_name); \ \ __of_overlay_apply_kunit((test), \ - __dtbo_##overlay_name##_begin, \ - __dtbo_##overlay_name##_end); \ + of_overlay_begin(overlay_name), \ + of_overlay_end(overlay_name)); \ })#endif
Signature · 2 lines
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/ https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git
Stephen Boyd
maintainerPATCH 3/3 clk: test: Add KUnit tests for clock-assigned-rates{-u64} DT properties
In reply to Stephen BoydAdd unit tests for the two types of assigned rate properties. Test different combinations of assigned clocks and make sure that rates aren't assigned when the DT properties are malformed or are zero.
--- drivers/clk/Makefile | 14 + drivers/clk/clk_test.c | 321 ++++++++++++++++++ drivers/clk/kunit_clk_assigned_rates.h | 8 + .../kunit_clk_assigned_rates_multiple.dtso | 16 + ..._clk_assigned_rates_multiple_consumer.dtso | 20 ++ .../clk/kunit_clk_assigned_rates_null.dtso | 14 + ...unit_clk_assigned_rates_null_consumer.dtso | 18 + drivers/clk/kunit_clk_assigned_rates_one.dtso | 14 + ...kunit_clk_assigned_rates_one_consumer.dtso | 18 + ...kunit_clk_assigned_rates_u64_multiple.dtso | 16 + ..._assigned_rates_u64_multiple_consumer.dtso | 20 ++ .../clk/kunit_clk_assigned_rates_u64_one.dtso | 14 + ...t_clk_assigned_rates_u64_one_consumer.dtso | 18 + .../clk/kunit_clk_assigned_rates_without.dtso | 13 + ...t_clk_assigned_rates_without_consumer.dtso | 17 + .../clk/kunit_clk_assigned_rates_zero.dtso | 12 + ...unit_clk_assigned_rates_zero_consumer.dtso | 16 + 17 files changed, 569 insertions(+) create mode 100644 drivers/clk/kunit_clk_assigned_rates.h create mode 100644 drivers/clk/kunit_clk_assigned_rates_multiple.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_multiple_consumer.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_null.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_null_consumer.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_one.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_one_consumer.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_u64_multiple.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_u64_multiple_consumer.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_u64_one.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_u64_one_consumer.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_without.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_without_consumer.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_zero.dtso create mode 100644 drivers/clk/kunit_clk_assigned_rates_zero_consumer.dtso
drivers/clk/Makefile +14 -0
@@ -4,6 +4,20 @@ 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 clk-test-y := clk_test.o \ + kunit_clk_assigned_rates_u64_one.dtbo.o \ + kunit_clk_assigned_rates_u64_one_consumer.dtbo.o \ + kunit_clk_assigned_rates_u64_multiple.dtbo.o \ + kunit_clk_assigned_rates_u64_multiple_consumer.dtbo.o \ + kunit_clk_assigned_rates_multiple.dtbo.o \ + kunit_clk_assigned_rates_multiple_consumer.dtbo.o \ + kunit_clk_assigned_rates_null.dtbo.o \ + kunit_clk_assigned_rates_null_consumer.dtbo.o \ + kunit_clk_assigned_rates_one.dtbo.o \ + kunit_clk_assigned_rates_one_consumer.dtbo.o \ + kunit_clk_assigned_rates_without.dtbo.o \ + kunit_clk_assigned_rates_without_consumer.dtbo.o \ + kunit_clk_assigned_rates_zero.dtbo.o \ + kunit_clk_assigned_rates_zero_consumer.dtbo.o \ kunit_clk_parent_data_test.dtbo.o obj-$(CONFIG_COMMON_CLK) += clk-divider.o obj-$(CONFIG_COMMON_CLK) += clk-fixed-factor.o
drivers/clk/clk_test.c +321 -0
340 lines not on this page · raw message
drivers/clk/kunit_clk_assigned_rates.h new file +8 -0
@@ -0,0 +1,8 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _KUNIT_CLK_ASSIGNED_RATES_H +#define _KUNIT_CLK_ASSIGNED_RATES_H + +#define ASSIGNED_RATES_0_RATE 1600000 +#define ASSIGNED_RATES_1_RATE 9700000 + +#endif
drivers/clk/kunit_clk_assigned_rates_multiple.dtso new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +/plugin/; + +#include "kunit_clk_assigned_rates.h" + +&{/} { + clk: kunit-clock { + compatible = "test,clk-assigned-rates"; + #clock-cells = <1>; + assigned-clocks = <&clk 0>, + <&clk 1>; + assigned-clock-rates = <ASSIGNED_RATES_0_RATE>, + <ASSIGNED_RATES_1_RATE>; + }; +};
drivers/clk/kunit_clk_assigned_rates_multiple_consumer.dtso new file +20 -0
@@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +/plugin/; + +#include "kunit_clk_assigned_rates.h" + +&{/} { + clk: kunit-clock { + compatible = "test,clk-assigned-rates"; + #clock-cells = <1>; + }; + + kunit-clock-consumer { + compatible = "test,clk-consumer"; + assigned-clocks = <&clk 0>, + <&clk 1>; + assigned-clock-rates = <ASSIGNED_RATES_0_RATE>, + <ASSIGNED_RATES_1_RATE>; + }; +};
drivers/clk/kunit_clk_assigned_rates_null.dtso new file +14 -0
@@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +/plugin/; + +#include "kunit_clk_assigned_rates.h" + +&{/} { + clk: kunit-clock { + compatible = "test,clk-assigned-rates"; + #clock-cells = <0>; + assigned-clocks = <0>; + assigned-clock-rates = <ASSIGNED_RATES_0_RATE>; + }; +};
drivers/clk/kunit_clk_assigned_rates_null_consumer.dtso new file +18 -0
@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +/plugin/; + +#include "kunit_clk_assigned_rates.h" + +&{/} { + clk: kunit-clock { + compatible = "test,clk-assigned-rates"; + #clock-cells = <0>; + }; + + kunit-clock-consumer { + compatible = "test,clk-consumer"; + assigned-clocks = <0>; + assigned-clock-rates = <ASSIGNED_RATES_0_RATE>; + }; +};
drivers/clk/kunit_clk_assigned_rates_one.dtso new file +14 -0
@@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +/plugin/; + +#include "kunit_clk_assigned_rates.h" + +&{/} { + clk: kunit-clock { + compatible = "test,clk-assigned-rates"; + #clock-cells = <0>; + assigned-clocks = <&clk>; + assigned-clock-rates = <ASSIGNED_RATES_0_RATE>; + }; +};
drivers/clk/kunit_clk_assigned_rates_one_consumer.dtso new file +18 -0
@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +/plugin/; + +#include "kunit_clk_assigned_rates.h" + +&{/} { + clk: kunit-clock { + compatible = "test,clk-assigned-rates"; + #clock-cells = <0>; + }; + + kunit-clock-consumer { + compatible = "test,clk-consumer"; + assigned-clocks = <&clk>; + assigned-clock-rates = <ASSIGNED_RATES_0_RATE>; + }; +};
drivers/clk/kunit_clk_assigned_rates_u64_multiple.dtso new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +/plugin/; + +#include "kunit_clk_assigned_rates.h" + +&{/} { + clk: kunit-clock { + compatible = "test,clk-assigned-rates"; + #clock-cells = <1>; + assigned-clocks = <&clk 0>, + <&clk 1>; + assigned-clock-rates-u64 = /bits/ 64 <ASSIGNED_RATES_0_RATE>, + /bits/ 64 <ASSIGNED_RATES_1_RATE>; + }; +};
drivers/clk/kunit_clk_assigned_rates_u64_multiple_consumer.dtso new file +20 -0
@@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +/plugin/; + +#include "kunit_clk_assigned_rates.h" + +&{/} { + clk: kunit-clock { + compatible = "test,clk-assigned-rates"; + #clock-cells = <1>; + }; + + kunit-clock-consumer { + compatible = "test,clk-consumer"; + assigned-clocks = <&clk 0>, + <&clk 1>; + assigned-clock-rates-u64 = /bits/ 64 <ASSIGNED_RATES_0_RATE>, + /bits/ 64 <ASSIGNED_RATES_1_RATE>; + }; +};
drivers/clk/kunit_clk_assigned_rates_u64_one.dtso new file +14 -0
@@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +/plugin/; + +#include "kunit_clk_assigned_rates.h" + +&{/} { + clk: kunit-clock { + compatible = "test,clk-assigned-rates"; + #clock-cells = <0>; + assigned-clocks = <&clk>; + assigned-clock-rates-u64 = /bits/ 64 <ASSIGNED_RATES_0_RATE>; + }; +};
drivers/clk/kunit_clk_assigned_rates_u64_one_consumer.dtso new file +18 -0
@@ -0,0 +1,18 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +/plugin/; + +#include "kunit_clk_assigned_rates.h" + +&{/} { + clk: kunit-clock { + compatible = "test,clk-assigned-rates"; + #clock-cells = <0>; + }; + + kunit-clock-consumer { + compatible = "test,clk-consumer"; + assigned-clocks = <&clk>; + assigned-clock-rates-u64 = /bits/ 64 <ASSIGNED_RATES_0_RATE>; + }; +};
drivers/clk/kunit_clk_assigned_rates_without.dtso new file +13 -0
@@ -0,0 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +/plugin/; + +#include "kunit_clk_assigned_rates.h" + +&{/} { + clk: kunit-clock { + compatible = "test,clk-assigned-rates"; + #clock-cells = <0>; + assigned-clock-rates = <ASSIGNED_RATES_0_RATE>; + }; +};
drivers/clk/kunit_clk_assigned_rates_without_consumer.dtso new file +17 -0
@@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +/plugin/; + +#include "kunit_clk_assigned_rates.h" + +&{/} { + clk: kunit-clock { + compatible = "test,clk-assigned-rates"; + #clock-cells = <0>; + }; + + kunit-clock-consumer { + compatible = "test,clk-consumer"; + assigned-clock-rates = <ASSIGNED_RATES_0_RATE>; + }; +};
drivers/clk/kunit_clk_assigned_rates_zero.dtso new file +12 -0
@@ -0,0 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +/plugin/; + +&{/} { + clk: kunit-clock { + compatible = "test,clk-assigned-rates"; + #clock-cells = <0>; + assigned-clocks = <&clk>; + assigned-clock-rates = <0>; + }; +};
drivers/clk/kunit_clk_assigned_rates_zero_consumer.dtso new file +16 -0
@@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +/plugin/; + +&{/} { + clk: kunit-clock { + compatible = "test,clk-assigned-rates"; + #clock-cells = <0>; + }; + + kunit-clock-consumer { + compatible = "test,clk-consumer"; + assigned-clocks = <&clk>; + assigned-clock-rates = <0>; + }; +};
Signature · 2 lines
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/ https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git
Re: [PATCH 1/3] clk: test: Add test managed of_clk_add_hw_provider()
In reply to Stephen BoydQuoting Stephen Boyd (2024-08-21 17:24:28)
Quoted 9 lines
Add a test managed version of
of_clk_add_hw_provider()that automatically unregisters theclk_hwprovider upon test conclusion.Cc Brendan Higgins <[email protected]>Cc David Gow <[email protected]>Cc Rae Moar <[email protected]>Cc Peng Fan <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Applied to clk-next
Re: [PATCH 2/3] of: kunit: Extract some overlay boiler plate into macros
In reply to Stephen BoydQuoting Stephen Boyd (2024-08-21 17:24:29)
Quoted 10 lines
Make the lives of
__of_overlay_apply_kunit()callers easier by extracting some of the boiler plate involved in referencing the DT overlays.Cc Brendan Higgins <[email protected]>Cc David Gow <[email protected]>Cc Rae Moar <[email protected]>Cc Peng Fan <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Applied to clk-next
Re: [PATCH 3/3] clk: test: Add KUnit tests for clock-assigned-rates{-u64} DT properties
In reply to Stephen BoydQuoting Stephen Boyd (2024-08-21 17:24:30)
Quoted 7 lines
Add unit tests for the two types of assigned rate properties. Test different combinations of assigned clocks and make sure that rates aren't assigned when the DT properties are malformed or are zero.
Cc Peng Fan <[email protected]>Signed-off-by Stephen Boyd <[email protected]>---
Applied to clk-next