From patchwork Mon Jan 25 12:27:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 12043341 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B6C8C433E0 for ; Mon, 25 Jan 2021 12:31:40 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C60F92311A for ; Mon, 25 Jan 2021 12:31:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C60F92311A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=6EhSAeWpb0wk9IByTrhhnbzr3RPdj6TTDitgto+xNNc=; b=1/VQvR7c95Dh8YyMZwRlnXUnCp VnULnWNUW3h1zo6AsfRBozS0TJotKPpv+G8rK6stN+Z2w3U56efgAo2ll21zrXLj2DIY5hGR9Dbt0 ebGEebJRN7qJ4/A+Jk8s3WygiQ3r85H21c7rBSI8OfJUghDn9KJD3kVs4d4atGeE0WTF9GnVK+XjS ezqcQo7GjqTFesDNJILkEKvaDrKpkKQld0g5IX3NiBHA+9luYPTEL9BmGxb7FbQrpsEkPu4GtTa1C GicwSQSCUzi+soTR20lGKWKM/t1rm0EZGbnZA6JSQg215d7Kzz9fDHZh/FRI7QLmXV+2ZkO5W4V1k 1jSrYqgw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l40ya-0007r7-81; Mon, 25 Jan 2021 12:28:12 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l40yX-0007pH-4B for linux-arm-kernel@lists.infradead.org; Mon, 25 Jan 2021 12:28:10 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id B967F2310C; Mon, 25 Jan 2021 12:28:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1611577688; bh=zrGnvmXulEw+Ps4sGkdPh+BXUTzR8G54IaR9EQXhkXs=; h=From:To:Cc:Subject:Date:From; b=gXf/rN+F7ALFrI+/fFCV+sAuUgXj/71PUoThimfacmVwKjxGvT2oHlYXX6/EIZmw6 REPaggAnMj1+7Taq0ZdiktFiBmP0GEstg0K9ItrSb3Z4xe5BAq7JDl1RAr0JLa+LUO zdIVcEdNZrEz1LDBc0Ta1DfbkYkii2R/4Vh3Nll2a49dzVDHdGPZWHk4P31Fwy0drj SMg9yUwrxSj9MlzQL9/3+QgleFcf2Nxidi0LdUlkfSPERngc6ZJEg7muSLA+BEB90R qMj0Wiq369B/gHNtYTwbsll5jH5DQqGugxuv7de6Akl5MED45Li4AY86SuH+Fues8r FGIad8esWIPRQ== From: Arnd Bergmann To: Ulf Hansson , Adrian Hunter , Andrew Jeffery , Joel Stanley Subject: [PATCH] mmc: aspeed: move kunit test into separate module Date: Mon, 25 Jan 2021 13:27:27 +0100 Message-Id: <20210125122802.982-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210125_072809_359861_C768B7E0 X-CRM114-Status: GOOD ( 20.35 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Arnd Bergmann , linux-aspeed@lists.ozlabs.org, Baolin Wang , openbmc@lists.ozlabs.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, Krzysztof Kozlowski , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Arnd Bergmann Having both the driver and the unit test in the same module leads to a link failure because of the extra init/exit functions: drivers/mmc/host/sdhci-of-aspeed-test.c:98:1: error: redefinition of '__inittest' kunit_test_suite(aspeed_sdhci_test_suite); Make it a separate module instead. Signed-off-by: Arnd Bergmann --- drivers/mmc/host/Kconfig | 2 +- drivers/mmc/host/Makefile | 1 + drivers/mmc/host/sdhci-of-aspeed-test.c | 5 +++++ drivers/mmc/host/sdhci-of-aspeed.c | 11 ++++------- drivers/mmc/host/sdhci-of-aspeed.h | 10 ++++++++++ 5 files changed, 21 insertions(+), 8 deletions(-) create mode 100644 drivers/mmc/host/sdhci-of-aspeed.h diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index d6f00d1d6251..a248f9f6be91 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig @@ -169,7 +169,7 @@ config MMC_SDHCI_OF_ASPEED If unsure, say N. config MMC_SDHCI_OF_ASPEED_TEST - bool "Tests for the ASPEED SDHCI driver" + tristate "Tests for the ASPEED SDHCI driver" depends on MMC_SDHCI_OF_ASPEED && KUNIT=y help Enable KUnit tests for the ASPEED SDHCI driver. Select this diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile index 451c25fc2c69..5cc7e5f13587 100644 --- a/drivers/mmc/host/Makefile +++ b/drivers/mmc/host/Makefile @@ -90,6 +90,7 @@ obj-$(CONFIG_MMC_SDHCI_DOVE) += sdhci-dove.o obj-$(CONFIG_MMC_SDHCI_TEGRA) += sdhci-tegra.o obj-$(CONFIG_MMC_SDHCI_OF_ARASAN) += sdhci-of-arasan.o obj-$(CONFIG_MMC_SDHCI_OF_ASPEED) += sdhci-of-aspeed.o +obj-$(CONFIG_MMC_SDHCI_OF_ASPEED_TEST) += sdhci-of-aspeed-test.o obj-$(CONFIG_MMC_SDHCI_OF_AT91) += sdhci-of-at91.o obj-$(CONFIG_MMC_SDHCI_OF_ESDHC) += sdhci-of-esdhc.o obj-$(CONFIG_MMC_SDHCI_OF_HLWD) += sdhci-of-hlwd.o diff --git a/drivers/mmc/host/sdhci-of-aspeed-test.c b/drivers/mmc/host/sdhci-of-aspeed-test.c index 34070605b28b..e7e42991534a 100644 --- a/drivers/mmc/host/sdhci-of-aspeed-test.c +++ b/drivers/mmc/host/sdhci-of-aspeed-test.c @@ -2,6 +2,7 @@ /* Copyright (C) 2020 IBM Corp. */ #include +#include "sdhci-of-aspeed.h" static void aspeed_sdhci_phase_ddr52(struct kunit *test) { @@ -96,3 +97,7 @@ static struct kunit_suite aspeed_sdhci_test_suite = { .test_cases = aspeed_sdhci_test_cases, }; kunit_test_suite(aspeed_sdhci_test_suite); + +MODULE_DESCRIPTION("Unit test for the ASPEED SD/SDIO/SDHCI Controllers"); +MODULE_AUTHOR("Andrew Jeffery "); +MODULE_LICENSE("GPL"); diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c index 3b0d381e1215..dcc80099f528 100644 --- a/drivers/mmc/host/sdhci-of-aspeed.c +++ b/drivers/mmc/host/sdhci-of-aspeed.c @@ -15,6 +15,7 @@ #include #include +#include "sdhci-of-aspeed.h" #include "sdhci-pltfm.h" #define ASPEED_SDC_INFO 0x00 @@ -42,7 +43,6 @@ struct aspeed_sdc { struct aspeed_sdhci_tap_param { bool valid; -#define ASPEED_SDHCI_TAP_PARAM_INVERT_CLK BIT(4) u8 in; u8 out; }; @@ -123,8 +123,8 @@ aspeed_sdc_set_phase_taps(struct aspeed_sdc *sdc, #define ASPEED_SDHCI_NR_TAPS 15 /* Measured value with *handwave* environmentals and static loading */ #define ASPEED_SDHCI_MAX_TAP_DELAY_PS 1253 -static int aspeed_sdhci_phase_to_tap(struct device *dev, unsigned long rate_hz, - int phase_deg) +int aspeed_sdhci_phase_to_tap(struct device *dev, unsigned long rate_hz, + int phase_deg) { u64 phase_period_ps; u64 prop_delay_ps; @@ -158,6 +158,7 @@ static int aspeed_sdhci_phase_to_tap(struct device *dev, unsigned long rate_hz, return inverted | tap; } +EXPORT_SYMBOL_GPL(aspeed_sdhci_phase_to_tap); static void aspeed_sdhci_phases_to_taps(struct device *dev, unsigned long rate, @@ -579,10 +580,6 @@ static void __exit aspeed_sdc_exit(void) } module_exit(aspeed_sdc_exit); -#if defined(CONFIG_MMC_SDHCI_OF_ASPEED_TEST) -#include "sdhci-of-aspeed-test.c" -#endif - MODULE_DESCRIPTION("Driver for the ASPEED SD/SDIO/SDHCI Controllers"); MODULE_AUTHOR("Ryan Chen "); MODULE_AUTHOR("Andrew Jeffery "); diff --git a/drivers/mmc/host/sdhci-of-aspeed.h b/drivers/mmc/host/sdhci-of-aspeed.h new file mode 100644 index 000000000000..931e70781d08 --- /dev/null +++ b/drivers/mmc/host/sdhci-of-aspeed.h @@ -0,0 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +#ifndef _SDHCI_OF_ASPEED_H +#define _SDHCI_OF_ASPEED_H + +struct device; +int aspeed_sdhci_phase_to_tap(struct device *dev, unsigned long rate_hz, + int phase_deg); +#define ASPEED_SDHCI_TAP_PARAM_INVERT_CLK BIT(4) + +#endif /* _SDHCI_OF_ASPEED_H */