From: Yang Xiwen <[email protected]> Add a test for the newly introduced CLK_LAZY_REPARENT feature.
Modify clk_sandbox_ccf driver to register two clocks(i2s and i2s_root) in reversed order. The test function then try to acquire the clocks and asserts that their internal states are maintained correctly. Ensure clk->parent_name is NULL in all "normal" cases so existing drivers are not broken by this feature. Signed-off-by: Yang Xiwen <[email protected]> --- drivers/clk/clk_sandbox_ccf.c | 10 ++++++++++ include/sandbox-clk.h | 2 ++ test/dm/clk_ccf.c | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+) diff --git a/drivers/clk/clk_sandbox_ccf.c b/drivers/clk/clk_sandbox_ccf.c index 9b8036d41aac..86f75132d548 100644 --- a/drivers/clk/clk_sandbox_ccf.c +++ b/drivers/clk/clk_sandbox_ccf.c @@ -229,6 +229,7 @@ static const struct udevice_id sandbox_clk_ccf_test_ids[] = { static const char *const usdhc_sels[] = { "pll3_60m", "pll3_80m", }; static const char *const i2c_sels[] = { "pll3_60m", "pll3_80m", }; +static const char *const i2s_sels[] = { "pll3_60m", "pll3_80m", }; static int sandbox_clk_ccf_probe(struct udevice *dev) { @@ -277,6 +278,15 @@ static int sandbox_clk_ccf_probe(struct udevice *dev) dev_clk_dm(dev, SANDBOX_CLK_I2C_ROOT, sandbox_clk_gate2("i2c_root", "i2c", base + 0x7c, 0)); + /* Register i2s_root(child) and i2s(parent) in reverse order to test CLK_LAZY_REPARENT */ + dev_clk_dm(dev, SANDBOX_CLK_I2S_ROOT, + sandbox_clk_gate2("i2s_root", "i2s", base + 0x80, 0)); + + reg = BIT(29) | BIT(25) | BIT(17); + dev_clk_dm(dev, SANDBOX_CLK_I2S, + sandbox_clk_composite("i2s", i2s_sels, ARRAY_SIZE(i2s_sels), + ®, CLK_SET_RATE_UNGATE)); + return 0; } diff --git a/include/sandbox-clk.h b/include/sandbox-clk.h index c2616c27a44a..0cd735e3ad5f 100644 --- a/include/sandbox-clk.h +++ b/include/sandbox-clk.h @@ -21,6 +21,8 @@ enum { SANDBOX_CLK_USDHC2_SEL, SANDBOX_CLK_I2C, SANDBOX_CLK_I2C_ROOT, + SANDBOX_CLK_I2S, + SANDBOX_CLK_I2S_ROOT, }; enum sandbox_pllv3_type { diff --git a/test/dm/clk_ccf.c b/test/dm/clk_ccf.c index 9c06aadb7ed3..8bbb79bec2ac 100644 --- a/test/dm/clk_ccf.c +++ b/test/dm/clk_ccf.c @@ -35,12 +35,14 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) ret = clk_get_by_id(CLK_ID(dev, SANDBOX_CLK_ECSPI_ROOT), &clk); ut_assertok(ret); ut_asserteq_str("ecspi_root", clk->dev->name); + ut_assertnull(clk->parent_name); ut_asserteq(CLK_SET_RATE_PARENT, clk->flags); /* Test for clk_get_parent_rate() */ ret = clk_get_by_id(CLK_ID(dev, SANDBOX_CLK_ECSPI1), &clk); ut_assertok(ret); ut_asserteq_str("ecspi1", clk->dev->name); + ut_assertnull(clk->parent_name); ut_asserteq(CLK_SET_RATE_PARENT, clk->flags); rate = clk_get_parent_rate(clk); @@ -50,6 +52,7 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) ret = clk_get_by_id(CLK_ID(dev, SANDBOX_CLK_ECSPI0), &clk); ut_assertok(ret); ut_asserteq_str("ecspi0", clk->dev->name); + ut_assertnull(clk->parent_name); ut_asserteq(CLK_SET_RATE_PARENT, clk->flags); rate = clk_get_parent_rate(clk); @@ -59,6 +62,7 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) ret = clk_get_by_id(CLK_ID(dev, SANDBOX_CLK_USDHC1_SEL), &clk); ut_assertok(ret); ut_asserteq_str("usdhc1_sel", clk->dev->name); + ut_assertnull(clk->parent_name); ut_asserteq(CLK_SET_RATE_NO_REPARENT, clk->flags); rate = clk_get_parent_rate(clk); @@ -71,6 +75,7 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) ut_asserteq_64(60000000, rate); ret = clk_get_by_id(CLK_ID(dev, SANDBOX_CLK_PLL3_80M), &pclk); + ut_assertnull(clk->parent_name); ut_assertok(ret); ret = clk_set_parent(clk, pclk); @@ -82,6 +87,7 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) ret = clk_get_by_id(CLK_ID(dev, SANDBOX_CLK_USDHC2_SEL), &clk); ut_assertok(ret); ut_asserteq_str("usdhc2_sel", clk->dev->name); + ut_assertnull(clk->parent_name); ut_asserteq(CLK_SET_RATE_NO_REPARENT, clk->flags); rate = clk_get_parent_rate(clk); @@ -98,6 +104,7 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) ut_asserteq_64(80000000, rate); ret = clk_get_by_id(CLK_ID(dev, SANDBOX_CLK_PLL3_60M), &pclk); + ut_assertnull(clk->parent_name); ut_assertok(ret); ret = clk_set_parent(clk, pclk); @@ -110,6 +117,7 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) ret = clk_get_by_id(CLK_ID(dev, SANDBOX_CLK_I2C), &clk); ut_assertok(ret); ut_asserteq_str("i2c", clk->dev->name); + ut_assertnull(clk->parent_name); ut_asserteq(CLK_SET_RATE_UNGATE, clk->flags); rate = clk_get_rate(clk); @@ -124,11 +132,13 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) ret = clk_get_by_index(test_dev, SANDBOX_CLK_TEST_ID_I2C_ROOT, &clk_ccf); ut_assertok(ret); ut_asserteq_str("clk-ccf", clk_ccf.dev->name); + ut_assertnull(clk->parent_name); ut_asserteq(CLK_ID(clk_ccf.dev, SANDBOX_CLK_I2C_ROOT), clk_ccf.id); ret = clk_get_by_id(CLK_ID(dev, SANDBOX_CLK_I2C_ROOT), &clk); ut_assertok(ret); ut_asserteq_str("i2c_root", clk->dev->name); + ut_assertnull(clk->parent_name); ut_asserteq(SANDBOX_CLK_I2C_ROOT, clk_get_id(clk)); ret = clk_enable(&clk_ccf); @@ -138,6 +148,7 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) ut_asserteq(1, ret); ret = clk_get_by_id(CLK_ID(dev, SANDBOX_CLK_I2C), &pclk); + ut_assertnull(clk->parent_name); ut_assertok(ret); ret = sandbox_clk_enable_count(pclk); @@ -156,6 +167,7 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) ret = clk_get_by_id(CLK_ID(dev, SANDBOX_CLK_USDHC1_SEL), &clk); ut_assertok(ret); ut_asserteq_str("usdhc1_sel", clk->dev->name); + ut_assertnull(clk->parent_name); pclk = clk_get_parent(clk); ut_assertok_ptr(pclk); @@ -169,6 +181,7 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) ret = clk_get_by_id(CLK_ID(dev, clkid), &pclk); ut_assertok(ret); + ut_assertnull(clk->parent_name); ret = clk_set_parent(clk, pclk); ut_assertok(ret); pclk = clk_get_parent(clk); @@ -179,6 +192,7 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) ret = clk_get_by_id(CLK_ID(dev, SANDBOX_CLK_I2C_ROOT), &clk); ut_assertok(ret); ut_asserteq_str("i2c_root", clk->dev->name); + ut_assertnull(clk->parent_name); /* Disable it, if any. */ ret = sandbox_clk_enable_count(clk); @@ -209,3 +223,29 @@ static int dm_test_clk_ccf(struct unit_test_state *uts) return 1; } DM_TEST(dm_test_clk_ccf, UTF_SCAN_FDT); + +#if CONFIG_IS_ENABLED(CLK_LAZY_REPARENT) +/* Test CLK_LAZY_REPARENT feature */ +static int dm_test_clk_lazy_reparent(struct unit_test_state *uts) +{ + struct udevice *dev; + struct clk *clk_i2s, *clk_i2s_root; + + /* Get the device using the clk device */ + ut_assertok(uclass_get_device_by_name(UCLASS_CLK, "clk-ccf", &dev)); + + ut_assertok(clk_get_by_id(CLK_ID(dev, SANDBOX_CLK_I2S_ROOT), &clk_i2s_root)); + ut_assertok(clk_get_by_id(CLK_ID(dev, SANDBOX_CLK_I2S), &clk_i2s)); + + ut_asserteq_str(clk_i2s_root->parent_name, "i2s"); + ut_assertnull(clk_i2s_root->dev->parent); + + ut_assertok(clk_enable(clk_i2s_root)); + + ut_assertnull(clk_i2s_root->parent_name); + ut_asserteq_ptr(clk_i2s_root->dev->parent, clk_i2s->dev); + + return 0; +} +DM_TEST(dm_test_clk_lazy_reparent, UTF_SCAN_FDT); +#endif -- 2.43.0
