* [PATCH v1 1/3] efi: add prototype and definition for set_watchdog_timer @ 2019-02-07 9:56 Oleksij Rempel 2019-02-07 9:56 ` [PATCH v1 2/3] watchdog: add (U)EFI watchdog driver Oleksij Rempel 2019-02-07 9:56 ` [PATCH v1 3/3] EFI: add watchdog support Oleksij Rempel 0 siblings, 2 replies; 4+ messages in thread From: Oleksij Rempel @ 2019-02-07 9:56 UTC (permalink / raw) To: barebox; +Cc: Oleksij Rempel Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> --- include/efi.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/efi.h b/include/efi.h index 7cc5fe05fa..218333f824 100644 --- a/include/efi.h +++ b/include/efi.h @@ -234,7 +234,10 @@ typedef struct { efi_status_t (EFIAPI *exit_boot_services)(efi_handle_t, unsigned long); void *get_next_monotonic_count; efi_status_t (EFIAPI *stall)(unsigned long usecs); - void *set_watchdog_timer; + efi_status_t (EFIAPI *set_watchdog_timer)(unsigned long timeout, + uint64_t watchdog_code, + unsigned long data_size, + s16 *watchdog_data); efi_status_t(EFIAPI *connect_controller)(efi_handle_t controller_handle, efi_handle_t *driver_image_handle, struct efi_device_path *remaining_device_path, -- 2.20.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v1 2/3] watchdog: add (U)EFI watchdog driver 2019-02-07 9:56 [PATCH v1 1/3] efi: add prototype and definition for set_watchdog_timer Oleksij Rempel @ 2019-02-07 9:56 ` Oleksij Rempel 2019-02-11 7:51 ` Sascha Hauer 2019-02-07 9:56 ` [PATCH v1 3/3] EFI: add watchdog support Oleksij Rempel 1 sibling, 1 reply; 4+ messages in thread From: Oleksij Rempel @ 2019-02-07 9:56 UTC (permalink / raw) To: barebox; +Cc: Oleksij Rempel This driver is using SetWatchdogTimer() UEFI interface and was tested on iBASE MI991AF Mini-ITX motherboard. Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> --- common/efi/efi.c | 9 ++++- drivers/watchdog/Kconfig | 6 ++++ drivers/watchdog/Makefile | 1 + drivers/watchdog/efi_wdt.c | 69 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 drivers/watchdog/efi_wdt.c diff --git a/common/efi/efi.c b/common/efi/efi.c index 1f451a157e..a7b25cbbe2 100644 --- a/common/efi/efi.c +++ b/common/efi/efi.c @@ -367,8 +367,15 @@ efi_status_t efi_main(efi_handle_t image, efi_system_table_t *sys_table) static int efi_core_init(void) { - struct device_d *dev = device_alloc("efi-cs", DEVICE_ID_SINGLE); + struct device_d *dev; + int ret; + + dev = device_alloc("efi-cs", DEVICE_ID_SINGLE); + ret = platform_device_register(dev); + if (ret) + return ret; + dev = device_alloc("efi-wdt", DEVICE_ID_SINGLE); return platform_device_register(dev); } core_initcall(efi_core_init); diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 27e9f6d8b4..96e91fc2ce 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -22,6 +22,12 @@ config WATCHDOG_AR9344 help Add support for watchdog on the QCA AR9344 SoC. +config WATCHDOG_EFI + bool "Generic EFI Watchdog Driver" + depends on EFI_BOOTUP + help + Add support for the EFI watchdog. + config WATCHDOG_DAVINCI bool "TI Davinci" depends on ARCH_DAVINCI diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index faf06110a3..69189ba1f3 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -1,5 +1,6 @@ obj-$(CONFIG_WATCHDOG) += wd_core.o obj-$(CONFIG_WATCHDOG_AR9344) += ar9344_wdt.o +obj-$(CONFIG_WATCHDOG_EFI) += efi_wdt.o obj-$(CONFIG_WATCHDOG_DAVINCI) += davinci_wdt.o obj-$(CONFIG_WATCHDOG_OMAP) += omap_wdt.o obj-$(CONFIG_WATCHDOG_MXS28) += im28wd.o diff --git a/drivers/watchdog/efi_wdt.c b/drivers/watchdog/efi_wdt.c new file mode 100644 index 0000000000..70554770f3 --- /dev/null +++ b/drivers/watchdog/efi_wdt.c @@ -0,0 +1,69 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* + * Copyright (C) 2019 Oleksij Rempel <o.rempel@pengutronix.de>, Pengutronix + */ + +#include <common.h> +#include <init.h> +#include <driver.h> +#include <efi.h> +#include <efi/efi.h> +#include <watchdog.h> + +struct efi_wdt_priv { + struct watchdog wd; + struct device_d *dev; +}; + +#define to_efi_wdt(h) container_of(h, struct efi_wdt_priv, wd) + +static int efi_wdt_set_timeout(struct watchdog *wd, unsigned timeout) +{ + struct efi_wdt_priv *priv = to_efi_wdt(wd); + efi_status_t efiret; + + efiret = BS->set_watchdog_timer(timeout, 0, 0, NULL); + if (EFI_ERROR(efiret)) + dev_err(priv->dev, "filed to set EFI watchdog: %lx\n", efiret); + + return 0; +} + +static int efi_wdt_probe(struct device_d *dev) +{ + struct efi_wdt_priv *priv; + int ret; + + priv = xzalloc(sizeof(*priv)); + + priv->wd.set_timeout = efi_wdt_set_timeout; + priv->wd.hwdev = dev; + priv->dev = dev; + + dev->priv = priv; + + priv->wd.timeout_max = U32_MAX; + + ret = watchdog_register(&priv->wd); + if (ret) + goto on_error; + + return 0; + +on_error: + free(priv); + return ret; +} + + + +static struct driver_d efi_wdt_driver = { + .name = "efi-wdt", + .probe = efi_wdt_probe, +}; + +static int efi_wdt_initcall(void) +{ + return platform_driver_register(&efi_wdt_driver); +} +device_initcall(efi_wdt_initcall); -- 2.20.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v1 2/3] watchdog: add (U)EFI watchdog driver 2019-02-07 9:56 ` [PATCH v1 2/3] watchdog: add (U)EFI watchdog driver Oleksij Rempel @ 2019-02-11 7:51 ` Sascha Hauer 0 siblings, 0 replies; 4+ messages in thread From: Sascha Hauer @ 2019-02-11 7:51 UTC (permalink / raw) To: Oleksij Rempel; +Cc: barebox On Thu, Feb 07, 2019 at 10:56:24AM +0100, Oleksij Rempel wrote: > This driver is using SetWatchdogTimer() UEFI interface and was > tested on iBASE MI991AF Mini-ITX motherboard. > > Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> > --- > common/efi/efi.c | 9 ++++- > drivers/watchdog/Kconfig | 6 ++++ > drivers/watchdog/Makefile | 1 + > drivers/watchdog/efi_wdt.c | 69 ++++++++++++++++++++++++++++++++++++++ > 4 files changed, 84 insertions(+), 1 deletion(-) > create mode 100644 drivers/watchdog/efi_wdt.c > > +#define to_efi_wdt(h) container_of(h, struct efi_wdt_priv, wd) > + > +static int efi_wdt_set_timeout(struct watchdog *wd, unsigned timeout) > +{ > + struct efi_wdt_priv *priv = to_efi_wdt(wd); > + efi_status_t efiret; > + > + efiret = BS->set_watchdog_timer(timeout, 0, 0, NULL); > + if (EFI_ERROR(efiret)) > + dev_err(priv->dev, "filed to set EFI watchdog: %lx\n", efiret); Shouldn't you return an error here? > + .name = "efi-wdt", > + .probe = efi_wdt_probe, > +}; > + > +static int efi_wdt_initcall(void) > +{ > + return platform_driver_register(&efi_wdt_driver); > +} > +device_initcall(efi_wdt_initcall); device_platform_driver instead? Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v1 3/3] EFI: add watchdog support 2019-02-07 9:56 [PATCH v1 1/3] efi: add prototype and definition for set_watchdog_timer Oleksij Rempel 2019-02-07 9:56 ` [PATCH v1 2/3] watchdog: add (U)EFI watchdog driver Oleksij Rempel @ 2019-02-07 9:56 ` Oleksij Rempel 1 sibling, 0 replies; 4+ messages in thread From: Oleksij Rempel @ 2019-02-07 9:56 UTC (permalink / raw) To: barebox; +Cc: Oleksij Rempel Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de> --- arch/x86/configs/efi_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/configs/efi_defconfig b/arch/x86/configs/efi_defconfig index fdf092e9ba..f489770eba 100644 --- a/arch/x86/configs/efi_defconfig +++ b/arch/x86/configs/efi_defconfig @@ -56,6 +56,7 @@ CONFIG_CMD_MM=y CONFIG_CMD_DETECT=y CONFIG_CMD_FLASH=y CONFIG_CMD_POWEROFF=y +CONFIG_CMD_WD=y CONFIG_CMD_2048=y CONFIG_CMD_BAREBOX_UPDATE=y CONFIG_CMD_OF_NODE=y @@ -71,6 +72,8 @@ CONFIG_DRIVER_SERIAL_NS16550=y CONFIG_DRIVER_NET_EFI_SNP=y # CONFIG_SPI is not set CONFIG_DISK=y +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_EFI=y CONFIG_FS_EXT4=y CONFIG_FS_TFTP=y CONFIG_FS_NFS=y -- 2.20.1 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-02-11 7:51 UTC | newest] Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-02-07 9:56 [PATCH v1 1/3] efi: add prototype and definition for set_watchdog_timer Oleksij Rempel 2019-02-07 9:56 ` [PATCH v1 2/3] watchdog: add (U)EFI watchdog driver Oleksij Rempel 2019-02-11 7:51 ` Sascha Hauer 2019-02-07 9:56 ` [PATCH v1 3/3] EFI: add watchdog support Oleksij Rempel
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox