From patchwork Tue Jun 21 08:53:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gow X-Patchwork-Id: 12888901 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 9E808C43334 for ; Tue, 21 Jun 2022 08:54:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346241AbiFUIyR (ORCPT ); Tue, 21 Jun 2022 04:54:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348521AbiFUIyJ (ORCPT ); Tue, 21 Jun 2022 04:54:09 -0400 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E1D521E3F for ; Tue, 21 Jun 2022 01:54:07 -0700 (PDT) Received: by mail-pg1-x54a.google.com with SMTP id 15-20020a63020f000000b003fca9ebc5cbso7381689pgc.22 for ; Tue, 21 Jun 2022 01:54:07 -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=0uhV+vE5GR6r1TPh+N0PxUsqIXfuH6Gv3M64Soo3ZV0=; b=qDlBtT5aPcoXioaoOss1BwK808pjMkcG19mg6/PuczAfv2vCZr9SU9StPq1Ib3iP1P Pc3uF13Nep2goxYIBlNpTgpJzHGqwCI2E1mZrO3ZDCdTl0889+8xBdLmdtKot6GezFwg L81x9/6DyG17cQ0xlJ4QBeWIIOMUiVVblaWjjIf31lgz727Y9geOPu3Ie+WuWPYMyJCC hDKtzbRVRHwFjxyfIP+UnCs+RrWcbG6J2fTSVhApVOx/re91uagd3biwcjVMc+2U12w0 pWlmQwVkunoC9OkJa2lNBoMHYbV9Hu6lAra8ihcyckgVuqmRpJe/17MM6daMaPE8I/Yl gAAQ== 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=0uhV+vE5GR6r1TPh+N0PxUsqIXfuH6Gv3M64Soo3ZV0=; b=Xp1UPRwur69WFh/PxQqEp4YNAqXYBL1qizgNiYGS88amv0r5q4anT2EZHdpYbyWUUf kiVL8mk64aJ0yWxa9P0Rg53+ENgVlbIzEy7xMQ9FMIkR5IfrouYrYJrQ1JjO1wHRNYwF CIMjKl63LfGYpyOxspg4id77axwF7N7W6XrbaqdIZqnPcloBnMXi1PhcHezJ0OK/Jg2s Q1vOrbbrzgGkIS+acgtxtC6mE21EGyIuxKgxH0CAHYbyEb/XYpLDlKWH2T6s+P6AaBVt wkIj0TtLm7dGQS8mklJPjfMuZ9pkHjyf5664jPaOCNGcl5Nc15Sxbd9JNFVdHFQ5CLg3 uZkA== X-Gm-Message-State: AJIora+Ie1bQPJYZEm9zK9SD98IONd9zRe8PRYTlc6sk+KVr+bYD2/SS 8w77N60edtB8+fZu1eRxj9pfvyrwxEu76Q== X-Google-Smtp-Source: AGRyM1v0iEb5qqc6gumUemGChdbOr/X+EucelQpwk6J+2yXUNXxUTowX5rfO4DWXmf+LwoHgdjVsy8xDH/guyg== X-Received: from slicestar.c.googlers.com ([fda3:e722:ac3:cc00:4f:4b78:c0a8:20a1]) (user=davidgow job=sendgmr) by 2002:a17:90a:4a97:b0:1ea:fa24:467c with SMTP id f23-20020a17090a4a9700b001eafa24467cmr694998pjh.1.1655801646030; Tue, 21 Jun 2022 01:54:06 -0700 (PDT) Date: Tue, 21 Jun 2022 16:53:43 +0800 In-Reply-To: <20220621085345.603820-1-davidgow@google.com> Message-Id: <20220621085345.603820-4-davidgow@google.com> Mime-Version: 1.0 References: <20220621085345.603820-1-davidgow@google.com> X-Mailer: git-send-email 2.37.0.rc0.104.g0611611a94-goog Subject: [PATCH v2 3/5] thunderbolt: 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 Cc: Paraschiv@google.com, Christophe Leroy , 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 Precedence: bulk List-ID: The new implementation of kunit_test_suite() for modules no longer conflicts with module_init, so can now be used by the thunderbolt tests. Also update the Kconfig entry to enable the test when KUNIT_ALL_TESTS is enabled. This means that kunit_tool can now successfully run and parse the test results with, for example: ./tools/testing/kunit/kunit.py run --arch=x86_64 \ --kconfig_add CONFIG_PCI=y --kconfig_add CONFIG_USB4=y \ 'thunderbolt' Acked-by: Mika Westerberg Signed-off-by: David Gow Acked-by: Daniel Latypov --- Changes since v1: https://lore.kernel.org/linux-kselftest/20220618090310.1174932-4-davidgow@google.com/ - Actually include the Kconfig changes, which were mistakenly added to the next patch in the series in v1. - Add Acked-by tag from Mika Westerberg --- drivers/thunderbolt/Kconfig | 5 +++-- drivers/thunderbolt/domain.c | 3 --- drivers/thunderbolt/tb.h | 8 -------- drivers/thunderbolt/test.c | 12 +----------- 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/drivers/thunderbolt/Kconfig b/drivers/thunderbolt/Kconfig index 4bfec8a28064..2a063d344b94 100644 --- a/drivers/thunderbolt/Kconfig +++ b/drivers/thunderbolt/Kconfig @@ -28,8 +28,9 @@ config USB4_DEBUGFS_WRITE this for production systems or distro kernels. config USB4_KUNIT_TEST - bool "KUnit tests" - depends on KUNIT=y + bool "KUnit tests" if !KUNIT_ALL_TESTS + depends on KUNIT + default KUNIT_ALL_TESTS config USB4_DMA_TEST tristate "DMA traffic test driver" diff --git a/drivers/thunderbolt/domain.c b/drivers/thunderbolt/domain.c index 2889a214dadc..99211f35a5cd 100644 --- a/drivers/thunderbolt/domain.c +++ b/drivers/thunderbolt/domain.c @@ -872,7 +872,6 @@ int tb_domain_init(void) { int ret; - tb_test_init(); tb_debugfs_init(); tb_acpi_init(); @@ -890,7 +889,6 @@ int tb_domain_init(void) err_acpi: tb_acpi_exit(); tb_debugfs_exit(); - tb_test_exit(); return ret; } @@ -903,5 +901,4 @@ void tb_domain_exit(void) tb_xdomain_exit(); tb_acpi_exit(); tb_debugfs_exit(); - tb_test_exit(); } diff --git a/drivers/thunderbolt/tb.h b/drivers/thunderbolt/tb.h index 4602c69913fa..a831faa50f65 100644 --- a/drivers/thunderbolt/tb.h +++ b/drivers/thunderbolt/tb.h @@ -1271,12 +1271,4 @@ static inline void tb_service_debugfs_init(struct tb_service *svc) { } static inline void tb_service_debugfs_remove(struct tb_service *svc) { } #endif -#ifdef CONFIG_USB4_KUNIT_TEST -int tb_test_init(void); -void tb_test_exit(void); -#else -static inline int tb_test_init(void) { return 0; } -static inline void tb_test_exit(void) { } -#endif - #endif diff --git a/drivers/thunderbolt/test.c b/drivers/thunderbolt/test.c index ee37f8b58f50..24c06e7354cd 100644 --- a/drivers/thunderbolt/test.c +++ b/drivers/thunderbolt/test.c @@ -2817,14 +2817,4 @@ static struct kunit_suite tb_test_suite = { .test_cases = tb_test_cases, }; -static struct kunit_suite *tb_test_suites[] = { &tb_test_suite, NULL }; - -int tb_test_init(void) -{ - return __kunit_test_suites_init(tb_test_suites); -} - -void tb_test_exit(void) -{ - return __kunit_test_suites_exit(tb_test_suites); -} +kunit_test_suite(tb_test_suite);