* [PATCH] mmc: sdhci-of-aspeed: Fix kunit-related build error
@ 2021-01-22 3:23 ` Andrew Jeffery
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Jeffery @ 2021-01-22 3:23 UTC (permalink / raw)
To: linux-mmc
Cc: adrian.hunter, ulf.hansson, joel, linux-aspeed, linux-arm-kernel,
linux-kernel, brendanhiggins, Randy Dunlap
Randy found that with the following Kconfig settings we have duplicate
definitions (e.g. __inittest()) in sdhci-of-aspeed due to competing
module_init()/module_exit() calls from kunit and driver the itself.
```
CONFIG_MMC_SDHCI_OF_ASPEED=m
CONFIG_MMC_SDHCI_OF_ASPEED_TEST=y
```
Conditionally open-code the kunit initialisation to avoid the error.
Fixes: 7efa02a981d6 ("mmc: sdhci-of-aspeed: Add KUnit tests for phase calculations")
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
---
drivers/mmc/host/sdhci-of-aspeed-test.c | 9 ++++++++-
drivers/mmc/host/sdhci-of-aspeed.c | 27 ++++++++++++++++++++-----
2 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/drivers/mmc/host/sdhci-of-aspeed-test.c b/drivers/mmc/host/sdhci-of-aspeed-test.c
index 34070605b28b..e5edda6c6e60 100644
--- a/drivers/mmc/host/sdhci-of-aspeed-test.c
+++ b/drivers/mmc/host/sdhci-of-aspeed-test.c
@@ -95,4 +95,11 @@ static struct kunit_suite aspeed_sdhci_test_suite = {
.name = "sdhci-of-aspeed",
.test_cases = aspeed_sdhci_test_cases,
};
-kunit_test_suite(aspeed_sdhci_test_suite);
+
+static struct kunit_suite *aspeed_sdhci_test_suite_array[] = {
+ &aspeed_sdhci_test_suite,
+ NULL,
+};
+
+static struct kunit_suite **aspeed_sdhci_test_suites
+ __used __section(".kunit_test_suites") = aspeed_sdhci_test_suite_array;
diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c
index 3b0d381e1215..1446f23a2bfb 100644
--- a/drivers/mmc/host/sdhci-of-aspeed.c
+++ b/drivers/mmc/host/sdhci-of-aspeed.c
@@ -556,6 +556,10 @@ static struct platform_driver aspeed_sdc_driver = {
.remove = aspeed_sdc_remove,
};
+#if defined(CONFIG_MMC_SDHCI_OF_ASPEED_TEST)
+#include "sdhci-of-aspeed-test.c"
+#endif
+
static int __init aspeed_sdc_init(void)
{
int rc;
@@ -566,7 +570,20 @@ static int __init aspeed_sdc_init(void)
rc = platform_driver_register(&aspeed_sdc_driver);
if (rc < 0)
- platform_driver_unregister(&aspeed_sdhci_driver);
+ goto cleanup_sdhci;
+
+#if defined(CONFIG_MMC_SDHCI_OF_ASPEED_TEST)
+ rc = __kunit_test_suites_init(aspeed_sdhci_test_suites);
+ if (rc < 0) {
+ platform_driver_unregister(&aspeed_sdc_driver);
+ goto cleanup_sdhci;
+ }
+#endif
+
+ return 0;
+
+cleanup_sdhci:
+ platform_driver_unregister(&aspeed_sdhci_driver);
return rc;
}
@@ -574,15 +591,15 @@ module_init(aspeed_sdc_init);
static void __exit aspeed_sdc_exit(void)
{
+#if defined(CONFIG_MMC_SDHCI_OF_ASPEED_TEST)
+ __kunit_test_suites_exit(aspeed_sdhci_test_suites);
+#endif
+
platform_driver_unregister(&aspeed_sdc_driver);
platform_driver_unregister(&aspeed_sdhci_driver);
}
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 <ryan_chen@aspeedtech.com>");
MODULE_AUTHOR("Andrew Jeffery <andrew@aj.id.au>");
--
2.27.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH] mmc: sdhci-of-aspeed: Fix kunit-related build error
@ 2021-01-22 3:23 ` Andrew Jeffery
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Jeffery @ 2021-01-22 3:23 UTC (permalink / raw)
To: linux-mmc
Cc: ulf.hansson, linux-aspeed, Randy Dunlap, brendanhiggins,
linux-kernel, adrian.hunter, joel, linux-arm-kernel
Randy found that with the following Kconfig settings we have duplicate
definitions (e.g. __inittest()) in sdhci-of-aspeed due to competing
module_init()/module_exit() calls from kunit and driver the itself.
```
CONFIG_MMC_SDHCI_OF_ASPEED=m
CONFIG_MMC_SDHCI_OF_ASPEED_TEST=y
```
Conditionally open-code the kunit initialisation to avoid the error.
Fixes: 7efa02a981d6 ("mmc: sdhci-of-aspeed: Add KUnit tests for phase calculations")
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
---
drivers/mmc/host/sdhci-of-aspeed-test.c | 9 ++++++++-
drivers/mmc/host/sdhci-of-aspeed.c | 27 ++++++++++++++++++++-----
2 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/drivers/mmc/host/sdhci-of-aspeed-test.c b/drivers/mmc/host/sdhci-of-aspeed-test.c
index 34070605b28b..e5edda6c6e60 100644
--- a/drivers/mmc/host/sdhci-of-aspeed-test.c
+++ b/drivers/mmc/host/sdhci-of-aspeed-test.c
@@ -95,4 +95,11 @@ static struct kunit_suite aspeed_sdhci_test_suite = {
.name = "sdhci-of-aspeed",
.test_cases = aspeed_sdhci_test_cases,
};
-kunit_test_suite(aspeed_sdhci_test_suite);
+
+static struct kunit_suite *aspeed_sdhci_test_suite_array[] = {
+ &aspeed_sdhci_test_suite,
+ NULL,
+};
+
+static struct kunit_suite **aspeed_sdhci_test_suites
+ __used __section(".kunit_test_suites") = aspeed_sdhci_test_suite_array;
diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c
index 3b0d381e1215..1446f23a2bfb 100644
--- a/drivers/mmc/host/sdhci-of-aspeed.c
+++ b/drivers/mmc/host/sdhci-of-aspeed.c
@@ -556,6 +556,10 @@ static struct platform_driver aspeed_sdc_driver = {
.remove = aspeed_sdc_remove,
};
+#if defined(CONFIG_MMC_SDHCI_OF_ASPEED_TEST)
+#include "sdhci-of-aspeed-test.c"
+#endif
+
static int __init aspeed_sdc_init(void)
{
int rc;
@@ -566,7 +570,20 @@ static int __init aspeed_sdc_init(void)
rc = platform_driver_register(&aspeed_sdc_driver);
if (rc < 0)
- platform_driver_unregister(&aspeed_sdhci_driver);
+ goto cleanup_sdhci;
+
+#if defined(CONFIG_MMC_SDHCI_OF_ASPEED_TEST)
+ rc = __kunit_test_suites_init(aspeed_sdhci_test_suites);
+ if (rc < 0) {
+ platform_driver_unregister(&aspeed_sdc_driver);
+ goto cleanup_sdhci;
+ }
+#endif
+
+ return 0;
+
+cleanup_sdhci:
+ platform_driver_unregister(&aspeed_sdhci_driver);
return rc;
}
@@ -574,15 +591,15 @@ module_init(aspeed_sdc_init);
static void __exit aspeed_sdc_exit(void)
{
+#if defined(CONFIG_MMC_SDHCI_OF_ASPEED_TEST)
+ __kunit_test_suites_exit(aspeed_sdhci_test_suites);
+#endif
+
platform_driver_unregister(&aspeed_sdc_driver);
platform_driver_unregister(&aspeed_sdhci_driver);
}
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 <ryan_chen@aspeedtech.com>");
MODULE_AUTHOR("Andrew Jeffery <andrew@aj.id.au>");
--
2.27.0
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] mmc: sdhci-of-aspeed: Fix kunit-related build error
2021-01-22 3:23 ` Andrew Jeffery
@ 2021-01-22 3:36 ` Randy Dunlap
-1 siblings, 0 replies; 6+ messages in thread
From: Randy Dunlap @ 2021-01-22 3:36 UTC (permalink / raw)
To: Andrew Jeffery, linux-mmc
Cc: adrian.hunter, ulf.hansson, joel, linux-aspeed, linux-arm-kernel,
linux-kernel, brendanhiggins
On 1/21/21 7:23 PM, Andrew Jeffery wrote:
> Randy found that with the following Kconfig settings we have duplicate
> definitions (e.g. __inittest()) in sdhci-of-aspeed due to competing
> module_init()/module_exit() calls from kunit and driver the itself.
>
> ```
> CONFIG_MMC_SDHCI_OF_ASPEED=m
> CONFIG_MMC_SDHCI_OF_ASPEED_TEST=y
> ```
>
> Conditionally open-code the kunit initialisation to avoid the error.
>
> Fixes: 7efa02a981d6 ("mmc: sdhci-of-aspeed: Add KUnit tests for phase calculations")
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Thanks.
> ---
> drivers/mmc/host/sdhci-of-aspeed-test.c | 9 ++++++++-
> drivers/mmc/host/sdhci-of-aspeed.c | 27 ++++++++++++++++++++-----
> 2 files changed, 30 insertions(+), 6 deletions(-)
--
~Randy
RFC: Features and documentation: http://lwn.net/Articles/260136/
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] mmc: sdhci-of-aspeed: Fix kunit-related build error
@ 2021-01-22 3:36 ` Randy Dunlap
0 siblings, 0 replies; 6+ messages in thread
From: Randy Dunlap @ 2021-01-22 3:36 UTC (permalink / raw)
To: Andrew Jeffery, linux-mmc
Cc: ulf.hansson, linux-aspeed, brendanhiggins, linux-kernel,
adrian.hunter, joel, linux-arm-kernel
On 1/21/21 7:23 PM, Andrew Jeffery wrote:
> Randy found that with the following Kconfig settings we have duplicate
> definitions (e.g. __inittest()) in sdhci-of-aspeed due to competing
> module_init()/module_exit() calls from kunit and driver the itself.
>
> ```
> CONFIG_MMC_SDHCI_OF_ASPEED=m
> CONFIG_MMC_SDHCI_OF_ASPEED_TEST=y
> ```
>
> Conditionally open-code the kunit initialisation to avoid the error.
>
> Fixes: 7efa02a981d6 ("mmc: sdhci-of-aspeed: Add KUnit tests for phase calculations")
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Thanks.
> ---
> drivers/mmc/host/sdhci-of-aspeed-test.c | 9 ++++++++-
> drivers/mmc/host/sdhci-of-aspeed.c | 27 ++++++++++++++++++++-----
> 2 files changed, 30 insertions(+), 6 deletions(-)
--
~Randy
RFC: Features and documentation: http://lwn.net/Articles/260136/
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] mmc: sdhci-of-aspeed: Fix kunit-related build error
2021-01-22 3:23 ` Andrew Jeffery
@ 2021-01-22 9:26 ` Ulf Hansson
-1 siblings, 0 replies; 6+ messages in thread
From: Ulf Hansson @ 2021-01-22 9:26 UTC (permalink / raw)
To: Andrew Jeffery
Cc: linux-mmc, Adrian Hunter, Joel Stanley, linux-aspeed, Linux ARM,
Linux Kernel Mailing List, brendanhiggins, Randy Dunlap
On Fri, 22 Jan 2021 at 04:23, Andrew Jeffery <andrew@aj.id.au> wrote:
>
> Randy found that with the following Kconfig settings we have duplicate
> definitions (e.g. __inittest()) in sdhci-of-aspeed due to competing
> module_init()/module_exit() calls from kunit and driver the itself.
>
> ```
> CONFIG_MMC_SDHCI_OF_ASPEED=m
> CONFIG_MMC_SDHCI_OF_ASPEED_TEST=y
> ```
>
> Conditionally open-code the kunit initialisation to avoid the error.
>
> Fixes: 7efa02a981d6 ("mmc: sdhci-of-aspeed: Add KUnit tests for phase calculations")
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
> ---
> drivers/mmc/host/sdhci-of-aspeed-test.c | 9 ++++++++-
> drivers/mmc/host/sdhci-of-aspeed.c | 27 ++++++++++++++++++++-----
> 2 files changed, 30 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-of-aspeed-test.c b/drivers/mmc/host/sdhci-of-aspeed-test.c
> index 34070605b28b..e5edda6c6e60 100644
> --- a/drivers/mmc/host/sdhci-of-aspeed-test.c
> +++ b/drivers/mmc/host/sdhci-of-aspeed-test.c
> @@ -95,4 +95,11 @@ static struct kunit_suite aspeed_sdhci_test_suite = {
> .name = "sdhci-of-aspeed",
> .test_cases = aspeed_sdhci_test_cases,
> };
> -kunit_test_suite(aspeed_sdhci_test_suite);
> +
> +static struct kunit_suite *aspeed_sdhci_test_suite_array[] = {
> + &aspeed_sdhci_test_suite,
> + NULL,
> +};
> +
> +static struct kunit_suite **aspeed_sdhci_test_suites
> + __used __section(".kunit_test_suites") = aspeed_sdhci_test_suite_array;
> diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c
> index 3b0d381e1215..1446f23a2bfb 100644
> --- a/drivers/mmc/host/sdhci-of-aspeed.c
> +++ b/drivers/mmc/host/sdhci-of-aspeed.c
> @@ -556,6 +556,10 @@ static struct platform_driver aspeed_sdc_driver = {
> .remove = aspeed_sdc_remove,
> };
>
> +#if defined(CONFIG_MMC_SDHCI_OF_ASPEED_TEST)
> +#include "sdhci-of-aspeed-test.c"
> +#endif
> +
> static int __init aspeed_sdc_init(void)
> {
> int rc;
> @@ -566,7 +570,20 @@ static int __init aspeed_sdc_init(void)
>
> rc = platform_driver_register(&aspeed_sdc_driver);
> if (rc < 0)
> - platform_driver_unregister(&aspeed_sdhci_driver);
> + goto cleanup_sdhci;
> +
> +#if defined(CONFIG_MMC_SDHCI_OF_ASPEED_TEST)
I would like us to avoid #if defined" in code like this.
Can you instead declare a function that you can stub in case
CONFIG_MMC_SDHCI_OF_ASPEED_TEST is unset?
> + rc = __kunit_test_suites_init(aspeed_sdhci_test_suites);
> + if (rc < 0) {
> + platform_driver_unregister(&aspeed_sdc_driver);
> + goto cleanup_sdhci;
> + }
> +#endif
> +
> + return 0;
> +
> +cleanup_sdhci:
> + platform_driver_unregister(&aspeed_sdhci_driver);
>
> return rc;
> }
> @@ -574,15 +591,15 @@ module_init(aspeed_sdc_init);
>
> static void __exit aspeed_sdc_exit(void)
> {
> +#if defined(CONFIG_MMC_SDHCI_OF_ASPEED_TEST)
> + __kunit_test_suites_exit(aspeed_sdhci_test_suites);
> +#endif
> +
> platform_driver_unregister(&aspeed_sdc_driver);
> platform_driver_unregister(&aspeed_sdhci_driver);
> }
> 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 <ryan_chen@aspeedtech.com>");
> MODULE_AUTHOR("Andrew Jeffery <andrew@aj.id.au>");
> --
> 2.27.0
>
Kind regards
Uffe
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] mmc: sdhci-of-aspeed: Fix kunit-related build error
@ 2021-01-22 9:26 ` Ulf Hansson
0 siblings, 0 replies; 6+ messages in thread
From: Ulf Hansson @ 2021-01-22 9:26 UTC (permalink / raw)
To: Andrew Jeffery
Cc: linux-aspeed, brendanhiggins, Randy Dunlap, linux-mmc,
Linux Kernel Mailing List, Adrian Hunter, Joel Stanley,
Linux ARM
On Fri, 22 Jan 2021 at 04:23, Andrew Jeffery <andrew@aj.id.au> wrote:
>
> Randy found that with the following Kconfig settings we have duplicate
> definitions (e.g. __inittest()) in sdhci-of-aspeed due to competing
> module_init()/module_exit() calls from kunit and driver the itself.
>
> ```
> CONFIG_MMC_SDHCI_OF_ASPEED=m
> CONFIG_MMC_SDHCI_OF_ASPEED_TEST=y
> ```
>
> Conditionally open-code the kunit initialisation to avoid the error.
>
> Fixes: 7efa02a981d6 ("mmc: sdhci-of-aspeed: Add KUnit tests for phase calculations")
> Reported-by: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
> ---
> drivers/mmc/host/sdhci-of-aspeed-test.c | 9 ++++++++-
> drivers/mmc/host/sdhci-of-aspeed.c | 27 ++++++++++++++++++++-----
> 2 files changed, 30 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci-of-aspeed-test.c b/drivers/mmc/host/sdhci-of-aspeed-test.c
> index 34070605b28b..e5edda6c6e60 100644
> --- a/drivers/mmc/host/sdhci-of-aspeed-test.c
> +++ b/drivers/mmc/host/sdhci-of-aspeed-test.c
> @@ -95,4 +95,11 @@ static struct kunit_suite aspeed_sdhci_test_suite = {
> .name = "sdhci-of-aspeed",
> .test_cases = aspeed_sdhci_test_cases,
> };
> -kunit_test_suite(aspeed_sdhci_test_suite);
> +
> +static struct kunit_suite *aspeed_sdhci_test_suite_array[] = {
> + &aspeed_sdhci_test_suite,
> + NULL,
> +};
> +
> +static struct kunit_suite **aspeed_sdhci_test_suites
> + __used __section(".kunit_test_suites") = aspeed_sdhci_test_suite_array;
> diff --git a/drivers/mmc/host/sdhci-of-aspeed.c b/drivers/mmc/host/sdhci-of-aspeed.c
> index 3b0d381e1215..1446f23a2bfb 100644
> --- a/drivers/mmc/host/sdhci-of-aspeed.c
> +++ b/drivers/mmc/host/sdhci-of-aspeed.c
> @@ -556,6 +556,10 @@ static struct platform_driver aspeed_sdc_driver = {
> .remove = aspeed_sdc_remove,
> };
>
> +#if defined(CONFIG_MMC_SDHCI_OF_ASPEED_TEST)
> +#include "sdhci-of-aspeed-test.c"
> +#endif
> +
> static int __init aspeed_sdc_init(void)
> {
> int rc;
> @@ -566,7 +570,20 @@ static int __init aspeed_sdc_init(void)
>
> rc = platform_driver_register(&aspeed_sdc_driver);
> if (rc < 0)
> - platform_driver_unregister(&aspeed_sdhci_driver);
> + goto cleanup_sdhci;
> +
> +#if defined(CONFIG_MMC_SDHCI_OF_ASPEED_TEST)
I would like us to avoid #if defined" in code like this.
Can you instead declare a function that you can stub in case
CONFIG_MMC_SDHCI_OF_ASPEED_TEST is unset?
> + rc = __kunit_test_suites_init(aspeed_sdhci_test_suites);
> + if (rc < 0) {
> + platform_driver_unregister(&aspeed_sdc_driver);
> + goto cleanup_sdhci;
> + }
> +#endif
> +
> + return 0;
> +
> +cleanup_sdhci:
> + platform_driver_unregister(&aspeed_sdhci_driver);
>
> return rc;
> }
> @@ -574,15 +591,15 @@ module_init(aspeed_sdc_init);
>
> static void __exit aspeed_sdc_exit(void)
> {
> +#if defined(CONFIG_MMC_SDHCI_OF_ASPEED_TEST)
> + __kunit_test_suites_exit(aspeed_sdhci_test_suites);
> +#endif
> +
> platform_driver_unregister(&aspeed_sdc_driver);
> platform_driver_unregister(&aspeed_sdhci_driver);
> }
> 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 <ryan_chen@aspeedtech.com>");
> MODULE_AUTHOR("Andrew Jeffery <andrew@aj.id.au>");
> --
> 2.27.0
>
Kind regards
Uffe
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-01-22 11:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-22 3:23 [PATCH] mmc: sdhci-of-aspeed: Fix kunit-related build error Andrew Jeffery
2021-01-22 3:23 ` Andrew Jeffery
2021-01-22 3:36 ` Randy Dunlap
2021-01-22 3:36 ` Randy Dunlap
2021-01-22 9:26 ` Ulf Hansson
2021-01-22 9:26 ` Ulf Hansson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.