2022-07-20 04:59:02

by Tzung-Bi Shih

Subject: [PATCH 1/2] platform/chrome: merge Kunit utils and test cases

Merge CROS_KUNIT and CROS_EC_PROTO_KUNIT_TEST so that when they're built
as modules cros_kunit_util doesn't need to export the symbols.

Signed-off-by: Tzung-Bi Shih <[email protected]>
---
drivers/platform/chrome/Kconfig | 10 ++--------
drivers/platform/chrome/Makefile | 5 +++--
drivers/platform/chrome/cros_kunit_util.c | 14 --------------
3 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/drivers/platform/chrome/Kconfig b/drivers/platform/chrome/Kconfig
index cae859f0bc06..c45fb376d653 100644
--- a/drivers/platform/chrome/Kconfig
+++ b/drivers/platform/chrome/Kconfig
@@ -269,17 +269,11 @@ source "drivers/platform/chrome/wilco_ec/Kconfig"

# Kunit test cases
config CROS_KUNIT
- tristate
- help
- ChromeOS Kunit.
-
-config CROS_EC_PROTO_KUNIT_TEST
- tristate "Kunit tests for ChromeOS EC protocol" if !KUNIT_ALL_TESTS
+ tristate "Kunit tests for ChromeOS" if !KUNIT_ALL_TESTS
depends on KUNIT && CROS_EC
default KUNIT_ALL_TESTS
select CROS_EC_PROTO
- select CROS_KUNIT
help
- Kunit tests for the ChromeOS Embedded Controller protocol.
+ ChromeOS Kunit tests.

endif # CHROMEOS_PLATFORMS
diff --git a/drivers/platform/chrome/Makefile b/drivers/platform/chrome/Makefile
index a06bc56d12a8..f7e74a845afc 100644
--- a/drivers/platform/chrome/Makefile
+++ b/drivers/platform/chrome/Makefile
@@ -32,5 +32,6 @@ obj-$(CONFIG_CROS_USBPD_NOTIFY) += cros_usbpd_notify.o
obj-$(CONFIG_WILCO_EC) += wilco_ec/

# Kunit test cases
-obj-$(CONFIG_CROS_KUNIT) += cros_kunit_util.o
-obj-$(CONFIG_CROS_EC_PROTO_KUNIT_TEST) += cros_ec_proto_test.o
+obj-$(CONFIG_CROS_KUNIT) += cros_kunit.o
+cros_kunit-objs := cros_kunit_util.o
+cros_kunit-objs += cros_ec_proto_test.o
diff --git a/drivers/platform/chrome/cros_kunit_util.c b/drivers/platform/chrome/cros_kunit_util.c
index d37c334b416d..090927d43035 100644
--- a/drivers/platform/chrome/cros_kunit_util.c
+++ b/drivers/platform/chrome/cros_kunit_util.c
@@ -14,11 +14,8 @@
#include "cros_kunit_util.h"

int cros_kunit_ec_xfer_mock_default_ret;
-EXPORT_SYMBOL_GPL(cros_kunit_ec_xfer_mock_default_ret);
int cros_kunit_ec_cmd_xfer_mock_called;
-EXPORT_SYMBOL_GPL(cros_kunit_ec_cmd_xfer_mock_called);
int cros_kunit_ec_pkt_xfer_mock_called;
-EXPORT_SYMBOL_GPL(cros_kunit_ec_pkt_xfer_mock_called);

static struct list_head cros_kunit_ec_xfer_mock_in;
static struct list_head cros_kunit_ec_xfer_mock_out;
@@ -48,27 +45,23 @@ int cros_kunit_ec_xfer_mock(struct cros_ec_device *ec_dev, struct cros_ec_comman

return mock->ret;
}
-EXPORT_SYMBOL_GPL(cros_kunit_ec_xfer_mock);

int cros_kunit_ec_cmd_xfer_mock(struct cros_ec_device *ec_dev, struct cros_ec_command *msg)
{
++cros_kunit_ec_cmd_xfer_mock_called;
return cros_kunit_ec_xfer_mock(ec_dev, msg);
}
-EXPORT_SYMBOL_GPL(cros_kunit_ec_cmd_xfer_mock);

int cros_kunit_ec_pkt_xfer_mock(struct cros_ec_device *ec_dev, struct cros_ec_command *msg)
{
++cros_kunit_ec_pkt_xfer_mock_called;
return cros_kunit_ec_xfer_mock(ec_dev, msg);
}
-EXPORT_SYMBOL_GPL(cros_kunit_ec_pkt_xfer_mock);

struct ec_xfer_mock *cros_kunit_ec_xfer_mock_add(struct kunit *test, size_t size)
{
return cros_kunit_ec_xfer_mock_addx(test, size, EC_RES_SUCCESS, size);
}
-EXPORT_SYMBOL_GPL(cros_kunit_ec_xfer_mock_add);

