[12/12] WIP: clk: Test behavior of children clks after a parent is unregistered

Message ID	20240815005520.1192374-13-sboyd@kernel.org (mailing list archive)
State	New
Headers	show Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F05342AB1; Thu, 15 Aug 2024 00:55:28 +0000 (UTC) From: Stephen Boyd <sboyd@kernel.org> To: Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@kernel.org> Cc: linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, patches@lists.linux.dev, =?utf-8?q?Nuno_S=C3=A1?= <nuno.sa@analog.com> Subject: [PATCH 12/12] WIP: clk: Test behavior of children clks after a parent is unregistered Date: Wed, 14 Aug 2024 17:55:18 -0700 Message-ID: <20240815005520.1192374-13-sboyd@kernel.org> In-Reply-To: <20240815005520.1192374-1-sboyd@kernel.org> References: <20240815005520.1192374-1-sboyd@kernel.org> Precedence: bulk MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit
Series	clk: Unit test clk unregistration paths \| expand [00/12] clk: Unit test clk unregistration paths [01/12] clk: Fix clk not being unlinked from consumers list [02/12] clk: test: Introduce clk_hw_unregister_kunit() [03/12] clk: test: Introduce clk_put_kunit() [04/12] clk: Add tests for unregistering clk_hw and using consumer APIs [05/12] clk: Fail phase APIs after clk_hw is unregistered [06/12] clk: Test clk_get_phase() behavior after clk_hw is unregistered [07/12] clk: Fail duty cycle APIs after clk_hw is unregistered [08/12] clk: Test clk_set_duty_cycle() behavior after clk_hw is unregistered [09/12] clk: Prevent unregistered clk_hw from being reinserted into clk tree [10/12] clk: Test clk_set_parent() behavior after clk_hw is unregistered [11/12] clk: Test parent/clk flags combos while unregistering a clk_hw [12/12] WIP: clk: Test behavior of children clks after a parent is unregistered

