From patchwork Sat Jun 25 05:08:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gow X-Patchwork-Id: 12895231 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 662FBC43334 for ; Sat, 25 Jun 2022 05:11:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232052AbiFYFLF (ORCPT ); Sat, 25 Jun 2022 01:11:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232026AbiFYFLE (ORCPT ); Sat, 25 Jun 2022 01:11:04 -0400 Received: from mail-pl1-x64a.google.com (mail-pl1-x64a.google.com [IPv6:2607:f8b0:4864:20::64a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C74B48E63 for ; Fri, 24 Jun 2022 22:11:03 -0700 (PDT) Received: by mail-pl1-x64a.google.com with SMTP id u13-20020a170902e5cd00b0016a53274671so2290155plf.15 for ; Fri, 24 Jun 2022 22:11:03 -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=rVO2p/4gWmOyb4ep6RqSpRHzECQ50xC37PSaOv1SUGw=; b=ZnYxgZ7WqalP2dGkVphlbAjbjTTwDrWhD3RAM4V8o6/4InFeKP/4fGh9nmuKlyAEvo oKBc3t8krwimc05NLMyCHViXO4A+w6+YsDo8b4CVr4LSG+mLmKz2pA2pe2zjAb1cJ6H/ jaoeav2d7SWqkbw5WcEyh4WTNEuMEQYzcCSOTK7q3hfcEnQ9xVm8hYFPtL1wb+JG794S 7Ua4nSkKwOPkLvqgcU+sR2WWAX0aCCZfNetn+bckdI9KhaloJ63hrQo0IsbYsbBAj14f 03k70sCmEYyFHwzJ40aHjS4YgKpS01/1TW15oVuFATsCHtlepIt02aV2Uauk1+rNeD9w hKow== 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=rVO2p/4gWmOyb4ep6RqSpRHzECQ50xC37PSaOv1SUGw=; b=YguJRqbY0pC3miceV/8J45WjYkAEg7Bv+uXBDt4NJchtIDdZm2UkHa05H9rso708bi +Qhz0W4jXsjtUzxtRqziAmyAVw1W1BiezKPjqe+higD1oaPjVHA9JD3+R82S6SVicIf3 wD/uKtiSDf3kFBjwA7S/HZdmKXbSO3u2rTlKG8LDGYekXlxZ5o6IfrQ3NXBVXiZ2GfIK qv4jkgSulGjU4wEXrvdFk42wz0lzApL23zIFG18CazZ2GnAxxoh0usGAhBwDxqo8Z8ot HiwALIAbEWhx1hmkcwte/8CogOj+m8B2098aJ4YkcPSqY00g32n63ghixxsxvLog+AJA Q+AA== X-Gm-Message-State: AJIora8f7c2fPElxMgNqneNvZsfmV+GySa05HHvDZt9lVGKg1HBipHHr QVRUUtlmj8CwjD9slEHWE3KCUfoSWw97tQ== X-Google-Smtp-Source: AGRyM1vSgWc7GnZSpUv1n7qCzLhhitXpo2LTAKE1+91FirTZI0V7zE22wJcwEw3RTwL8dSDR+tYk87aSCL5uPw== X-Received: from slicestar.c.googlers.com ([fda3:e722:ac3:cc00:4f:4b78:c0a8:20a1]) (user=davidgow job=sendgmr) by 2002:a17:90a:249:b0:1e0:a8a3:3c6c with SMTP id t9-20020a17090a024900b001e0a8a33c6cmr438311pje.0.1656133861539; Fri, 24 Jun 2022 22:11:01 -0700 (PDT) Date: Sat, 25 Jun 2022 13:08:39 +0800 In-Reply-To: <20220625050838.1618469-1-davidgow@google.com> Message-Id: <20220625050838.1618469-6-davidgow@google.com> Mime-Version: 1.0 References: <20220625050838.1618469-1-davidgow@google.com> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog Subject: [PATCH v3 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 Signed-off-by: David Gow Acked-by: Brendan Higgins --- 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); }