From nobody Fri Dec 26 02:15:39 2025 Received: from mail-lj1-f170.google.com (mail-lj1-f170.google.com [209.85.208.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A41B22E65F for ; Thu, 18 Jan 2024 19:53:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705607616; cv=none; b=KeLFRNq8/aqMYrfOcdPXmtTmiRO4b53iuvQMne2GBNLcpTHB00fjUoYOFNjlMXiB5lcCB3zhhsJKZ/YOsZ3KUEf2K02wHV3GgTKI68T/82WYm1Q9kWC53bsqjd6LrR3gd9/LrrDo2uHZhIU3ThZDTqPpLo0gtsvwTyaTS0VfE2I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705607616; c=relaxed/simple; bh=PFKESGwT+52VOtSt0GyKDZV9D4/icQHM8Qc6/fiJ5to=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AJPI84w59lCHnIEIhsNLO4bTBdHZA2CuJppGgRS37/Va99wxrztvquAxK7I2Q98x9mjKZU6C+SULAvFaRmE1N2kVcgOsSNMPostWYvXsF5wzeGHKC2usCSmjFiYkWjISx3P9cc8VKLM5QQf9xuk5h2UZCSdYQX3zMRlItrbGMXs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=H0AZCVIQ; arc=none smtp.client-ip=209.85.208.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="H0AZCVIQ" Received: by mail-lj1-f170.google.com with SMTP id 38308e7fff4ca-2ccbc328744so584081fa.3 for ; Thu, 18 Jan 2024 11:53:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1705607612; x=1706212412; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=V8Jw334gbtlpfyMf//A4Kl+X5QTyArqRPZ+OYE2aYXw=; b=H0AZCVIQpttS+i1l6sJXD97GXIyng2oe7ZvdWlWmzWbgzpRMhFmr+QityO3sCO7W05 Sidqg9A8azgwJjPSh4GdxEyJB1Tf9FpyAHX1Adb4uPjsUYye89nEbPcnOEpj+SD9O3eK L3YVX7RfLNt3C5/LopkdQLx+5n7Pn66IJiFEs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705607612; x=1706212412; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=V8Jw334gbtlpfyMf//A4Kl+X5QTyArqRPZ+OYE2aYXw=; b=PesIfJ5rS0HYfFyEew4ojviRca5phsHHDtK06UBdPZ3uStsHaIwZm0GXbuzodR5fJs I5eLLFNj+jDdPL2C2yH2IrhJQwWliim6ztCZtHEGDfN9k5wrhr0ulUaNaSwfaqVuAsa0 hhHs8gUY/5hGoFdB0LeTfNmbKDF+T/zpVaqkiALdlL2ZZLPR1hGJM++sIvI+P8NQMJEU GL5WOJUwbZnIx8khNJChpOZsrX/MGUe/KITJBqgUakVSo/KnwPmGcRXl8LRs9Fx3FlRx du5EN2uVZ8h0RbTrPEuKnHCLFSabRCMCvD98IIab43gRuYktlx5rkcaf6xxSu7fdXx+R hxWg== X-Gm-Message-State: AOJu0YzUqKfIW3vuaqWbWsygyvcnk/lMrsyDOdadkD6bxLQxtRBetNgu fDEucbbgnbdTyc88vUF4Un89pZSoObUsnwJAhRIPHaw/4lsLe0GMI5yzbM++yg== X-Google-Smtp-Source: AGHT+IGs3IPfRmNPEfLm8x5S3sBVMFQ5OIhoPRJwNBQiMD7pjy+Duv2NI5PaO+U99JoQtUzE9H6YTg== X-Received: by 2002:a2e:930d:0:b0:2cc:a5ae:f122 with SMTP id e13-20020a2e930d000000b002cca5aef122mr715385ljh.78.1705607611722; Thu, 18 Jan 2024 11:53:31 -0800 (PST) Received: from cracow.c.googlers.com.com (138.58.228.35.bc.googleusercontent.com. [35.228.58.138]) by smtp.gmail.com with ESMTPSA id 2-20020a05651c00c200b002ccd3e8a59esm2333345ljr.121.2024.01.18.11.53.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 11:53:31 -0800 (PST) From: Lukasz Majczak To: Gwendal Grignou , Tzung-Bi Shih , Radoslaw Biernacki , Wim Van Sebroeck , Lee Jones , Benson Leung , Guenter Roeck , Krzysztof Kozlowski , linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, chrome-platform@lists.linux.dev Cc: Lukasz Majczak Subject: [PATCH v2 1/3] platform/chrome: Update binary interface for EC-based watchdog Date: Thu, 18 Jan 2024 19:53:22 +0000 Message-ID: <20240118195325.2964918-2-lma@chromium.org> X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog In-Reply-To: <20240118195325.2964918-1-lma@chromium.org> References: <20240118195325.2964918-1-lma@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Update structures and defines related to EC_CMD_HANG_DETECT to allow usage of new EC-based watchdog. Signed-off-by: Lukasz Majczak Reviewed-by: Guenter Roeck --- .../linux/platform_data/cros_ec_commands.h | 78 +++++++++---------- 1 file changed, 35 insertions(+), 43 deletions(-) diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux= /platform_data/cros_ec_commands.h index 7dae17b62a4d..ecc47d5fe239 100644 --- a/include/linux/platform_data/cros_ec_commands.h +++ b/include/linux/platform_data/cros_ec_commands.h @@ -3961,60 +3961,52 @@ struct ec_response_i2c_passthru { } __ec_align1; =20 /*************************************************************************= ****/ -/* Power button hang detect */ - +/* AP hang detect */ #define EC_CMD_HANG_DETECT 0x009F =20 -/* Reasons to start hang detection timer */ -/* Power button pressed */ -#define EC_HANG_START_ON_POWER_PRESS BIT(0) - -/* Lid closed */ -#define EC_HANG_START_ON_LID_CLOSE BIT(1) - - /* Lid opened */ -#define EC_HANG_START_ON_LID_OPEN BIT(2) - -/* Start of AP S3->S0 transition (booting or resuming from suspend) */ -#define EC_HANG_START_ON_RESUME BIT(3) - -/* Reasons to cancel hang detection */ +#define EC_HANG_DETECT_MIN_TIMEOUT 5 +#define EC_HANG_DETECT_MAX_TIMEOUT 65535 =20 -/* Power button released */ -#define EC_HANG_STOP_ON_POWER_RELEASE BIT(8) +/* EC hang detect commands */ +enum ec_hang_detect_cmds { + /* Reload AP hang detect timer. */ + EC_HANG_DETECT_CMD_RELOAD =3D 0x0, =20 -/* Any host command from AP received */ -#define EC_HANG_STOP_ON_HOST_COMMAND BIT(9) + /* Stop AP hang detect timer. */ + EC_HANG_DETECT_CMD_CANCEL =3D 0x1, =20 -/* Stop on end of AP S0->S3 transition (suspending or shutting down) */ -#define EC_HANG_STOP_ON_SUSPEND BIT(10) + /* Configure watchdog with given reboot timeout and + * cancel currently running AP hang detect timer. + */ + EC_HANG_DETECT_CMD_SET_TIMEOUT =3D 0x2, =20 -/* - * If this flag is set, all the other fields are ignored, and the hang det= ect - * timer is started. This provides the AP a way to start the hang timer - * without reconfiguring any of the other hang detect settings. Note that - * you must previously have configured the timeouts. - */ -#define EC_HANG_START_NOW BIT(30) + /* Get last hang status - whether the AP boot was clear or not */ + EC_HANG_DETECT_CMD_GET_STATUS =3D 0x3, =20 -/* - * If this flag is set, all the other fields are ignored (including - * EC_HANG_START_NOW). This provides the AP a way to stop the hang timer - * without reconfiguring any of the other hang detect settings. - */ -#define EC_HANG_STOP_NOW BIT(31) + /* Clear last hang status. Called when AP is rebooting/shutting down + * gracefully. + */ + EC_HANG_DETECT_CMD_CLEAR_STATUS =3D 0x4 +}; =20 struct ec_params_hang_detect { - /* Flags; see EC_HANG_* */ - uint32_t flags; - - /* Timeout in msec before generating host event, if enabled */ - uint16_t host_event_timeout_msec; + uint16_t command; /* enum ec_hang_detect_cmds */ + /* Timeout in seconds before generating reboot */ + uint16_t reboot_timeout_sec; +} __ec_align2; =20 - /* Timeout in msec before generating warm reboot, if enabled */ - uint16_t warm_reboot_timeout_msec; -} __ec_align4; +/* Status codes that describe whether AP has boot normally or the hang has= been + * detected and EC has reset AP + */ +enum ec_hang_detect_status { + EC_HANG_DETECT_AP_BOOT_NORMAL =3D 0x0, + EC_HANG_DETECT_AP_BOOT_EC_WDT =3D 0x1, + EC_HANG_DETECT_AP_BOOT_COUNT, +}; =20 +struct ec_response_hang_detect { + uint8_t status; /* enum ec_hang_detect_status */ +} __ec_align1; /*************************************************************************= ****/ /* Commands for battery charging */ =20 --=20 2.43.0.429.g432eaa2c6b-goog From nobody Fri Dec 26 02:15:39 2025 Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4850A2E82B for ; Thu, 18 Jan 2024 19:53:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705607617; cv=none; b=l3qBEtxpD/PZGxY+RtEnJ63QVjbezOEYIsIVrFLMTawc/5EiB5571DWVgWnbGYklnTs6NzAbyef5jFeMgx5e6d2YqphVJBAHN3iUUMp3RILr6JReYuZJ1sNGaXH//ABszaGp3/8rkCqJGszDJCQeti5snmYRc+qKGgXIp/HgTUw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705607617; c=relaxed/simple; bh=SZPHFukP2vPjARVRx6o9EqSmOJNzMlyzLKxUxHTg/6E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=W3q/aGDmyW2J/nMzKBMFiqKx7NCXsjzKKQIkIi7diGnbZ7ntMQr+rpdKJbZnb8i7c4TnT+3/4oELFjFj/AHT8T2g6nHEvYh4WPa62VoYrtuuhGLTITecWFCbyBlDX1rap38VuUGvf50bc9e8kkgwtMfDmA8HTJh+s1T7bCauESY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=kX86jqz2; arc=none smtp.client-ip=209.85.208.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="kX86jqz2" Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-2ccea11b6bbso815011fa.0 for ; Thu, 18 Jan 2024 11:53:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1705607613; x=1706212413; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7DL4Xb2/mJV98z6ViovAZ4ufx02hdHfeh6ifkPAErM4=; b=kX86jqz2XmnUXBCGyW7RrhZuGfx4mBjw9yHjSXuLZzLi0zI6UNZJlPUjFUKsUClJkI EoiKz2rGT03YksuGPK7ftwV9EYgrFcObY+AZPAQfOMqivukEp5z7OGkXnx3ko/GzsfYB FgMyoIlpLTmtiAVzKsObMPFZcpUcPDUkLHZkY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705607613; x=1706212413; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7DL4Xb2/mJV98z6ViovAZ4ufx02hdHfeh6ifkPAErM4=; b=iD020Zn/DOC6wp2BnQaqQUM8WpmBmx7AoKsj0HQBWD3f99VyvPzH4Bxlgdm8KySTAy M8zvIqhCVC6i/xMu4OVpNo/BZIogherzWz3tVqIZPfESHaG80Gk1LzHvEH52AvwAPklf u7+SRBxApvm3O0ed9UmJvbjIXOIY2vAu4kl+Rx+Kaln5f+jU/REjVquKZpijp4T3xdko H9vnc6CjhCRunT9WUuL0PIV05dDUGh6+m79YClzyLwv3waCAkK+i0sTY2D0PwGMz1dBR cV1OvXHzBk2iOwm3GHO3TWCXizXQxQptu5FZR+JqNnKDoJQ1Z4qGn4EXIk1wYtdPiub6 y0DA== X-Gm-Message-State: AOJu0YxDthqhj8CN17zfLccWlc1Ej62dSOvOEYvinCJbDC29n9BT0pTW UT9G91VsO4uyUxDIGYQ/PrSM4/U2kJ5tX/S/JX3iV7M8IqRoJZT8wSsl1kIDFb8wzUp8tM9jbah ogQ== X-Google-Smtp-Source: AGHT+IF4XNDOxUa6mccHuHFzuRwablf8OZq3KHR8qjMuUGwsvzt65X8VFU1m0U5drZq/eNDXlQycow== X-Received: by 2002:a2e:b056:0:b0:2cd:2796:8e26 with SMTP id d22-20020a2eb056000000b002cd27968e26mr1907649ljl.7.1705607613393; Thu, 18 Jan 2024 11:53:33 -0800 (PST) Received: from cracow.c.googlers.com.com (138.58.228.35.bc.googleusercontent.com. [35.228.58.138]) by smtp.gmail.com with ESMTPSA id 2-20020a05651c00c200b002ccd3e8a59esm2333345ljr.121.2024.01.18.11.53.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 11:53:33 -0800 (PST) From: Lukasz Majczak To: Gwendal Grignou , Tzung-Bi Shih , Radoslaw Biernacki , Wim Van Sebroeck , Lee Jones , Benson Leung , Guenter Roeck , Krzysztof Kozlowski , linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, chrome-platform@lists.linux.dev Cc: Lukasz Majczak Subject: [PATCH v2 2/3] watchdog: Add ChromeOS EC-based watchdog driver Date: Thu, 18 Jan 2024 19:53:23 +0000 Message-ID: <20240118195325.2964918-3-lma@chromium.org> X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog In-Reply-To: <20240118195325.2964918-1-lma@chromium.org> References: <20240118195325.2964918-1-lma@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Embedded Controller (EC) present on Chromebook devices can be used as a watchdog. Implement a driver to support it. Signed-off-by: Lukasz Majczak Reviewed-by: Guenter Roeck --- MAINTAINERS | 6 + drivers/watchdog/Kconfig | 11 ++ drivers/watchdog/Makefile | 1 + drivers/watchdog/cros_ec_wdt.c | 202 +++++++++++++++++++++++++++++++++ 4 files changed, 220 insertions(+) create mode 100644 drivers/watchdog/cros_ec_wdt.c diff --git a/MAINTAINERS b/MAINTAINERS index ef90ddc0fda6..aaae581aae70 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4981,6 +4981,12 @@ R: Sami Ky=C3=B6stil=C3=A4 S: Maintained F: drivers/platform/chrome/cros_hps_i2c.c =20 +CHROMEOS EC WATCHDOG +M: Lukasz Majczak +L: chrome-platform@lists.linux.dev +S: Maintained +F: drivers/watchdog/cros_ec_wdt.c + CHRONTEL CH7322 CEC DRIVER M: Joe Tessler L: linux-media@vger.kernel.org diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 7d22051b15a2..4700b218340f 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -181,6 +181,17 @@ config BD957XMUF_WATCHDOG watchdog. Alternatively say M to compile the driver as a module, which will be called bd9576_wdt. =20 +config CROS_EC_WATCHDOG + tristate "ChromeOS EC-based watchdog" + select WATCHDOG_CORE + depends on CROS_EC + help + Watchdog driver for Chromebook devices equipped with embedded controlle= r. + Trigger event is recorded in EC and checked on the subsequent boot. + + To compile this driver as a module, choose M here: the + module will be called cros_ec_wdt. + config DA9052_WATCHDOG tristate "Dialog DA9052 Watchdog" depends on PMIC_DA9052 || COMPILE_TEST diff --git a/drivers/watchdog/Makefile b/drivers/watchdog/Makefile index 7cbc34514ec1..3710c218f05e 100644 --- a/drivers/watchdog/Makefile +++ b/drivers/watchdog/Makefile @@ -217,6 +217,7 @@ obj-$(CONFIG_XEN_WDT) +=3D xen_wdt.o =20 # Architecture Independent obj-$(CONFIG_BD957XMUF_WATCHDOG) +=3D bd9576_wdt.o +obj-$(CONFIG_CROS_EC_WATCHDOG) +=3D cros_ec_wdt.o obj-$(CONFIG_DA9052_WATCHDOG) +=3D da9052_wdt.o obj-$(CONFIG_DA9055_WATCHDOG) +=3D da9055_wdt.o obj-$(CONFIG_DA9062_WATCHDOG) +=3D da9062_wdt.o diff --git a/drivers/watchdog/cros_ec_wdt.c b/drivers/watchdog/cros_ec_wdt.c new file mode 100644 index 000000000000..1915b8d55e45 --- /dev/null +++ b/drivers/watchdog/cros_ec_wdt.c @@ -0,0 +1,202 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2024 Google LLC. + * Author: Lukasz Majczak + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#define CROS_EC_WATCHDOG_DEFAULT_TIME 30 /* seconds */ +#define DRV_NAME "cros-ec-wdt-drv" + +union cros_ec_wdt_data { + struct ec_params_hang_detect req; + struct ec_response_hang_detect resp; +} __packed; + +static int cros_ec_wdt_send_cmd(struct cros_ec_device *cros_ec, + union cros_ec_wdt_data *arg) +{ + int ret; + struct { + struct cros_ec_command msg; + union cros_ec_wdt_data data; + } __packed buf =3D { + .msg =3D { + .version =3D 0, + .command =3D EC_CMD_HANG_DETECT, + .insize =3D (arg->req.command =3D=3D EC_HANG_DETECT_CMD_GET_STATUS) ? + sizeof(struct ec_response_hang_detect) : + 0, + .outsize =3D sizeof(struct ec_params_hang_detect), + }, + .data.req =3D arg->req + }; + + ret =3D cros_ec_cmd_xfer_status(cros_ec, &buf.msg); + if (ret < 0) + return ret; + + arg->resp =3D buf.data.resp; + + return 0; +} + +static int cros_ec_wdt_ping(struct watchdog_device *wdd) +{ + struct cros_ec_device *cros_ec =3D watchdog_get_drvdata(wdd); + union cros_ec_wdt_data arg; + int ret; + + arg.req.command =3D EC_HANG_DETECT_CMD_RELOAD; + ret =3D cros_ec_wdt_send_cmd(cros_ec, &arg); + if (ret < 0) + dev_dbg(wdd->parent, "Failed to ping watchdog (%d)", ret); + + return ret; +} + +static int cros_ec_wdt_start(struct watchdog_device *wdd) +{ + struct cros_ec_device *cros_ec =3D watchdog_get_drvdata(wdd); + union cros_ec_wdt_data arg; + int ret; + + /* Prepare watchdog on EC side */ + arg.req.command =3D EC_HANG_DETECT_CMD_SET_TIMEOUT; + arg.req.reboot_timeout_sec =3D wdd->timeout; + ret =3D cros_ec_wdt_send_cmd(cros_ec, &arg); + if (ret < 0) + dev_dbg(wdd->parent, "Failed to start watchdog (%d)", ret); + + return ret; +} + +static int cros_ec_wdt_stop(struct watchdog_device *wdd) +{ + struct cros_ec_device *cros_ec =3D watchdog_get_drvdata(wdd); + union cros_ec_wdt_data arg; + int ret; + + arg.req.command =3D EC_HANG_DETECT_CMD_CANCEL; + ret =3D cros_ec_wdt_send_cmd(cros_ec, &arg); + if (ret < 0) + dev_dbg(wdd->parent, "Failed to stop watchdog (%d)", ret); + + return ret; +} + +static int cros_ec_wdt_set_timeout(struct watchdog_device *wdd, unsigned i= nt t) +{ + unsigned int old_timeout =3D wdd->timeout; + int ret; + + wdd->timeout =3D t; + ret =3D cros_ec_wdt_start(wdd); + if (ret < 0) + wdd->timeout =3D old_timeout; + + return ret; +} + +static const struct watchdog_info cros_ec_wdt_ident =3D { + .options =3D WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGI= CCLOSE, + .firmware_version =3D 0, + .identity =3D DRV_NAME, +}; + +static const struct watchdog_ops cros_ec_wdt_ops =3D { + .owner =3D THIS_MODULE, + .ping =3D cros_ec_wdt_ping, + .start =3D cros_ec_wdt_start, + .stop =3D cros_ec_wdt_stop, + .set_timeout =3D cros_ec_wdt_set_timeout, +}; + +static int cros_ec_wdt_probe(struct platform_device *pdev) +{ + struct device *dev =3D &pdev->dev; + struct cros_ec_dev *ec_dev =3D dev_get_drvdata(dev->parent); + struct cros_ec_device *cros_ec =3D ec_dev->ec_dev; + struct watchdog_device *wdd; + union cros_ec_wdt_data arg; + int ret =3D 0; + + wdd =3D devm_kzalloc(&pdev->dev, sizeof(struct watchdog_device), GFP_KERN= EL); + if (!wdd) + return -ENOMEM; + + arg.req.command =3D EC_HANG_DETECT_CMD_GET_STATUS; + ret =3D cros_ec_wdt_send_cmd(cros_ec, &arg); + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to get watchdog bootstatus"); + + wdd->parent =3D &pdev->dev; + wdd->info =3D &cros_ec_wdt_ident; + wdd->ops =3D &cros_ec_wdt_ops; + wdd->timeout =3D CROS_EC_WATCHDOG_DEFAULT_TIME; + wdd->min_timeout =3D EC_HANG_DETECT_MIN_TIMEOUT; + wdd->max_timeout =3D EC_HANG_DETECT_MAX_TIMEOUT; + if (arg.resp.status =3D=3D EC_HANG_DETECT_AP_BOOT_EC_WDT) + wdd->bootstatus =3D WDIOF_CARDRESET; + + arg.req.command =3D EC_HANG_DETECT_CMD_CLEAR_STATUS; + ret =3D cros_ec_wdt_send_cmd(cros_ec, &arg); + if (ret < 0) + return dev_err_probe(dev, ret, "Failed to clear watchdog bootstatus"); + + watchdog_stop_on_reboot(wdd); + watchdog_stop_on_unregister(wdd); + watchdog_set_drvdata(wdd, cros_ec); + platform_set_drvdata(pdev, wdd); + + return devm_watchdog_register_device(dev, wdd); +} + +static int __maybe_unused cros_ec_wdt_suspend(struct platform_device *pdev= , pm_message_t state) +{ + struct watchdog_device *wdd =3D platform_get_drvdata(pdev); + int ret =3D 0; + + if (watchdog_active(wdd)) + ret =3D cros_ec_wdt_stop(wdd); + + return ret; +} + +static int __maybe_unused cros_ec_wdt_resume(struct platform_device *pdev) +{ + struct watchdog_device *wdd =3D platform_get_drvdata(pdev); + int ret =3D 0; + + if (watchdog_active(wdd)) + ret =3D cros_ec_wdt_start(wdd); + + return ret; +} + +static struct platform_driver cros_ec_wdt_driver =3D { + .probe =3D cros_ec_wdt_probe, + .suspend =3D pm_ptr(cros_ec_wdt_suspend), + .resume =3D pm_ptr(cros_ec_wdt_resume), + .driver =3D { + .name =3D DRV_NAME, + }, +}; + +module_platform_driver(cros_ec_wdt_driver); + +static const struct platform_device_id cros_ec_wdt_id[] =3D { + { DRV_NAME, 0 }, + {} +}; +MODULE_DEVICE_TABLE(platform, cros_ec_wdt_id); +MODULE_DESCRIPTION("Cros EC Watchdog Device Driver"); +MODULE_LICENSE("GPL"); --=20 2.43.0.429.g432eaa2c6b-goog From nobody Fri Dec 26 02:15:39 2025 Received: from mail-lj1-f179.google.com (mail-lj1-f179.google.com [209.85.208.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 93D952E83A for ; Thu, 18 Jan 2024 19:53:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705607618; cv=none; b=a5TCmIC+CLA2V1V+C3YA/DuTpUegVE4+/017yZT4gaB4uxo7IYZBUw/pkH+zlImys5z0ApTnYDsaewSp94tcyOHkN7ovhg8KtnzCEA7yvujhW5G9HSVVNYh4nhkrt74xg4Wy7ZvyGrD1RoLECKwbrOaeDdoVnRUSPzLczgcgvn0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705607618; c=relaxed/simple; bh=TJ0HS9DsmpIK3Lc89zTlK7cbKY5l8+Fb4v4FOr6pRxc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uZ/0/E5RKyuoebSEG81vHFdw8xGmvbUtko56T5eF0Q9oGKCIodqRG88O+QCp8DPlUo/W6YcfbqKmQ5cvqJyFvfRxJhbkN++KFPZ+pIK9sRsoXGUJ4jjhaVNvDMwIwgslA/tAqA04kCjwIJSW6rs5hMmuVHI3e+E+M0NyYu9NQKI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=DCEdkRnP; arc=none smtp.client-ip=209.85.208.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="DCEdkRnP" Received: by mail-lj1-f179.google.com with SMTP id 38308e7fff4ca-2ccb4adbffbso783861fa.0 for ; Thu, 18 Jan 2024 11:53:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1705607615; x=1706212415; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=oAiOdmemfs++EaElh/QkCQxHrKK1nXdTbeGxucqp/W4=; b=DCEdkRnPJcYRGsVC1akc8QKlqgmuk0TJIBRhO05kOxoaHkTrRgCjlK5dmiZDDERzVq NHeSJSkwXBBIaYW8oFG0ipPzYeqhlALLU+dMppExs4sNn2zXEPI2sOysWAWrykAZZORD aOoUdqja7eFPWExmPkPDtxoXwgWn9J8pkePjU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705607615; x=1706212415; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oAiOdmemfs++EaElh/QkCQxHrKK1nXdTbeGxucqp/W4=; b=BRegwWm3hOp7JXT51PMC1jLP6IrTM5okS0fEw9xnK+ubRglccwxF+ckOFt3ZtQ6niD hNYadr+hERaMKqixlaeoSXeBruSqyuAVnJYkfguiLZ6Z45hU0fvecEZjkhP5Z8uHgs1T CfBVnuRbCBU93Zuf8xPJjHCSZ9iD6RUalt3Og5yfeQ4ahVgQHo/foj5M10sbrlpaGYnS ZEnlL5Ro5DU8QUMiuYI17I6cZtRFSAUED8sxu5BGNbSBrKDCmjkSuZ0evfL/UjDR5UaP aC2ONnz/7tZzmzGpo9brrY9LtJTlyc0BDfThdyI3aJWDgC7/yqXrGnhuCLJfh8NLt/2O fPMw== X-Gm-Message-State: AOJu0YzF59YPhS7GQfVEEcWmv8THveZhByZW8WbjoY3xHCzSNN4v6D/i xBLXhodT+zhlAnLjO6vIgFaKV7Xc9xcRGTPfUzwtqNiFXKMztAOauhECqrKQuA== X-Google-Smtp-Source: AGHT+IEy33EOIoM9A41TAqaa5BgK/M3wGgbb3sgYuQYOQsgSDzkgvy6rte8dlH1jvozcsJ8pHI/OXw== X-Received: by 2002:a2e:b708:0:b0:2cd:2606:70e2 with SMTP id j8-20020a2eb708000000b002cd260670e2mr807557ljo.20.1705607614870; Thu, 18 Jan 2024 11:53:34 -0800 (PST) Received: from cracow.c.googlers.com.com (138.58.228.35.bc.googleusercontent.com. [35.228.58.138]) by smtp.gmail.com with ESMTPSA id 2-20020a05651c00c200b002ccd3e8a59esm2333345ljr.121.2024.01.18.11.53.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Jan 2024 11:53:34 -0800 (PST) From: Lukasz Majczak To: Gwendal Grignou , Tzung-Bi Shih , Radoslaw Biernacki , Wim Van Sebroeck , Lee Jones , Benson Leung , Guenter Roeck , Krzysztof Kozlowski , linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, chrome-platform@lists.linux.dev Cc: Lukasz Majczak Subject: [PATCH v2 3/3] mfd: cros_ec: Register EC-based watchdog subdevice Date: Thu, 18 Jan 2024 19:53:24 +0000 Message-ID: <20240118195325.2964918-4-lma@chromium.org> X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog In-Reply-To: <20240118195325.2964918-1-lma@chromium.org> References: <20240118195325.2964918-1-lma@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add ChromeOS EC-based watchdog as EC subdevice. Signed-off-by: Lukasz Majczak Reviewed-by: Guenter Roeck --- drivers/mfd/cros_ec_dev.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/mfd/cros_ec_dev.c b/drivers/mfd/cros_ec_dev.c index 603b1cd52785..d0140a285f69 100644 --- a/drivers/mfd/cros_ec_dev.c +++ b/drivers/mfd/cros_ec_dev.c @@ -91,6 +91,10 @@ static const struct mfd_cell cros_usbpd_notify_cells[] = =3D { { .name =3D "cros-usbpd-notify", }, }; =20 +static const struct mfd_cell cros_ec_wdt_cells[] =3D { + { .name =3D "cros-ec-wdt-drv", } +}; + static const struct cros_feature_to_cells cros_subdevices[] =3D { { .id =3D EC_FEATURE_CEC, @@ -107,6 +111,11 @@ static const struct cros_feature_to_cells cros_subdevi= ces[] =3D { .mfd_cells =3D cros_usbpd_charger_cells, .num_cells =3D ARRAY_SIZE(cros_usbpd_charger_cells), }, + { + .id =3D EC_FEATURE_HANG_DETECT, + .mfd_cells =3D cros_ec_wdt_cells, + .num_cells =3D ARRAY_SIZE(cros_ec_wdt_cells), + }, }; =20 static const struct mfd_cell cros_ec_platform_cells[] =3D { --=20 2.43.0.429.g432eaa2c6b-goog