From patchwork Sat Jul 9 03:20:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gow X-Patchwork-Id: 12912050 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 503FEC433EF for ; Sat, 9 Jul 2022 03:21:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229624AbiGIDVA (ORCPT ); Fri, 8 Jul 2022 23:21:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229482AbiGIDUp (ORCPT ); Fri, 8 Jul 2022 23:20:45 -0400 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 365577CB60 for ; Fri, 8 Jul 2022 20:20:29 -0700 (PDT) Received: by mail-pj1-x1049.google.com with SMTP id k7-20020a17090a62c700b001ef9c16ba10so2156481pjs.1 for ; Fri, 08 Jul 2022 20:20:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=0uk9B4iBCc1DStciW4cIjZgeCzcpo0HpP5e4tEE/Rl8=; b=nG41Cf/zf7u/sNTdf7Cq7xkL6MwV2j9mNk/je+VAD8dJVe9tTCtvzxVUFtyVny5Btq x1Ahnkjlg1ZJP0i/o40I0agXWzyjfVJ67zJnOTVgyBA3BpBqdQfv306NhXPG7cBH6z0b 5Jn3a76uHAReJMB6C82+3IlzI+hV76RWnd/MpwIBghPNvqEHfssIGDHylf1QKDRZOt7n yqd7FwgKuQIeCu+n/LUwVlJDQfooV9o38TE36mJNDYxQopTcJPb3RqWFpOJ4KFfHvt59 srcH1okBUBcl/7iN9v5P7TbQmO+GJdwbNLUBj65K9m+zurkKaY56ZdTcQEVqi15/o9Wr YthQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=0uk9B4iBCc1DStciW4cIjZgeCzcpo0HpP5e4tEE/Rl8=; b=BKVp12W1nD6hOomoRMBm89A7cYw15TyxgQTT/kMNRjnb9lgeNi13fCvOsnlzKoqLOw UQxq6dMZ7Six/Ge2vSy6Uf/nbYFp6mgMePUlGea8u3XJS46XUvvoNG+67xJbxprBJkmO MMMtnaNleQ0L4URYBm5/e3xz2QCg/CdcY0/5QfIAsRMjJRLYqp5ZW4C1pzL2F0PgBAI0 KVlTwd1NKu7DP42OmPa7AK3Lw5OdzfZid2L7UruuSQGbQJM2Ph7vZqvBRRlwz682VuvJ 4dHjmbZJO/r2n8uiZKi8FfXJo7nTciHdOXmMaJrR9GIOMjNImQzfYfW20g+s8oc5EmCd ehOQ== X-Gm-Message-State: AJIora+iyTIRuyOEBU8yORxQXkYeyugdwhu5hLqT4UDn0Ox3eHvG6New mCILpfOZfDM4gFOPZNBXL08O3J5K3V/9FA== X-Google-Smtp-Source: AGRyM1vb6KdixOSRAr8QjZwc+RJeF7pVnk5EV/2mWAv2L+en8WMRLFL1aQm31W9Ny8aQAjNB+SWrLAXzTPEPcg== X-Received: from slicestar.c.googlers.com ([fda3:e722:ac3:cc00:4f:4b78:c0a8:20a1]) (user=davidgow job=sendgmr) by 2002:a17:902:8a82:b0:16c:3024:69c2 with SMTP id p2-20020a1709028a8200b0016c302469c2mr2056322plo.154.1657336828917; Fri, 08 Jul 2022 20:20:28 -0700 (PDT) Date: Sat, 9 Jul 2022 11:20:01 +0800 In-Reply-To: <20220709032001.819487-1-davidgow@google.com> Message-Id: <20220709032001.819487-6-davidgow@google.com> Mime-Version: 1.0 References: <20220709032001.819487-1-davidgow@google.com> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog Subject: [PATCH v4 5/5] mmc: sdhci-of-aspeed: test: Use kunit_test_suite() macro From: David Gow To: Brendan Higgins , Luis Chamberlain , Jeremy Kerr , Daniel Latypov , Shuah Khan , Andrew Jeffery , Mika Westerberg , Andra Paraschiv , Longpeng , Greg KH Cc: David Gow , kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, " =?utf-8?q?Ma=C3=ADra_Canal?= " , linux-mmc@vger.kernel.org, linux-aspeed@lists.ozlabs.org, openbmc@lists.ozlabs.org, linux-usb@vger.kernel.org, linux-modules@vger.kernel.org, Matt Johnston , Ulf Hansson Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The kunit_test_suite() macro is no-longer incompatible with module_add, so its use can be reinstated. Since this fixes parsing with builtins and kunit_tool, also enable the test by default when KUNIT_ALL_TESTS is enabled. The test can now be run via kunit_tool with: ./tools/testing/kunit/kunit.py run --arch=x86_64 \ --kconfig_add CONFIG_OF=y --kconfig_add CONFIG_OF_ADDRESS=y \ --kconfig_add CONFIG_MMC=y --kconfig_add CONFIG_MMC_SDHCI=y \ --kconfig_add CONFIG_MMC_SDHCI_PLTFM=y \ --kconfig_add CONFIG_MMC_SDHCI_OF_ASPEED=y \ 'sdhci-of-aspeed' (It may be worth adding a .kunitconfig at some point, as there are enough dependencies to make that command scarily long.) Acked-by: Daniel Latypov Acked-by: Ulf Hansson Acked-by: Brendan Higgins Signed-off-by: David Gow --- Changes since v3: https://lore.kernel.org/linux-kselftest/20220625050838.1618469-6-davidgow@google.com/ - Rebase on top of the TAINT_TEST patch series. This should now apply cleanly on top of the kunit branch: https://lore.kernel.org/linux-kselftest/20220708044847.531566-1-davidgow@google.com/T/#u - Add Brendan's Acked-by tag. Changes since v2: https://lore.kernel.org/linux-kselftest/20220621085345.603820-6-davidgow@google.com/ - Clean up the aspeed_sdc_init() function to get rid of an obsolete goto (Thanks Daniel) - Add Daniel and Ulf's Acked-by tags. No changes since v1: https://lore.kernel.org/linux-kselftest/20220618090310.1174932-6-davidgow@google.com/ --- drivers/mmc/host/Kconfig | 5 ++-- drivers/mmc/host/sdhci-of-aspeed-test.c | 8 +----- drivers/mmc/host/sdhci-of-aspeed.c | 34 +------------------------ 3 files changed, 5 insertions(+), 42 deletions(-) diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index d6144978e32d..10c563999d3d 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -169,8 +169,9 @@ config MMC_SDHCI_OF_ASPEED If unsure, say N. config MMC_SDHCI_OF_ASPEED_TEST - bool "Tests for the ASPEED SDHCI driver" - depends on MMC_SDHCI_OF_ASPEED && KUNIT=y + bool "Tests for the ASPEED SDHCI driver" if !KUNIT_ALL_TESTS + depends on MMC_SDHCI_OF_ASPEED && KUNIT + default KUNIT_ALL_TESTS help Enable KUnit tests for the ASPEED SDHCI driver. Select this option only if you will boot the kernel for the purpose of running diff --git a/drivers/mmc/host/sdhci-of-aspeed-test.c b/drivers/mmc/host/sdhci-of-aspeed-test.c index 1ed4f86291f2..ecb502606c53 100644 --- a/drivers/mmc/host/sdhci-of-aspeed-test.c +++ b/drivers/mmc/host/sdhci-of-aspeed-test.c @@ -96,10 +96,4 @@ static struct kunit_suite aspeed_sdhci_test_suite = { .test_cases = aspeed_sdhci_test_cases, }; -static struct kunit_suite *aspeed_sdc_test_suite_array[] = { - &aspeed_sdhci_test_suite, - NULL, -}; - -static struct kunit_suite **aspeed_sdc_test_suites - __used __section(".kunit_test_suites") = aspeed_sdc_test_suite_array; +kunit_test_suite(aspeed_sdhci_test_suite); diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c index 6e4e132903a6..ba6677bf7372 100644 --- a/drivers/mmc/host/sdhci-of-aspeed.c +++ b/drivers/mmc/host/sdhci-of-aspeed.c @@ -606,25 +606,6 @@ static struct platform_driver aspeed_sdc_driver = { #if defined(CONFIG_MMC_SDHCI_OF_ASPEED_TEST) #include "sdhci-of-aspeed-test.c" - -static inline int aspeed_sdc_tests_init(void) -{ - return __kunit_test_suites_init(aspeed_sdc_test_suites); -} - -static inline void aspeed_sdc_tests_exit(void) -{ - __kunit_test_suites_exit(aspeed_sdc_test_suites); -} -#else -static inline int aspeed_sdc_tests_init(void) -{ - return 0; -} - -static inline void aspeed_sdc_tests_exit(void) -{ -} #endif static int __init aspeed_sdc_init(void) @@ -637,18 +618,7 @@ static int __init aspeed_sdc_init(void) rc = platform_driver_register(&aspeed_sdc_driver); if (rc < 0) - goto cleanup_sdhci; - - rc = aspeed_sdc_tests_init(); - if (rc < 0) { - platform_driver_unregister(&aspeed_sdc_driver); - goto cleanup_sdhci; - } - - return 0; - -cleanup_sdhci: - platform_driver_unregister(&aspeed_sdhci_driver); + platform_driver_unregister(&aspeed_sdhci_driver); return rc; } @@ -656,8 +626,6 @@ module_init(aspeed_sdc_init); static void __exit aspeed_sdc_exit(void) { - aspeed_sdc_tests_exit(); - platform_driver_unregister(&aspeed_sdc_driver); platform_driver_unregister(&aspeed_sdhci_driver); }