struct ec_xfer_mock *cros_kunit_ec_xfer_mock_addx(struct kunit *test,
int ret, int result, size_t size)
@@ -91,7 +84,6 @@ struct ec_xfer_mock *cros_kunit_ec_xfer_mock_addx(struct kunit *test,

return mock;
}
-EXPORT_SYMBOL_GPL(cros_kunit_ec_xfer_mock_addx);

struct ec_xfer_mock *cros_kunit_ec_xfer_mock_next(void)
{
@@ -103,14 +95,10 @@ struct ec_xfer_mock *cros_kunit_ec_xfer_mock_next(void)

return mock;
}
-EXPORT_SYMBOL_GPL(cros_kunit_ec_xfer_mock_next);

int cros_kunit_readmem_mock_offset;
-EXPORT_SYMBOL_GPL(cros_kunit_readmem_mock_offset);
u8 *cros_kunit_readmem_mock_data;
-EXPORT_SYMBOL_GPL(cros_kunit_readmem_mock_data);
int cros_kunit_readmem_mock_ret;
-EXPORT_SYMBOL_GPL(cros_kunit_readmem_mock_ret);

int cros_kunit_readmem_mock(struct cros_ec_device *ec_dev, unsigned int offset,
unsigned int bytes, void *dest)
@@ -121,7 +109,6 @@ int cros_kunit_readmem_mock(struct cros_ec_device *ec_dev, unsigned int offset,

return cros_kunit_readmem_mock_ret;
}
-EXPORT_SYMBOL_GPL(cros_kunit_readmem_mock);

void cros_kunit_mock_reset(void)
{
@@ -135,6 +122,5 @@ void cros_kunit_mock_reset(void)
cros_kunit_readmem_mock_data = NULL;
cros_kunit_readmem_mock_ret = 0;
}
-EXPORT_SYMBOL_GPL(cros_kunit_mock_reset);

MODULE_LICENSE("GPL");
--
2.37.0.170.g444d1eabd0-goog

2022-07-20 13:15:04

by Guenter Roeck

Subject: Re: [PATCH 1/2] platform/chrome: merge Kunit utils and test cases

On Tue, Jul 19, 2022 at 9:48 PM Tzung-Bi Shih <[email protected]> wrote:
>
> Merge CROS_KUNIT and CROS_EC_PROTO_KUNIT_TEST so that when they're built
> as modules cros_kunit_util doesn't need to export the symbols.
>

Reviewed-by: Guenter Roeck <[email protected]>

