mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-28 13:22:57 +00:00
Code Issues Releases Wiki Activity

platform/chrome: merge Kunit utils and test cases

Browse source 
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 <tzungbi@kernel.org>
Reviewed-by: Guenter Roeck <groeck@chromium.org>
Link: https://lore.kernel.org/r/20220720044754.4026295-2-tzungbi@kernel.org
This commit is contained in:
Tzung-Bi Shih 2022-07-20 04:47:53 +00:00
parent 7e76e4bc00
commit f92dd1475b
3 changed files with 5 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/platform/chrome/Kconfig
View file

@ -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

5
drivers/platform/chrome/Makefile
View file

@ -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

14
drivers/platform/chrome/cros_kunit_util.c
View file

@ -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");