Received: by 2002:ab2:7903:0:b0:1fb:b500:807b with SMTP id a3csp1254546lqj; Mon, 3 Jun 2024 15:39:20 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCXG/R/wJ5TbpyM/zue9j8To4N9Gl2prtqRDPexjriWAbGHXyhQ0NvXpjudAfPSu1KyRntqN9Lu05vi3I98eSbTGAieiauS2rdnlc/lUJQ== X-Google-Smtp-Source: AGHT+IEumQbvsDHV0+3tiEH+9uPxYNJNcXsKufxoFcnNNITlVkT/8x5znD8hGzIb+JLmNDhf/bwN X-Received: by 2002:a17:907:1b1a:b0:a66:889f:dd with SMTP id a640c23a62f3a-a682272edc5mr800396066b.70.1717454360514; Mon, 03 Jun 2024 15:39:20 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717454360; cv=pass; d=google.com; s=arc-20160816; b=mAVuS0NZb2bIVJGlJfwDn0oUKwLWXXcTyAXyCYjovOhMGZOAKo+gEUzRdeKOh75SRp ejp1OFh7eWX6AXgpbcPpeQ/SneGyfg38FwM/8cTdJs4MoqGnuyUbBZnuEuKB6ARA7PQn m+2S6EBtz1gXOtYBkhsMKkfXtCirY7ZdbXpAchcEM4XZsYGIYzbHbZ5yKflAbquCKYWH uFspnA7jhtgib4z9lP0J7408B3CW5+hTxCaY1x4dm5apGPDiG8KYuexLj6RvP4VhVyO6 qIzj/En2ypJeiBROfHmN5Dwiknbbg+PoCKC7Qja/rclcacamBc2XTU8d6W8M1gx7DC6y NNJg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=G2BycVIfMHVTzWF4n6RsTjn8nsS5dv9upm3I07Zvqa0=; fh=V3q660E7jJuFePuHUOWKHHu4ulEp8NjGRgFgZbQSOmw=; b=KgIvfhRvfuIOxCeETVFy5Y4ZPxWVFDRi5h1SnlJ/EEYY9TqY2LORn0WhMPWTioGq58 78XrNvwTFqiCx8G1VK/cccWyOy8MizJ+6EMF2su2P+sCA/NKPCu2E0YVQcfRAQkOpPPM v3QvjDR3pA9sdqMze+8PWxKgfFQyx602waO+nmX7AU+D9o3q8dASPfp/3u6m4GSNLtwF Ziqu/WTgqIO/rDRWVcZRrcioFEoqHin23jj/qB1B+/lYUpt0gveJdgllpzQgQR/AatvI 9sKd0xJsn7MoAIHo+szMjxpulznim7pwO7RdWypiK14xL5fczDlVbjp74BcV+C6/VC6L zh/Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HG6vGk1f; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-199773-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-199773-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id a640c23a62f3a-a67ea38d905si446357266b.354.2024.06.03.15.39.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Jun 2024 15:39:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-199773-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HG6vGk1f; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-199773-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-199773-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 06B691F22F31 for ; Mon, 3 Jun 2024 22:39:20 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6241413D602; Mon, 3 Jun 2024 22:38:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HG6vGk1f" 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 402D213D502; Mon, 3 Jun 2024 22:38:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717454298; cv=none; b=VCYvWHE4n5bHxHk18CAD1g0H32cd5pKVkOpLR8OY/UGOiulUayx78kHJwzqFJmksFL0IBk4TeMGIZMRc5kLLJoK3pQ0dkjTJFaMbLY8WYZ8lZVB9PCr0V6gK7Ma/EzDz+nSv1JjpMvp9VEDj8KAfCnnuZJL3vbMVY/Q359zNzw0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717454298; c=relaxed/simple; bh=O5wbMVmEeRDUeYPl+cAB+3NGwEoP0NVAYXawSq1Qy0k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c0EPiZY8k7oy5r8Iysb/6Z+xPSimmp58x2kHukbGWrv5E5v5AWDC2Ly48/fSBVC8P9f1WWeFtklo8JuO06W5EROWpeM6jFA2djxlORs2D6GTUMmTsh+JKhz3rQ1ezeDPLGfuQ5iDYnqTJ9y0o8ftzE6NE9xrW+iCYqPdFoMNePk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=HG6vGk1f; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02B99C32782; Mon, 3 Jun 2024 22:38:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717454297; bh=O5wbMVmEeRDUeYPl+cAB+3NGwEoP0NVAYXawSq1Qy0k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HG6vGk1fHDlDhiPa2vFInWL5/LLHmKwH2s1dxvE+ofPVIp2qAZMITywkfNgO8mVbn Y2t3doD+c6jhhMUkptOS5410fYsL4hRShPP0KdDD/wpsD3vHCTzl486W/HxTunB2nh VgshBDzZLloy5X6TXazolCoHx7yrAJpe6Sy4PrrXBgu0FMsseRV+4TL0X51U+vKz8L HK2wlfKSI23i1FNk4SepQ5QZKDjlo6yW3Agfg2rGYtBwqlyDop4LNOnFA40jq+OEPK n6P29SFwEpvf6CZqbZ2JKR7E+Tfd0CaRDgcZBdaqX3dDbGbgNTCul+8y4jYDkxEhRH 2rockHtb8d2ew== From: Stephen Boyd To: Michael Turquette , Stephen Boyd Cc: linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, patches@lists.linux.dev, kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, devicetree@vger.kernel.org, Brendan Higgins , David Gow , Rae Moar , Greg Kroah-Hartman , "Rafael J . Wysocki" , Rob Herring , Saravana Kannan , Daniel Latypov , Christian Marangi , Krzysztof Kozlowski , Conor Dooley , Maxime Ripard Subject: [PATCH v5 05/11] of: Add a KUnit test for overlays and test managed APIs Date: Mon, 3 Jun 2024 15:38:02 -0700 Message-ID: <20240603223811.3815762-6-sboyd@kernel.org> X-Mailer: git-send-email 2.45.1.288.g0e0cd299f1-goog In-Reply-To: <20240603223811.3815762-1-sboyd@kernel.org> References: <20240603223811.3815762-1-sboyd@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Test the KUnit test managed overlay APIs. Confirm that platform devices are created and destroyed properly. This provides us confidence that the test managed APIs work correctly and can be relied upon to provide tests with fake platform devices and device nodes via overlays compiled into the kernel image. Cc: Rob Herring Cc: Saravana Kannan Cc: Daniel Latypov Cc: Brendan Higgins Cc: David Gow Cc: Rae Moar Reviewed-by: Rob Herring (Arm) Signed-off-by: Stephen Boyd --- drivers/of/.kunitconfig | 1 + drivers/of/Kconfig | 10 +++ drivers/of/Makefile | 1 + drivers/of/kunit_overlay_test.dtso | 9 +++ drivers/of/overlay_test.c | 116 +++++++++++++++++++++++++++++ 5 files changed, 137 insertions(+) create mode 100644 drivers/of/kunit_overlay_test.dtso create mode 100644 drivers/of/overlay_test.c diff --git a/drivers/of/.kunitconfig b/drivers/of/.kunitconfig index 5a8fee11978c..4c53d2c7a275 100644 --- a/drivers/of/.kunitconfig +++ b/drivers/of/.kunitconfig @@ -1,3 +1,4 @@ CONFIG_KUNIT=y CONFIG_OF=y CONFIG_OF_KUNIT_TEST=y +CONFIG_OF_OVERLAY_KUNIT_TEST=y diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig index dd726c7056bf..0e2d608c3e20 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig @@ -107,6 +107,16 @@ config OF_OVERLAY While this option is selected automatically when needed, you can enable it manually to improve device tree unit test coverage. +config OF_OVERLAY_KUNIT_TEST + tristate "Device Tree overlay KUnit tests" if !KUNIT_ALL_TESTS + depends on KUNIT + default KUNIT_ALL_TESTS + select OF_OVERLAY + help + This option builds KUnit unit tests for the device tree overlay code. + + If unsure, say N here, but this option is safe to enable. + config OF_NUMA bool diff --git a/drivers/of/Makefile b/drivers/of/Makefile index 2ae909adde49..abd9c578343b 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile @@ -21,5 +21,6 @@ endif obj-$(CONFIG_KUNIT) += of_kunit_helpers.o obj-$(CONFIG_OF_KUNIT_TEST) += of_test.o +obj-$(CONFIG_OF_OVERLAY_KUNIT_TEST) += overlay_test.o kunit_overlay_test.dtbo.o obj-$(CONFIG_OF_UNITTEST) += unittest-data/ diff --git a/drivers/of/kunit_overlay_test.dtso b/drivers/of/kunit_overlay_test.dtso new file mode 100644 index 000000000000..85f20b4b4c16 --- /dev/null +++ b/drivers/of/kunit_overlay_test.dtso @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 +/dts-v1/; +/plugin/; + +&{/} { + kunit-test { + compatible = "test,empty"; + }; +}; diff --git a/drivers/of/overlay_test.c b/drivers/of/overlay_test.c new file mode 100644 index 000000000000..9a8083c3a659 --- /dev/null +++ b/drivers/of/overlay_test.c @@ -0,0 +1,116 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * KUnit tests for device tree overlays + */ +#include +#include +#include +#include +#include + +#include +#include + +static const char * const kunit_node_name = "kunit-test"; +static const char * const kunit_compatible = "test,empty"; + +/* Test that of_overlay_apply_kunit() adds a node to the live tree */ +static void of_overlay_apply_kunit_apply(struct kunit *test) +{ + struct device_node *np; + + KUNIT_ASSERT_EQ(test, 0, + of_overlay_apply_kunit(test, kunit_overlay_test)); + + np = of_find_node_by_name(NULL, kunit_node_name); + KUNIT_EXPECT_NOT_ERR_OR_NULL(test, np); + of_node_put(np); +} + +/* + * Test that of_overlay_apply_kunit() creates platform devices with the + * expected device_node + */ +static void of_overlay_apply_kunit_platform_device(struct kunit *test) +{ + struct platform_device *pdev; + struct device_node *np; + + KUNIT_ASSERT_EQ(test, 0, + of_overlay_apply_kunit(test, kunit_overlay_test)); + + np = of_find_node_by_name(NULL, kunit_node_name); + of_node_put_kunit(test, np); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, np); + + pdev = of_find_device_by_node(np); + KUNIT_EXPECT_NOT_ERR_OR_NULL(test, pdev); + if (pdev) + put_device(&pdev->dev); +} + +static int of_overlay_bus_match_compatible(struct device *dev, const void *data) +{ + return of_device_is_compatible(dev->of_node, data); +} + +/* Test that of_overlay_apply_kunit() cleans up after the test is finished */ +static void of_overlay_apply_kunit_cleanup(struct kunit *test) +{ + struct kunit fake; + struct platform_device *pdev; + struct device *dev; + struct device_node *np; + + if (!IS_ENABLED(CONFIG_OF_OVERLAY)) + kunit_skip(test, "requires CONFIG_OF_OVERLAY"); + if (!IS_ENABLED(CONFIG_OF_EARLY_FLATTREE)) + kunit_skip(test, "requires CONFIG_OF_EARLY_FLATTREE for root node"); + + kunit_init_test(&fake, "fake test", NULL); + KUNIT_ASSERT_EQ(test, fake.status, KUNIT_SUCCESS); + + KUNIT_ASSERT_EQ(test, 0, + of_overlay_apply_kunit(&fake, kunit_overlay_test)); + + np = of_find_node_by_name(NULL, kunit_node_name); + of_node_put(np); /* Not derefing 'np' after this */ + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, np); + + pdev = of_find_device_by_node(np); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, pdev); + put_device(&pdev->dev); /* Not derefing 'pdev' after this */ + + /* Remove overlay */ + kunit_cleanup(&fake); + + /* The node and device should be removed */ + np = of_find_node_by_name(NULL, kunit_node_name); + KUNIT_EXPECT_PTR_EQ(test, NULL, np); + of_node_put(np); + + dev = bus_find_device(&platform_bus_type, NULL, kunit_compatible, + of_overlay_bus_match_compatible); + KUNIT_EXPECT_PTR_EQ(test, NULL, dev); + put_device(dev); +} + +static struct kunit_case of_overlay_apply_kunit_test_cases[] = { + KUNIT_CASE(of_overlay_apply_kunit_apply), + KUNIT_CASE(of_overlay_apply_kunit_platform_device), + KUNIT_CASE(of_overlay_apply_kunit_cleanup), + {} +}; + +/* + * Test suite for test managed device tree overlays. + */ +static struct kunit_suite of_overlay_apply_kunit_suite = { + .name = "of_overlay_apply_kunit", + .test_cases = of_overlay_apply_kunit_test_cases, +}; + +kunit_test_suites( + &of_overlay_apply_kunit_suite, +); +MODULE_LICENSE("GPL"); -- https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/ https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git