> Signed-off-by: Tzung-Bi Shih <[email protected]>
> ---
> drivers/platform/chrome/Kconfig | 10 ++--------
> drivers/platform/chrome/Makefile | 5 +++--
> drivers/platform/chrome/cros_kunit_util.c | 14 --------------
> 3 files changed, 5 insertions(+), 24 deletions(-)
>
> diff --git a/drivers/platform/chrome/Kconfig b/drivers/platform/chrome/Kconfig
> index cae859f0bc06..c45fb376d653 100644
> --- a/drivers/platform/chrome/Kconfig
> +++ b/drivers/platform/chrome/Kconfig
> @@ -269,17 +269,11 @@ source "drivers/platform/chrome/wilco_ec/Kconfig"
>
> # Kunit test cases
> config CROS_KUNIT
> - tristate
> - help
> - ChromeOS Kunit.
> -
> -config CROS_EC_PROTO_KUNIT_TEST
> - tristate "Kunit tests for ChromeOS EC protocol" if !KUNIT_ALL_TESTS
> + tristate "Kunit tests for ChromeOS" if !KUNIT_ALL_TESTS
> depends on KUNIT && CROS_EC
> default KUNIT_ALL_TESTS
> select CROS_EC_PROTO
> - select CROS_KUNIT
> help
> - Kunit tests for the ChromeOS Embedded Controller protocol.
> + ChromeOS Kunit tests.
>
> endif # CHROMEOS_PLATFORMS
> diff --git a/drivers/platform/chrome/Makefile b/drivers/platform/chrome/Makefile
> index a06bc56d12a8..f7e74a845afc 100644
> --- a/drivers/platform/chrome/Makefile
> +++ b/drivers/platform/chrome/Makefile
> @@ -32,5 +32,6 @@ obj-$(CONFIG_CROS_USBPD_NOTIFY) += cros_usbpd_notify.o
> obj-$(CONFIG_WILCO_EC) += wilco_ec/
>
> # Kunit test cases
> -obj-$(CONFIG_CROS_KUNIT) += cros_kunit_util.o
> -obj-$(CONFIG_CROS_EC_PROTO_KUNIT_TEST) += cros_ec_proto_test.o
> +obj-$(CONFIG_CROS_KUNIT) += cros_kunit.o
> +cros_kunit-objs := cros_kunit_util.o
> +cros_kunit-objs += cros_ec_proto_test.o
> diff --git a/drivers/platform/chrome/cros_kunit_util.c b/drivers/platform/chrome/cros_kunit_util.c
> index d37c334b416d..090927d43035 100644
> --- a/drivers/platform/chrome/cros_kunit_util.c
> +++ b/drivers/platform/chrome/cros_kunit_util.c
> @@ -14,11 +14,8 @@
> #include "cros_kunit_util.h"
>
> int cros_kunit_ec_xfer_mock_default_ret;
> -EXPORT_SYMBOL_GPL(cros_kunit_ec_xfer_mock_default_ret);
> int cros_kunit_ec_cmd_xfer_mock_called;
> -EXPORT_SYMBOL_GPL(cros_kunit_ec_cmd_xfer_mock_called);
> int cros_kunit_ec_pkt_xfer_mock_called;
> -EXPORT_SYMBOL_GPL(cros_kunit_ec_pkt_xfer_mock_called);
>
> static struct list_head cros_kunit_ec_xfer_mock_in;
> static struct list_head cros_kunit_ec_xfer_mock_out;
> @@ -48,27 +45,23 @@ int cros_kunit_ec_xfer_mock(struct cros_ec_device *ec_dev, struct cros_ec_comman
>
> return mock->ret;
> }
> -EXPORT_SYMBOL_GPL(cros_kunit_ec_xfer_mock);
>
> int cros_kunit_ec_cmd_xfer_mock(struct cros_ec_device *ec_dev, struct cros_ec_command *msg)
> {
> ++cros_kunit_ec_cmd_xfer_mock_called;
> return cros_kunit_ec_xfer_mock(ec_dev, msg);
> }
> -EXPORT_SYMBOL_GPL(cros_kunit_ec_cmd_xfer_mock);
>
> int cros_kunit_ec_pkt_xfer_mock(struct cros_ec_device *ec_dev, struct cros_ec_command *msg)
> {
> ++cros_kunit_ec_pkt_xfer_mock_called;
> return cros_kunit_ec_xfer_mock(ec_dev, msg);
> }
> -EXPORT_SYMBOL_GPL(cros_kunit_ec_pkt_xfer_mock);
>
> struct ec_xfer_mock *cros_kunit_ec_xfer_mock_add(struct kunit *test, size_t size)
> {
> return cros_kunit_ec_xfer_mock_addx(test, size, EC_RES_SUCCESS, size);
> }
> -EXPORT_SYMBOL_GPL(cros_kunit_ec_xfer_mock_add);
>
> struct ec_xfer_mock *cros_kunit_ec_xfer_mock_addx(struct kunit *test,
> int ret, int result, size_t size)
> @@ -91,7 +84,6 @@ struct ec_xfer_mock *cros_kunit_ec_xfer_mock_addx(struct kunit *test,
>
> return mock;
> }
> -EXPORT_SYMBOL_GPL(cros_kunit_ec_xfer_mock_addx);
>
> struct ec_xfer_mock *cros_kunit_ec_xfer_mock_next(void)
> {
> @@ -103,14 +95,10 @@ struct ec_xfer_mock *cros_kunit_ec_xfer_mock_next(void)
>
> return mock;
> }
> -EXPORT_SYMBOL_GPL(cros_kunit_ec_xfer_mock_next);
>
> int cros_kunit_readmem_mock_offset;
> -EXPORT_SYMBOL_GPL(cros_kunit_readmem_mock_offset);
> u8 *cros_kunit_readmem_mock_data;
> -EXPORT_SYMBOL_GPL(cros_kunit_readmem_mock_data);
> int cros_kunit_readmem_mock_ret;
> -EXPORT_SYMBOL_GPL(cros_kunit_readmem_mock_ret);
>
> int cros_kunit_readmem_mock(struct cros_ec_device *ec_dev, unsigned int offset,
> unsigned int bytes, void *dest)
> @@ -121,7 +109,6 @@ int cros_kunit_readmem_mock(struct cros_ec_device *ec_dev, unsigned int offset,
>
> return cros_kunit_readmem_mock_ret;
> }
> -EXPORT_SYMBOL_GPL(cros_kunit_readmem_mock);
>
> void cros_kunit_mock_reset(void)
> {
> @@ -135,6 +122,5 @@ void cros_kunit_mock_reset(void)
> cros_kunit_readmem_mock_data = NULL;
> cros_kunit_readmem_mock_ret = 0;
> }
> -EXPORT_SYMBOL_GPL(cros_kunit_mock_reset);
>
> MODULE_LICENSE("GPL");
> --
> 2.37.0.170.g444d1eabd0-goog
>