From patchwork Mon Aug 22 21:40:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evan Green X-Patchwork-Id: 12951415 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) (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 67A734C65 for ; Mon, 22 Aug 2022 21:40:54 +0000 (UTC) Received: by mail-pg1-f181.google.com with SMTP id v4so10554803pgi.10 for ; Mon, 22 Aug 2022 14:40:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=ABKKHKOpeHgVabWRGp+gR63dGUxiLMPakCVue+4/OYs=; b=KNLLffBDzmvzvDQj49RUi8Ur71pmj6u3rvTez/W03jco+vImwiz3zbxecx6MyxWhWj UQ38ZQlw+MkIsTZWzvNgNGIwmIhkrmN7oQhb754i1gv0GUsM1G5HV7jgYy+Mc60OAsmj 52fi5r2oUrm9uqA5Z73KJEgo4XAEiRzhZwwCs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=ABKKHKOpeHgVabWRGp+gR63dGUxiLMPakCVue+4/OYs=; b=8NMMXBaCCMLdRym/o8ih268mcd4TKoGiMB5LzSzH83y9TeIpsh2B+tZpf5TRkoXH3F 72FVatX3ddYylOF60gLRgg8m0NSX5Zwz+TGVyObLEfOukdxjJQ8H2ocnaQtnsZ/eYG5A eE0dtPJiQ4s+iM5wp+0Mz1kbIfnHCisilpnXxJ8zHHXStAsLyfWCCtgwSlmbsU9tF+60 3iM2YmkPpsrq/ksAGvgRN4/kOhnLunvU2Gbp3Op/8HsSLO9ywj/fqAL3EF1RZ5tcOZOL DLtNndMIo9YY4xGcXf9hmY4ygLs+81SV6xL+vCC/tqvR1nRh7litXoGTnoP+1++YVWM9 Ynjg== X-Gm-Message-State: ACgBeo2H48077HMAWAR3/uLTcg/MyqGVesQkUFlCIv3sYNcWgIpURcZj OSLDMlLquij3wqxtv1ka6XXxyA== X-Google-Smtp-Source: AA6agR5XqD1DgH5CzbRGibOuEptbijWWR2KiixydAL4ajE86MbBbcMzu4s8z3ZvXa6Hfiff4O7EE0Q== X-Received: by 2002:a63:e241:0:b0:41b:b374:caf8 with SMTP id y1-20020a63e241000000b0041bb374caf8mr18946966pgj.310.1661204453849; Mon, 22 Aug 2022 14:40:53 -0700 (PDT) Received: from evgreen-glaptop.lan ([98.45.66.167]) by smtp.gmail.com with ESMTPSA id a10-20020a17090a70ca00b001faf9ab9df7sm5088038pjm.25.2022.08.22.14.40.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Aug 2022 14:40:53 -0700 (PDT) From: Evan Green To: Enric Balletbo i Serra Cc: Rajat Jain , Tzung-Bi Shih , Prashant Malani , Evan Green , Benson Leung , Guenter Roeck , Stephen Boyd , Tinghan Shen , chrome-platform@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH v3] platform/chrome: cros_ec: Expose suspend_timeout_ms in debugfs Date: Mon, 22 Aug 2022 14:40:40 -0700 Message-Id: <20220822144026.v3.1.Idd188ff3f9caddebc17ac357a13005f93333c21f@changeid> X-Mailer: git-send-email 2.31.0 Precedence: bulk X-Mailing-List: chrome-platform@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 In modern Chromebooks, the embedded controller has a mechanism where it will watch a hardware-controlled line that toggles in suspend, and wake the system up if an expected sleep transition didn't occur. This can be very useful for detecting power management issues where the system appears to suspend, but doesn't actually reach its lowest expected power states. Sometimes it's useful in debug and test scenarios to be able to control the duration of that timeout, or even disable the EC timeout mechanism altogether. Add a debugfs control to set the timeout to values other than the EC-defined default, for more convenient debug and development iteration. Signed-off-by: Evan Green Reviewed-by: Prashant Malani Reviewed-by: Stephen Boyd Reviewed-by: Guenter Roeck --- Changes in v3: - s/suspend_timeout/suspend_timeout_ms/ in docs (Prashant) - Same in code (Tzung-Bi) - Added Prashant's review tag (thanks Prashant!) Changes in v2: - Update release version to 6.1 (Tzung-Bi) - Reference EC_HOST_SLEEP_TIMEOUT_INFINITE (Tzung-Bi) - Name the debugfs file suspend_timeout_ms (Prashant) Documentation/ABI/testing/debugfs-cros-ec | 22 +++++++++++++++++++++ drivers/platform/chrome/cros_ec.c | 3 ++- drivers/platform/chrome/cros_ec_debugfs.c | 3 +++ include/linux/platform_data/cros_ec_proto.h | 1 + 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/Documentation/ABI/testing/debugfs-cros-ec b/Documentation/ABI/testing/debugfs-cros-ec index 1fe0add99a2a99..66fe915acd739b 100644 --- a/Documentation/ABI/testing/debugfs-cros-ec +++ b/Documentation/ABI/testing/debugfs-cros-ec @@ -54,3 +54,25 @@ Description: this feature. Output will be in the format: "0x%08x\n". + +What: /sys/kernel/debug//suspend_timeout_ms +Date: August 2022 +KernelVersion: 6.1 +Description: + Some ECs have a feature where they will track transitions to the + a hardware-controlled sleep line, such as Intel's SLP_S0 line, + in order to detect cases where a system failed to go into deep + sleep states. The suspend_timeout_ms file controls the amount of + time in milliseconds the EC will wait before declaring a sleep + timeout event and attempting to wake the system. + + Supply 0 to use the default value coded into EC firmware. Supply + 65535 (EC_HOST_SLEEP_TIMEOUT_INFINITE) to disable the EC sleep + failure detection mechanism. Values in between 0 and 65535 + indicate the number of milliseconds the EC should wait after a + sleep transition before declaring a timeout. This includes both + the duration after a sleep command was received but before the + hardware line changed, as well as the duration between when the + hardware line changed and the kernel sent an EC resume command. + + Output will be in the format: "%u\n". diff --git a/drivers/platform/chrome/cros_ec.c b/drivers/platform/chrome/cros_ec.c index 8aace50d446d65..32140a7150d013 100644 --- a/drivers/platform/chrome/cros_ec.c +++ b/drivers/platform/chrome/cros_ec.c @@ -115,7 +115,7 @@ static int cros_ec_sleep_event(struct cros_ec_device *ec_dev, u8 sleep_event) if (ec_dev->host_sleep_v1) { buf.u.req1.sleep_event = sleep_event; buf.u.req1.suspend_params.sleep_timeout_ms = - EC_HOST_SLEEP_TIMEOUT_DEFAULT; + ec_dev->suspend_timeout_ms; buf.msg.outsize = sizeof(buf.u.req1); if ((sleep_event == HOST_SLEEP_EVENT_S3_RESUME) || @@ -188,6 +188,7 @@ int cros_ec_register(struct cros_ec_device *ec_dev) ec_dev->max_passthru = 0; ec_dev->ec = NULL; ec_dev->pd = NULL; + ec_dev->suspend_timeout_ms = EC_HOST_SLEEP_TIMEOUT_DEFAULT; ec_dev->din = devm_kzalloc(dev, ec_dev->din_size, GFP_KERNEL); if (!ec_dev->din) diff --git a/drivers/platform/chrome/cros_ec_debugfs.c b/drivers/platform/chrome/cros_ec_debugfs.c index 0dbceee87a4b1a..4e63adf083ea1f 100644 --- a/drivers/platform/chrome/cros_ec_debugfs.c +++ b/drivers/platform/chrome/cros_ec_debugfs.c @@ -470,6 +470,9 @@ static int cros_ec_debugfs_probe(struct platform_device *pd) debugfs_create_x32("last_resume_result", 0444, debug_info->dir, &ec->ec_dev->last_resume_result); + debugfs_create_u16("suspend_timeout_ms", 0664, debug_info->dir, + &ec->ec_dev->suspend_timeout_ms); + ec->debug_info = debug_info; dev_set_drvdata(&pd->dev, ec); diff --git a/include/linux/platform_data/cros_ec_proto.h b/include/linux/platform_data/cros_ec_proto.h index 408b29ca4004be..e43107e0bee162 100644 --- a/include/linux/platform_data/cros_ec_proto.h +++ b/include/linux/platform_data/cros_ec_proto.h @@ -169,6 +169,7 @@ struct cros_ec_device { int event_size; u32 host_event_wake_mask; u32 last_resume_result; + u16 suspend_timeout_ms; ktime_t last_event_time; struct notifier_block notifier_ready;