diff --git a/drivers/clk/clk_test.c b/drivers/clk/clk_test.c index 591897162056..e6479c002023 100644 --- a/drivers/clk/clk_test.c +++ b/drivers/clk/clk_test.c @@ -3133,6 +3133,17 @@ static void clk_unregister_consumer_clk_unregister(struct kunit *test) ctx->unregistered = true; } +static void clk_unregister_parent_consumer_clk_unregister(struct kunit *test) +{ + struct clk_unregister_consumer_clk_ctx *ctx = test->priv; + struct clk_hw *parent_hw = &ctx->parents[0].ctx.hw; + struct clk *parent_clk = ctx->parents[0].clk; + + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, parent_clk); + KUNIT_ASSERT_TRUE(test, clk_is_match(clk_get_parent(ctx->clk), parent_clk)); + KUNIT_ASSERT_EQ(test, 0, clk_hw_unregister_kunit(test, parent_hw)); +} + /* Test that clk_put() can be called after the clk_hw has been unregistered. */ static void clk_unregister_consumer_clk_put(struct kunit *test) { @@ -3143,6 +3154,15 @@ static void clk_unregister_consumer_clk_put(struct kunit *test) KUNIT_EXPECT_EQ(test, 0, clk_put_kunit(test, ctx->clk)); } +static void clk_unregister_parent_consumer_clk_put(struct kunit *test) +{ + struct clk_unregister_consumer_clk_ctx *ctx = test->priv; + + clk_unregister_parent_consumer_clk_unregister(test); + + KUNIT_EXPECT_EQ(test, 0, clk_put_kunit(test, ctx->clk)); +} + /* Test that clk_prepare() fails after the clk_hw has been unregistered. */ static void clk_unregister_consumer_clk_prepare_fails(struct kunit *test) { @@ -3358,6 +3378,24 @@ static void clk_unregister_consumer_clk_set_parent_fails(struct kunit *test) KUNIT_EXPECT_TRUE(test, clk_is_match(clk_get_parent(ctx->clk), ctx->parents[0].clk)); } +/* + * Test that clk_set_parent() doesn't re-parent the clk back to the clk that + * was unregistered. + */ +static void clk_unregister_parent_consumer_clk_set_parent(struct kunit *test) +{ + struct clk_unregister_consumer_clk_ctx *ctx = test->priv; + + kunit_skip(test, "Fix in the core. This blows up spectacularly!"); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, ctx->parents[0].clk); + KUNIT_ASSERT_TRUE(test, clk_is_match(clk_get_parent(ctx->clk), ctx->parents[0].clk)); + KUNIT_ASSERT_EQ(test, 0, clk_hw_unregister_kunit(test, &ctx->parents[0].ctx.hw)); + + KUNIT_EXPECT_TRUE(test, clk_is_match(clk_get_parent(ctx->clk), NULL)); + KUNIT_EXPECT_GT(test, 0, clk_set_parent(ctx->clk, ctx->parents[0].clk)); + KUNIT_EXPECT_TRUE(test, clk_is_match(clk_get_parent(ctx->clk), NULL)); +} + /* * Test that clk_get_parent() doesn't call the clk_op after the clk_hw has been * unregistered and returns original parent. @@ -3396,6 +3434,8 @@ static void clk_register_params_to_desc(const char *test_name, * @test_name: Test name * @_prev: Previous return value from this function * @desc: Test description (to be filled in) + * @must_have_parents: True if struct clk_register_params::num_parents must be + * 1 or greater * * Use this function in KUNIT_CASE_PARAM to generate struct clk_init_data * parameters for a test that registers clks. It will return combinations of @@ -3404,7 +3444,8 @@ static void clk_register_params_to_desc(const char *test_name, * Return: Test parameters in a struct clk_register_params. */ static const void *clk_register_gen_params(const char *test_name, - const void *_prev, char *desc) + const void *_prev, char *desc, + bool must_have_parents) { const struct clk_register_params *prev = _prev; struct clk_register_params *next; @@ -3412,8 +3453,11 @@ static const void *clk_register_gen_params(const char *test_name, next = krealloc(prev, sizeof(*next), GFP_KERNEL); if (!next) return NULL; - if (!prev) + if (!prev) { memset(next, 0, sizeof(*next)); + if (must_have_parents) + next->num_parents = 1; + } if (prev) { if (next->clk_flags == 0) @@ -3433,11 +3477,19 @@ static const void *clk_register_gen_params(const char *test_name, return next; } +static const void * +clk_unregister_parent_consumer_clk_gen_params(const void *prev, + char *desc) +{ + return clk_register_gen_params("parent", prev, desc, true); +} + #define CLK_REGISTER_GEN_PARAMS(name) \ static const void *name##_gen_params(const void *prev, \ char *desc) \ { \ - return clk_register_gen_params(#name, prev, desc); \ + return clk_register_gen_params(#name, prev, desc, \ + false); \ } #define CLK_REGISTER_KUNIT_CASE_PARAM(name) \ @@ -3475,6 +3527,8 @@ static struct kunit_case clk_unregister_consumer_clk_test_cases[] = { CLK_REGISTER_KUNIT_CASE_PARAM(clk_unregister_consumer_clk_set_parent_fails), CLK_REGISTER_KUNIT_CASE_PARAM(clk_unregister_consumer_clk_get_parent_skips), CLK_REGISTER_KUNIT_CASE_PARAM(clk_unregister_consumer_clk_put), + KUNIT_CASE_PARAM(clk_unregister_parent_consumer_clk_put, clk_unregister_parent_consumer_clk_gen_params), + KUNIT_CASE_PARAM(clk_unregister_parent_consumer_clk_set_parent, clk_unregister_parent_consumer_clk_gen_params), {} };

[12/12] WIP: clk: Test behavior of children clks after a parent is unregistered

Commit Message

Patch