From mboxrd@z Thu Jan 1 00:00:00 1970 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 phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C416EC433F5 for ; Sat, 5 Feb 2022 08:59:47 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 0DC6483A8A; Sat, 5 Feb 2022 09:59:45 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=fail (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="RyNaGjsd"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 899F183A8D; Sat, 5 Feb 2022 09:59:43 +0100 (CET) Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6656383A86 for ; Sat, 5 Feb 2022 09:59:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=xypron.glpk@gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1644051569; bh=F/Qxm8bvUxmR5wq14JT0TnA7byXk9yNriW7OE+rfFlU=; h=X-UI-Sender-Class:Date:Subject:To:Cc:References:From:In-Reply-To; b=RyNaGjsdh2v+o1XcReeYA38r8fUbH1n2H6w/HEHsaS5g1E8hVLuwn+jCdZxxHaVzr T1IXcW99iIsHAk8AkBoARGDRw4GMnrcgSvOKaSRj1LuLqtm/CwytP2JnlfRZk1LJrl 8foNT8hDTkFnheUqYaj9kBqRC7lG+9LhjeMFuoKA= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [192.168.123.94] ([88.152.144.107]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1MTzb8-1mpMMU45cw-00R3cK; Sat, 05 Feb 2022 09:59:29 +0100 Message-ID: <1163b85d-f98a-5c46-fd9c-7934dcba9a32@gmx.de> Date: Sat, 5 Feb 2022 09:59:27 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.5.1 Subject: Re: [PATCH 08/19] dm: add event notification Content-Language: en-US To: AKASHI Takahiro Cc: masami.hiramatsu@linaro.org, u-boot@lists.denx.de, ilias.apalodimas@linaro.org, lukma@denx.de, peng.fan@nxp.com, jh80.chung@samsung.com, peng.ma@nxp.com, sjg@chromium.org, sr@denx.de, bmeng.cn@gmail.com References: <20220202010853.40405-1-takahiro.akashi@linaro.org> <20220202010853.40405-9-takahiro.akashi@linaro.org> From: Heinrich Schuchardt In-Reply-To: <20220202010853.40405-9-takahiro.akashi@linaro.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable X-Provags-ID: V03:K1:vOjaON+iCfdy9DhEA4DDpQ5jUXiZHV/fas3akwNN8oAB4+1Cx5d TGHGB0bx0jIFFEz17/oFgxwJjPopdgdirehhcaDgbQxELYq4FWPRnuoWXSbiGER4jaWxv51 7CHC3tuNbDT7l2lHXfVoSQNbSdGE8NiG+2mDm3y46PGFKGsrFLURjFXENmS4K15jrnt4SE/ /HBJz2oDclj8FEE8VKG5Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:53ZnuzKpKXU=:YcZg7a1ZhbdVbz65elT5mY 3yuMuIqT/ploKTDvMEmFRJrc28+zwN8AFYwk3fiLZANQGcMyY4epLQV6uKgZ/XLGneK6jyC6N 0g1zdC4UxJdGjCJpWG2veJt5NINw1wfJWZ1yjqzQHBov2gFfrfYzmEJBj2xMBd0WwpeVG6Tqs nkyevjHE0TAYSYizM7F5pLP/r0mCFGvH1M7b89TNYpxXzU6tnSrtXJ7+m+T7VZ7aOB8lYmgbH lPSwJO4bVYfDrBiWaMm6ZRzTpC0fWRBsfqKH77ne8Le9AF2KmqQ2zEn387dD0G+bs639c86AL icPjCYFrhzd/t3S/8sqDbPV8gmU7IiYwWTGQkqGhzso/U6YRQb6rIfT0MAuoaNMxSfaItigB5 oK0himhOVhEMGURnIfGRkee2hEk31gTMtH05LP+ybR/bNymZUzRROBGt6sCIhPfNGgAF2LRqL tNzuQvFfTVrpz+dgFY+2i7spvZkwDkl6kq7LD575IGllNYUG1/XFpEiwFwNER56r//bu2ttgh BqkEzuMGyWGPBqE23A70YjUWMOvum1G+MOxTNE76JHrj6/lgmirDtZRvCDbeqpaq7Kj9c78w8 Vyh9XKSbuZjrn0WflMCrkgHWjTPsJqu2ce5Nd/YnMGeubXAFEVVNx+wgI0fqaFgcfQihf7TkZ /DiTJOJjWsqgZt9zdXaKQs00T0mbeKus4S0LL8xHNOtyZh5x8HVQj2o+RH5ZAkIcJnTR1OkjP cPVT2YcbTEwNgqRbDVb0IzK1c70g94oXHFTRU9DGk/U/riR6z5aroCE8CQSbf5amP2DDmni2D /4cjf1oDXN/w1Cv6S1vGoevBtQTmU7E3VQFjVQeeBEALTXu/2ssuG55a17A98b2dhl88m/83n 3wyQ9ccHZcCpXhbdwtE5zPK3o4HABka+zZqNP3Tw+YkMeDCIp6UtQx05sEgPhxK/vYIJuwnJc SMIRUc5UP47izR3kpKvwqvs7mBnwGNA2Q6y4gFu2KPC8ivfD4gw6A5HcGn7l/cnujrvZa8ETG 3Ub7joEJkksMR5qUwkQPQ4U0bWXbPAkgeyOTx/2hvnlsFLIKdHiKFwYJOcKcT1sPizlwi/owj V2qo/icDhPskDs= X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.5 at phobos.denx.de X-Virus-Status: Clean On 2/2/22 02:08, AKASHI Takahiro wrote: > From: Simon Glass > > This is a draft implementation of event notification mechanism from Simo= n. > Under this scheme, any U-Boot subsystem can register some kind of callba= ck > function to a particular event (more event types will be added later) an= d > that function will be invoked once the event is fired. > > As a first user, UEFI subsystem makes use of PROBE and REMOVE events so > that we will be able to automatically create/remove efi_disk objects > relying on associated block devices (UCLASS_BLK). > > To run the test: > ./u-boot -T -c "ut common test_event_probe" > > Signed-off-by: Simon Glass > [add REMOVE event; fix checkpatch warnings] > Signed-off-by: AKASHI Takahiro > --- > common/Kconfig | 11 ++++ > common/Makefile | 2 + > common/board_f.c | 2 + > common/event.c | 103 +++++++++++++++++++++++++++++ > common/log.c | 1 + > drivers/core/device-remove.c | 9 +++ > drivers/core/device.c | 9 +++ > include/asm-generic/global_data.h | 3 + > include/dm/device-internal.h | 10 +++ > include/event.h | 105 ++++++++++++++++++++++++++++++ > include/event_internal.h | 34 ++++++++++ > include/log.h | 2 + > test/common/Makefile | 1 + > test/common/event.c | 87 +++++++++++++++++++++++++ > test/test-main.c | 5 ++ > 15 files changed, 384 insertions(+) > create mode 100644 common/event.c > create mode 100644 include/event.h > create mode 100644 include/event_internal.h > create mode 100644 test/common/event.c > > diff --git a/common/Kconfig b/common/Kconfig > index 82cd864baf93..d411e5bf7a50 100644 > --- a/common/Kconfig > +++ b/common/Kconfig > @@ -492,6 +492,17 @@ config DISPLAY_BOARDINFO_LATE > > menu "Start-up hooks" > > +config EVENT > + bool "General-purpose event-handling mechanism" > + default y if SANDBOX > + help > + This enables sending and processing of events, to allow interested > + parties to be alerted when something happens. This is an attempt to > + step the flow of weak functions, hooks, functions in board_f.c > + and board_r.c and the Kconfig options below. > + > + See doc/develop/event.rst for more information. > + > config ARCH_EARLY_INIT_R > bool "Call arch-specific init soon after relocation" > help > diff --git a/common/Makefile b/common/Makefile > index 3eff71960160..4e9f59cc07ad 100644 > --- a/common/Makefile > +++ b/common/Makefile > @@ -89,6 +89,8 @@ obj-y +=3D malloc_simple.o > endif > endif > > +obj-$(CONFIG_EVENT) +=3D event.o > + > obj-$(CONFIG_$(SPL_TPL_)HASH) +=3D hash.o > obj-$(CONFIG_IO_TRACE) +=3D iotrace.o > obj-y +=3D memsize.o > diff --git a/common/board_f.c b/common/board_f.c > index a68760092ac1..e36bdbc988fa 100644 > --- a/common/board_f.c > +++ b/common/board_f.c > @@ -19,6 +19,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -828,6 +829,7 @@ static const init_fnc_t init_sequence_f[] =3D { > initf_malloc, > log_init, > initf_bootstage, /* uses its own timer, so does not need DM */ > + event_init, > #ifdef CONFIG_BLOBLIST > bloblist_init, > #endif > diff --git a/common/event.c b/common/event.c > new file mode 100644 > index 000000000000..428628da44d6 > --- /dev/null > +++ b/common/event.c > @@ -0,0 +1,103 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Events provide a general-purpose way to react to / subscribe to chan= ges > + * within U-Boot > + * > + * Copyright 2021 Google LLC > + * Written by Simon Glass > + */ > + > +#define LOG_CATEGORY LOGC_EVENT > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +DECLARE_GLOBAL_DATA_PTR; > + > +static void spy_free(struct event_spy *spy) > +{ > + list_del(&spy->sibling_node); > +} > + > +int event_register(const char *id, enum event_t type, event_handler_t f= unc, void *ctx) > +{ > + struct event_state *state =3D gd->event_state; > + struct event_spy *spy; > + > + spy =3D malloc(sizeof(*spy)); > + if (!spy) > + return log_msg_ret("alloc", -ENOMEM); > + > + spy->id =3D id; > + spy->type =3D type; > + spy->func =3D func; > + spy->ctx =3D ctx; > + list_add_tail(&spy->sibling_node, &state->spy_head); > + > + return 0; > +} > + > +int event_notify(enum event_t type, void *data, int size) > +{ > + struct event_state *state =3D gd->event_state; > + struct event_spy *spy, *next; > + struct event event; > + > + event.type =3D type; > + if (size > sizeof(event.data)) > + return log_msg_ret("size", -E2BIG); > + memcpy(&event.data, data, size); > + list_for_each_entry_safe(spy, next, &state->spy_head, sibling_node) { > + if (spy->type =3D=3D type) { > + int ret; > + > + log_debug("Sending event %x to spy '%s'\n", type, > + spy->id); > + ret =3D spy->func(spy->ctx, &event); > + > + /* > + * TODO: Handle various return codes to > + * > + * - claim an event (no others will see it) > + * - return an error from the event > + */ > + if (ret) > + return log_msg_ret("spy", ret); > + } > + } > + > + return 0; > +} > + > +int event_uninit(void) > +{ > + struct event_state *state =3D gd->event_state; > + struct event_spy *spy, *next; > + > + if (!state) > + return 0; > + list_for_each_entry_safe(spy, next, &state->spy_head, sibling_node) > + spy_free(spy); > + > + return 0; > +} > + > +int event_init(void) > +{ > + struct event_state *state; > + > + state =3D malloc(sizeof(struct event_state)); > + if (!state) > + return log_msg_ret("alloc", -ENOMEM); > + > + INIT_LIST_HEAD(&state->spy_head); > + > + gd->event_state =3D state; > + > + return 0; > +} > diff --git a/common/log.c b/common/log.c > index f7e0c0fbf556..7254aa70bfdf 100644 > --- a/common/log.c > +++ b/common/log.c > @@ -28,6 +28,7 @@ static const char *const log_cat_name[] =3D { > "devres", > "acpi", > "boot", > + "event", > }; > > _Static_assert(ARRAY_SIZE(log_cat_name) =3D=3D LOGC_COUNT - LOGC_NONE, > diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c > index e6ec6ff42121..c3f8ed3e5721 100644 > --- a/drivers/core/device-remove.c > +++ b/drivers/core/device-remove.c > @@ -12,6 +12,7 @@ > > #include > #include > +#include > #include > #include > #include > @@ -207,6 +208,10 @@ int device_remove(struct udevice *dev, uint flags) > if (!(dev_get_flags(dev) & DM_FLAG_ACTIVATED)) > return 0; > > + ret =3D device_notify(dev, EVT_DM_PRE_REMOVE); > + if (ret) > + return ret; > + > /* > * If the child returns EKEYREJECTED, continue. It just means that it > * didn't match the flags. > @@ -256,6 +261,10 @@ int device_remove(struct udevice *dev, uint flags) > > dev_bic_flags(dev, DM_FLAG_ACTIVATED); > > + ret =3D device_notify(dev, EVT_DM_POST_REMOVE); > + if (ret) > + goto err_remove; > + > return 0; > > err_remove: > diff --git a/drivers/core/device.c b/drivers/core/device.c > index 901c1e2f7db3..6f69b234a182 100644 > --- a/drivers/core/device.c > +++ b/drivers/core/device.c > @@ -10,6 +10,7 @@ > > #include > #include > +#include > #include > #include > #include > @@ -493,6 +494,10 @@ int device_probe(struct udevice *dev) > if (dev_get_flags(dev) & DM_FLAG_ACTIVATED) > return 0; > > + ret =3D device_notify(dev, EVT_DM_PRE_PROBE); > + if (ret) > + return ret; > + > drv =3D dev->driver; > assert(drv); > > @@ -597,6 +602,10 @@ int device_probe(struct udevice *dev) > dev->name, ret, errno_str(ret)); > } > > + ret =3D device_notify(dev, EVT_DM_POST_PROBE); > + if (ret) > + goto fail; > + > return 0; > fail_uclass: > if (device_remove(dev, DM_REMOVE_NORMAL)) { > diff --git a/include/asm-generic/global_data.h b/include/asm-generic/glo= bal_data.h > index c2f8fad1cb92..9f4598f09ee5 100644 > --- a/include/asm-generic/global_data.h > +++ b/include/asm-generic/global_data.h > @@ -467,6 +467,9 @@ struct global_data { > */ > char *smbios_version; > #endif > +#if CONFIG_IS_ENABLED(EVENT) > + struct event_state *event_state; This breaks 'make htmldocs'. ./include/asm-generic/global_data.h:474: warning: Function parameter or member 'event_state' not described in 'global_data' Best regards Heinrich > +#endif > }; > #ifndef DO_DEPS_ONLY > static_assert(sizeof(struct global_data) =3D=3D GD_SIZE); > diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h > index 02002acb787c..63074e1de509 100644 > --- a/include/dm/device-internal.h > +++ b/include/dm/device-internal.h > @@ -10,6 +10,7 @@ > #ifndef _DM_DEVICE_INTERNAL_H > #define _DM_DEVICE_INTERNAL_H > > +#include > #include > #include > > @@ -426,4 +427,13 @@ static inline void devres_release_all(struct udevic= e *dev) > } > > #endif /* ! CONFIG_DEVRES */ > + > +static inline int device_notify(const struct udevice *dev, enum event_t= type) > +{ > +#ifdef CONFIG_EVENT > + return event_notify(type, &dev, sizeof(dev)); > +#else > + return 0; > +#endif > +} > #endif > diff --git a/include/event.h b/include/event.h > new file mode 100644 > index 000000000000..e2b74e6e62f0 > --- /dev/null > +++ b/include/event.h > @@ -0,0 +1,105 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Events provide a general-purpose way to react to / subscribe to chan= ges > + * within U-Boot > + * > + * Copyright 2021 Google LLC > + * Written by Simon Glass > + */ > + > +#ifndef __event_h > +#define __event_h > + > +/** > + * enum event_t - Types of events supported by U-Boot > + * > + * @EVT_DM_PRE_PROBE: Device is about to be probed > + */ > +enum event_t { > + EVT_NONE, > + EVT_TEST, > + > + /* Events related to driver model */ > + EVT_DM_PRE_PROBE, > + EVT_DM_POST_PROBE, > + EVT_DM_PRE_REMOVE, > + EVT_DM_POST_REMOVE, > + > + EVT_COUNT > +}; > + > +union event_data { > + /** > + * struct event_data_test - test data > + * > + * @signal: A value to update the state with > + */ > + struct event_data_test { > + int signal; > + } test; > + > + /** > + * struct event_dm - driver model event > + * > + * @dev: Device this event relates to > + */ > + struct event_dm { > + struct udevice *dev; > + } dm; > +}; > + > +/** > + * struct event - an event that can be sent and received > + * > + * @type: Event type > + * @data: Data for this particular event > + */ > +struct event { > + enum event_t type; > + union event_data data; > +}; > + > +/** Function type for event handlers */ > +typedef int (*event_handler_t)(void *ctx, struct event *event); > + > +/** > + * event_register - register a new spy > + * > + * @id: Spy ID > + * @type: Event type to subscribe to > + * @func: Function to call when the event is sent > + * @ctx: Context to pass to the function > + * @return 0 if OK, -ve on erropr > + */ > +int event_register(const char *id, enum event_t type, event_handler_t f= unc, > + void *ctx); > + > +/** > + * event_notify() - notify spies about an event > + * > + * It is possible to pass in union event_data here but that may not be > + * convenient if the data is elsewhere, or is one of the members of the= union. > + * So this uses a void * for @data, with a separate @size. > + * > + * @type: Event type > + * @data: Event data to be sent (e.g. union_event_data) > + * @size: Size of data in bytes > + */ > +int event_notify(enum event_t type, void *data, int size); > + > +#if CONFIG_IS_ENABLED(EVENT) > +int event_uninit(void); > +int event_init(void); > +#else > +static inline int event_uninit(void) > +{ > + return 0; > +} > + > +static inline int event_init(void) > +{ > + return 0; > +} > +#endif > + > +#endif > diff --git a/include/event_internal.h b/include/event_internal.h > new file mode 100644 > index 000000000000..19308453f7b2 > --- /dev/null > +++ b/include/event_internal.h > @@ -0,0 +1,34 @@ > +/* SPDX-License-Identifier: GPL-2.0+ */ > +/* > + * Internal definitions for events > + * > + * Copyright 2021 Google LLC > + * Written by Simon Glass > + */ > + > +#ifndef __event_internal_h > +#define __event_internal_h > + > +#include > + > +/** > + * struct event_spy - a spy that watches for an event of a particular t= ype > + * > + * @id: Spy ID > + * @type: Event type to subscribe to > + * @func: Function to call when the event is sent > + * @ctx: Context to pass to the function > + */ > +struct event_spy { > + struct list_head sibling_node; > + const char *id; > + enum event_t type; > + event_handler_t func; > + void *ctx; > +}; > + > +struct event_state { > + struct list_head spy_head; > +}; > + > +#endif > diff --git a/include/log.h b/include/log.h > index ce48d51446f5..8f35c10abb5e 100644 > --- a/include/log.h > +++ b/include/log.h > @@ -98,6 +98,8 @@ enum log_category_t { > LOGC_ACPI, > /** @LOGC_BOOT: Related to boot process / boot image processing */ > LOGC_BOOT, > + /** @LOGC_EVENT: Related to event and event handling */ > + LOGC_EVENT, > /** @LOGC_COUNT: Number of log categories */ > LOGC_COUNT, > /** @LOGC_END: Sentinel value for lists of log categories */ > diff --git a/test/common/Makefile b/test/common/Makefile > index 24c9145dccc8..9087788ba6a8 100644 > --- a/test/common/Makefile > +++ b/test/common/Makefile > @@ -1,3 +1,4 @@ > # SPDX-License-Identifier: GPL-2.0+ > obj-y +=3D cmd_ut_common.o > obj-$(CONFIG_AUTOBOOT) +=3D test_autoboot.o > +obj-$(CONFIG_EVENT) +=3D event.o > diff --git a/test/common/event.c b/test/common/event.c > new file mode 100644 > index 000000000000..ddce7400f269 > --- /dev/null > +++ b/test/common/event.c > @@ -0,0 +1,87 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * Unit tests for event handling > + * > + * Copyright 2021 Google LLC > + * Written by Simon Glass > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > + > +struct test_state { > + struct udevice *dev; > + int val; > +}; > + > +static int h_adder(void *ctx, struct event *event) > +{ > + struct event_data_test *data =3D &event->data.test; > + struct test_state *test_state =3D ctx; > + > + test_state->val +=3D data->signal; > + > + return 0; > +} > + > +static int test_event_base(struct unit_test_state *uts) > +{ > + struct test_state state; > + int signal; > + > + state.val =3D 12; > + ut_assertok(event_register("wibble", EVT_TEST, h_adder, &state)); > + > + signal =3D 17; > + > + /* Check that the handler is called */ > + ut_assertok(event_notify(EVT_TEST, &signal, sizeof(signal))); > + ut_asserteq(12 + 17, state.val); > + > + return 0; > +} > + > +COMMON_TEST(test_event_base, 0); > + > +static int h_probe(void *ctx, struct event *event) > +{ > + struct test_state *test_state =3D ctx; > + > + test_state->dev =3D event->data.dm.dev; > + switch (event->type) { > + case EVT_DM_PRE_PROBE: > + test_state->val |=3D 1; > + break; > + case EVT_DM_POST_PROBE: > + test_state->val |=3D 2; > + break; > + default: > + break; > + } > + > + return 0; > +} > + > +static int test_event_probe(struct unit_test_state *uts) > +{ > + struct test_state state; > + struct udevice *dev; > + > + state.val =3D 0; > + ut_assertok(event_register("pre", EVT_DM_PRE_PROBE, h_probe, &state)); > + ut_assertok(event_register("post", EVT_DM_POST_PROBE, h_probe, &state)= ); > + > + /* Probe a device */ > + ut_assertok(uclass_first_device_err(UCLASS_TEST_FDT, &dev)); > + > + /* Check that the handler is called */ > + ut_asserteq(3, state.val); > + > + return 0; > +} > + > +COMMON_TEST(test_event_probe, UT_TESTF_DM | UT_TESTF_SCAN_FDT); > diff --git a/test/test-main.c b/test/test-main.c > index 8fcb02ecea5c..fd89ff558a0e 100644 > --- a/test/test-main.c > +++ b/test/test-main.c > @@ -7,6 +7,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -218,6 +219,9 @@ static int dm_test_restore(struct device_node *of_ro= ot) > */ > static int test_pre_run(struct unit_test_state *uts, struct unit_test = *test) > { > + gd->event_state =3D NULL; > + ut_assertok(event_init()); > + > if (test->flags & UT_TESTF_DM) > ut_assertok(dm_test_pre_run(uts)); > > @@ -260,6 +264,7 @@ static int test_post_run(struct unit_test_state *uts= , struct unit_test *test) > ut_unsilence_console(uts); > if (test->flags & UT_TESTF_DM) > ut_assertok(dm_test_post_run(uts)); > + ut_assertok(event_uninit()); > > return 0; > }