From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 4C1052E2286 for ; Tue, 23 Sep 2025 14:40:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758638416; cv=none; b=PZDB/PaOafz/TzhyIfrF8R5CszAFdMImmqn1uM74jKb1HvY5Uutf4JWx2FXOFda5N1BAziJx6u2ULkUv4AljthO0O7VsaD1nMqSdPTGJE2GHnGgHgHGVkcGDw/W7osU1UtZNh5KcQ4ErfaFR33NufOdYaPWoEY/Lq78E7tV3ZFg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758638416; c=relaxed/simple; bh=yAsWE58IkjsKCLEl/DPZcoJASm8AUAsFuoIvwC4HaqM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=W/OkXYYFx8/3kpj+sa+AoESe2d2PbHWHCgfD6FSdh8VKyUgvkK7IMb2m5H+3stkFgg7kDsOL9IZG7oqashY8GuTzny+uUrvEqoMUzbWbUQnE+2U5KFWF9Qs5coTM9+PnkiCGki4zWFy0fExtRbwUXWTGIMO6S0m9ZzPWvPILnJ8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Md0Gpj5S; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Md0Gpj5S" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1758638413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IGMWuqBzhBNfmX/zEHWn5ay04MO78lPZtspT3NW2/jI=; b=Md0Gpj5Si90pN0A+1nM1ObicJBfWSgwOWMECHHGRiyDVsCze4FIctON6INHN7vWJjPOxPV qL1hNVjVkDcGiH5N/QAMYy3phiGjJoHCB9Pox7I5tNOgoLO55RPDxcSKp8LgXTa3FsVowB Ycn2f5AQApJcbrFPca06iNlqs37pO9c= Received: from mail-qk1-f200.google.com (mail-qk1-f200.google.com [209.85.222.200]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-595-jf25mpFOMhulHhCdFkfXgQ-1; Tue, 23 Sep 2025 10:40:11 -0400 X-MC-Unique: jf25mpFOMhulHhCdFkfXgQ-1 X-Mimecast-MFC-AGG-ID: jf25mpFOMhulHhCdFkfXgQ_1758638410 Received: by mail-qk1-f200.google.com with SMTP id af79cd13be357-82affc73452so1189357885a.0 for ; Tue, 23 Sep 2025 07:40:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758638410; x=1759243210; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IGMWuqBzhBNfmX/zEHWn5ay04MO78lPZtspT3NW2/jI=; b=xQO9ghSnP6OFKp5/yco9PeTO1NSosNHeEfosWN+bVQin6Z/uYJXKGXL+i3oxttEx9y 9n5kIW06eXBBg3Ry+jM3kcj/86bIWo5gEM2AO+nCGvNEKuP6Lg4/ZtuwsxCHSkfMBQ2e Ya6cwi1bp9eNC2IIwiDKgMXV0TS7YZjTOv386I+3xmzRJ7wcWnrFJtY+/ADvWuln7K7Z BRomoJdYcZcWRRwCYput6nxCyJB91H0q7E1RkDokXH2yl6AjguRgZzEq40dbNW/7f+fR tr8xWjq2+AO0fE83BLqASeFc7xRm09FdLjrSlhl49qFqfNjXq7kRIebWYn7aGLNNR1+M qXYA== X-Gm-Message-State: AOJu0Yxk1MBjl6OFs05phSni9udULbWPyh/yxZIqgYr9yslMGLjgB/B2 HEW1vCElL2AJEXS+Ic+nnsq4iXKB2PscwNYTtDcKhTdCWTN3HHOBs3SlsWFRFdqopyOCKXKrrI/ /N2ZZBcPX0yhtS2YDVQqbsdTP2DiBtuoERVQsmgscw0h8hw7SnySDPVQDoSQchg== X-Gm-Gg: ASbGncuzJm1G++/Yw1Nd12bSL+8gRGjpfao0BDMqjV9Xrv4kMcSxcX6rJW9aZyKD3bE RiX/H1RJPm3Cubc+s1WzpQFE+tEhV+4+Qt0Ui5P8mXIwNcOIs5CsW8jMCPWinLUu/3u3WVV+msu 4CdlB6ubCWH7RKmv/nBlWfh+OUVF6AhyR7mJamiqtKm0oRhnJGHUWCPEP9FBoy6HoZZH3AHKJ4f fO6jGzCcoHaEGe2NBbZoi4EWcJWXQ3W2KCSe7UiEV2OHRYsz7tX6xZfA8dQZLaxGP4PK298zRAy HsfCrHMk0d+em+HlqGmWKwcv7wFXF5z0dBrwsjBuSZP5A4ZVVBu/4odCX1jefbkJMrKvZ3FzPJM Dl+CxLlqSD3XPtGWIB5Zc27hzqBz2+P5HPeMd3Fg= X-Received: by 2002:a05:620a:5dd0:b0:854:d17b:27dd with SMTP id af79cd13be357-854d17b2bf4mr77507085a.40.1758638410147; Tue, 23 Sep 2025 07:40:10 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH+fyJ54UA/mPzWWxl9qvSXtQD04gMoGv1VTxXaLInAlQY+mfo1Pg0oNEkRJMY6/YiNVKGOcQ== X-Received: by 2002:a05:620a:5dd0:b0:854:d17b:27dd with SMTP id af79cd13be357-854d17b2bf4mr77503185a.40.1758638409310; Tue, 23 Sep 2025 07:40:09 -0700 (PDT) Received: from [10.175.117.224] (c-73-183-52-120.hsd1.pa.comcast.net. [73.183.52.120]) by smtp.gmail.com with ESMTPSA id af79cd13be357-84f2f6f3c25sm230272985a.49.2025.09.23.07.40.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 23 Sep 2025 07:40:08 -0700 (PDT) From: Brian Masney Date: Tue, 23 Sep 2025 10:39:26 -0400 Subject: [PATCH RFC v4 07/12] clk: test: introduce helper to create a mock mux Precedence: bulk X-Mailing-List: linux-clk@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250923-clk-tests-docs-v4-7-9205cb3d3cba@redhat.com> References: <20250923-clk-tests-docs-v4-0-9205cb3d3cba@redhat.com> In-Reply-To: <20250923-clk-tests-docs-v4-0-9205cb3d3cba@redhat.com> To: Michael Turquette , Stephen Boyd , Maxime Ripard , Jonathan Corbet , Russell King Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, Brian Masney X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=7421; i=bmasney@redhat.com; s=20250903; h=from:subject:message-id; bh=yAsWE58IkjsKCLEl/DPZcoJASm8AUAsFuoIvwC4HaqM=; b=owGbwMvMwCW2/dJd9di6A+2Mp9WSGDIubTR4saX+p8yLXOFiU15Rs5qbF6/+EnYvczhh1jal1 LhduH5SRykLgxgXg6yYIsuSXKOCiNRVtvfuaLLAzGFlAhnCwMUpABNZcZPhf/XLULP4maF7J2ox dUY3lEatcUuyDLxzeoH21KtBveu0Yhn+cH7cyuoremXm4sk6k3ftCeIwu84ksOpqgyPP8s9H91i 6MgIA X-Developer-Key: i=bmasney@redhat.com; a=openpgp; fpr=A46D32705865AA3DDEDC2904B7D2DD275D7EC087 Introduce a helper to create a mock mux to reduce code duplication. This also changes it so that the relevant clk_hws are registered with the kunit framework. Signed-off-by: Brian Masney --- drivers/clk/clk_test.c | 141 ++++++++++++++++++------------------------------- 1 file changed, 52 insertions(+), 89 deletions(-) diff --git a/drivers/clk/clk_test.c b/drivers/clk/clk_test.c index 5fb908a8c764f3c3d2c744022bd61e6307c890c2..a330de8bd8dc2cdda558d364a3c6d87a26791c8d 100644 --- a/drivers/clk/clk_test.c +++ b/drivers/clk/clk_test.c @@ -538,45 +538,64 @@ static struct kunit_suite clk_uncached_test_suite = { .test_cases = clk_uncached_test_cases, }; -static int -clk_multiple_parents_mux_test_init(struct kunit *test) -{ - struct clk_multiple_parent_ctx *ctx; - const char *parents[2] = { "parent-0", "parent-1"}; +static int clk_init_multiple_parent_ctx(struct kunit *test, + struct clk_multiple_parent_ctx *ctx, + const char *parent0_name, + unsigned long parent0_rate, + const char *parent1_name, + unsigned long parent1_rate, + const char *mux_name, int mux_flags, + const struct clk_ops *mux_ops) +{ + const struct clk_hw *parents[2]; int ret; - ctx = kunit_kzalloc(test, sizeof(*ctx), GFP_KERNEL); - if (!ctx) - return -ENOMEM; - test->priv = ctx; - - ctx->parents_ctx[0].hw.init = CLK_HW_INIT_NO_PARENT("parent-0", + ctx->parents_ctx[0].hw.init = CLK_HW_INIT_NO_PARENT(parent0_name, &clk_dummy_rate_ops, 0); - ctx->parents_ctx[0].rate = DUMMY_CLOCK_RATE_1; + ctx->parents_ctx[0].rate = parent0_rate; ret = clk_hw_register_kunit(test, NULL, &ctx->parents_ctx[0].hw); if (ret) return ret; - ctx->parents_ctx[1].hw.init = CLK_HW_INIT_NO_PARENT("parent-1", + ctx->parents_ctx[1].hw.init = CLK_HW_INIT_NO_PARENT(parent1_name, &clk_dummy_rate_ops, 0); - ctx->parents_ctx[1].rate = DUMMY_CLOCK_RATE_2; + ctx->parents_ctx[1].rate = parent1_rate; ret = clk_hw_register_kunit(test, NULL, &ctx->parents_ctx[1].hw); if (ret) return ret; - ctx->current_parent = 0; - ctx->hw.init = CLK_HW_INIT_PARENTS("test-mux", parents, - &clk_multiple_parents_mux_ops, - CLK_SET_RATE_PARENT); + parents[0] = &ctx->parents_ctx[0].hw; + parents[1] = &ctx->parents_ctx[1].hw; + ctx->hw.init = CLK_HW_INIT_PARENTS_HW(mux_name, parents, + mux_ops, mux_flags); ret = clk_hw_register_kunit(test, NULL, &ctx->hw); if (ret) return ret; + ctx->current_parent = 0; + return 0; } +static int +clk_multiple_parents_mux_test_init(struct kunit *test) +{ + struct clk_multiple_parent_ctx *ctx; + + ctx = kunit_kzalloc(test, sizeof(*ctx), GFP_KERNEL); + if (!ctx) + return -ENOMEM; + test->priv = ctx; + + return clk_init_multiple_parent_ctx(test, ctx, + "parent-0", DUMMY_CLOCK_RATE_1, + "parent-1", DUMMY_CLOCK_RATE_2, + "test-mux", CLK_SET_RATE_PARENT, + &clk_multiple_parents_mux_ops); +} + /* * Test that for a clock with multiple parents, clk_get_parent() * actually returns the current one. @@ -2541,7 +2560,6 @@ static int clk_leaf_mux_set_rate_parent_test_init(struct kunit *test) { struct clk_leaf_mux_ctx *ctx; - const char *top_parents[2] = { "parent-0", "parent-1" }; int ret; ctx = kunit_kzalloc(test, sizeof(*ctx), GFP_KERNEL); @@ -2549,27 +2567,11 @@ clk_leaf_mux_set_rate_parent_test_init(struct kunit *test) return -ENOMEM; test->priv = ctx; - ctx->mux_ctx.parents_ctx[0].hw.init = CLK_HW_INIT_NO_PARENT("parent-0", - &clk_dummy_rate_ops, - 0); - ctx->mux_ctx.parents_ctx[0].rate = DUMMY_CLOCK_RATE_1; - ret = clk_hw_register(NULL, &ctx->mux_ctx.parents_ctx[0].hw); - if (ret) - return ret; - - ctx->mux_ctx.parents_ctx[1].hw.init = CLK_HW_INIT_NO_PARENT("parent-1", - &clk_dummy_rate_ops, - 0); - ctx->mux_ctx.parents_ctx[1].rate = DUMMY_CLOCK_RATE_2; - ret = clk_hw_register(NULL, &ctx->mux_ctx.parents_ctx[1].hw); - if (ret) - return ret; - - ctx->mux_ctx.current_parent = 0; - ctx->mux_ctx.hw.init = CLK_HW_INIT_PARENTS("test-mux", top_parents, - &clk_multiple_parents_mux_ops, - 0); - ret = clk_hw_register(NULL, &ctx->mux_ctx.hw); + ret = clk_init_multiple_parent_ctx(test, &ctx->mux_ctx, + "parent-0", DUMMY_CLOCK_RATE_1, + "parent-1", DUMMY_CLOCK_RATE_2, + "test-mux", 0, + &clk_multiple_parents_mux_ops); if (ret) return ret; @@ -2757,7 +2759,6 @@ static int clk_mux_notifier_callback(struct notifier_block *nb, static int clk_mux_notifier_test_init(struct kunit *test) { struct clk_mux_notifier_ctx *ctx; - const char *top_parents[2] = { "parent-0", "parent-1" }; int ret; ctx = kunit_kzalloc(test, sizeof(*ctx), GFP_KERNEL); @@ -2768,27 +2769,11 @@ static int clk_mux_notifier_test_init(struct kunit *test) init_waitqueue_head(&ctx->pre_rate_change.wq); init_waitqueue_head(&ctx->post_rate_change.wq); - ctx->mux_ctx.parents_ctx[0].hw.init = CLK_HW_INIT_NO_PARENT("parent-0", - &clk_dummy_rate_ops, - 0); - ctx->mux_ctx.parents_ctx[0].rate = DUMMY_CLOCK_RATE_1; - ret = clk_hw_register(NULL, &ctx->mux_ctx.parents_ctx[0].hw); - if (ret) - return ret; - - ctx->mux_ctx.parents_ctx[1].hw.init = CLK_HW_INIT_NO_PARENT("parent-1", - &clk_dummy_rate_ops, - 0); - ctx->mux_ctx.parents_ctx[1].rate = DUMMY_CLOCK_RATE_2; - ret = clk_hw_register(NULL, &ctx->mux_ctx.parents_ctx[1].hw); - if (ret) - return ret; - - ctx->mux_ctx.current_parent = 0; - ctx->mux_ctx.hw.init = CLK_HW_INIT_PARENTS("test-mux", top_parents, - &clk_multiple_parents_mux_ops, - 0); - ret = clk_hw_register(NULL, &ctx->mux_ctx.hw); + ret = clk_init_multiple_parent_ctx(test, &ctx->mux_ctx, + "parent-0", DUMMY_CLOCK_RATE_1, + "parent-1", DUMMY_CLOCK_RATE_2, + "test-mux", 0, + &clk_multiple_parents_mux_ops); if (ret) return ret; @@ -2871,39 +2856,17 @@ static int clk_mux_no_reparent_test_init(struct kunit *test) { struct clk_multiple_parent_ctx *ctx; - const char *parents[2] = { "parent-0", "parent-1"}; - int ret; ctx = kunit_kzalloc(test, sizeof(*ctx), GFP_KERNEL); if (!ctx) return -ENOMEM; test->priv = ctx; - ctx->parents_ctx[0].hw.init = CLK_HW_INIT_NO_PARENT("parent-0", - &clk_dummy_rate_ops, - 0); - ctx->parents_ctx[0].rate = DUMMY_CLOCK_RATE_1; - ret = clk_hw_register(NULL, &ctx->parents_ctx[0].hw); - if (ret) - return ret; - - ctx->parents_ctx[1].hw.init = CLK_HW_INIT_NO_PARENT("parent-1", - &clk_dummy_rate_ops, - 0); - ctx->parents_ctx[1].rate = DUMMY_CLOCK_RATE_2; - ret = clk_hw_register(NULL, &ctx->parents_ctx[1].hw); - if (ret) - return ret; - - ctx->current_parent = 0; - ctx->hw.init = CLK_HW_INIT_PARENTS("test-mux", parents, - &clk_multiple_parents_no_reparent_mux_ops, - 0); - ret = clk_hw_register(NULL, &ctx->hw); - if (ret) - return ret; - - return 0; + return clk_init_multiple_parent_ctx(test, ctx, + "parent-0", DUMMY_CLOCK_RATE_1, + "parent-1", DUMMY_CLOCK_RATE_2, + "test-mux", 0, + &clk_multiple_parents_no_reparent_mux_ops); } static void -- 2.51.0