Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp3022191ybi; Mon, 17 Jun 2019 14:54:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqxHTi0NX6adFXzkoniW6iJzynlo+lqYDT43yIfiwrrg4mS8Tx2m16oroaI8M8970VUvjFuE X-Received: by 2002:a17:90a:206a:: with SMTP id n97mr1333872pjc.10.1560808466942; Mon, 17 Jun 2019 14:54:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560808466; cv=none; d=google.com; s=arc-20160816; b=ekxKhYd3UGnzIGgTmpeNeeN+rRlPzjJJo7cBel8DSdTioemK4scxm+uyewk+bOtuA2 SkE4/FGtZCqw0FzFFBWfSFXBkgp5aCri1oldZba7UNu5e2kHqQ2wuJXzrXi4WHi5tcIj IOlZi5qJ/6j6z2l00FvSCBXj39FwNTwY1h9EdtCgteh/CVYBTQHysKm0MTJj7vlVnu/3 H36GLCyk2+6aZ3V1NhOdQ1mj83zS5IMmVVuarfz/ld4+BBzWP5AcBTYwo6RL7OLlH2wC nlRHCNCRRg/duJ7BInbDw2uPsRlYIk8npVkiGsgkXbx5MdA00FL9NojQfQXBB8/75cV0 ijAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=1xcZsDnFJerp/M5+7w3KuITigLfvTiYHjxaMnqovFnc=; b=gakR+hPlXZ3YJBgcvDFrvxJTYnxj96wtc44NjYec/GThlCr+S2l4iBTEUO/Qq2MO53 +qlBrL9jUY4UITVLnBtj8f393VpBwHiweCpM1AFlkNYNy+YkwDLB4XjAgLzYU+hLsvWO 6cxCR75O9eq49BAz25RATssIjk51JT09HeKmmHRCbqbtb8iEoEqjlwaZkIZHR1z1z6dZ PY9iy5Qm99K2TdMR8gEY1XAT2ugHyHqPWC2b4InGBNtWmM0s/BGUgKmNTyGBnfqPkuBY pGNbeeUEgT3bjmx2Qwuc8tgC6GsQ6eSHApwqdvYrfJvcPCie2WfR2J5F27Ez1q87I6g8 Js7A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=gqp+ypfD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c21si1966911pls.414.2019.06.17.14.54.11; Mon, 17 Jun 2019 14:54:26 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=gqp+ypfD; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727516AbfFQVwu (ORCPT + 99 others); Mon, 17 Jun 2019 17:52:50 -0400 Received: from mail-pg1-f179.google.com ([209.85.215.179]:33296 "EHLO mail-pg1-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726001AbfFQVwu (ORCPT ); Mon, 17 Jun 2019 17:52:50 -0400 Received: by mail-pg1-f179.google.com with SMTP id k187so6511565pga.0 for ; Mon, 17 Jun 2019 14:52:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1xcZsDnFJerp/M5+7w3KuITigLfvTiYHjxaMnqovFnc=; b=gqp+ypfDJvASzGRx5oJFX+iqTEx4//7RUpoeMF0vxhp+6NNfjnCgSFycqewM34vSxS XQPL6g0t5fW+I2axHfyL9SI4l9hvJ1vE6/kSzZ+lI1EuKOsNTra0hHPXcHwjHuH9QTdN pPBaSINBP2SeFiESwIhr3905usYVGNhS+9KmA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=1xcZsDnFJerp/M5+7w3KuITigLfvTiYHjxaMnqovFnc=; b=Co1mN1qn45MhKxDfpKVDciNAlp4dFqcIRGPfuWA7CNJkKyEGCPu5qeXp8WH19nek+j /N7uNIz+ed4jOpsUyHGQjTJSt5ciC49P2OMqq8mXlbiGj+qBhydHI9PqZogFQUue2k9b pYYUopei83rWCtm+6Mo+h0Nplr0Vw2yJLNRRxINvU2E2M5pPiO8tbd/LHk2hzCvMJcgm Wf7ZRpFU89Bob1ntyyloZifrHCJ9jar5WAghcQPTtbid3et88zFxgQxlf0qib69HPD1F 6PVTgt9/agf2HcwKJiUjrvftNL7YNLmk4p28rYCl+oO1Zs8ANEYgoNtyQzH8DefyoYla n/Hg== X-Gm-Message-State: APjAAAUCrQ46OcMiXa/DvclJymeOargivbj1twx4opjdu9NaInfRT7cy FMuQe1sI+EsjKjmIZli2Bcod+A== X-Received: by 2002:a17:90a:be0d:: with SMTP id a13mr1244815pjs.84.1560808369562; Mon, 17 Jun 2019 14:52:49 -0700 (PDT) Received: from evgreen2.mtv.corp.google.com ([2620:15c:202:201:ffda:7716:9afc:1301]) by smtp.gmail.com with ESMTPSA id f17sm13319629pgv.16.2019.06.17.14.52.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 17 Jun 2019 14:52:49 -0700 (PDT) From: Evan Green To: Enric Balletbo i Serra , Lee Jones Cc: Ravi Chandra Sadineni , Rajat Jain , Evan Green , Guenter Roeck , linux-kernel@vger.kernel.org, Benson Leung , Tim Wawrzynczak Subject: [PATCH v2] platform/chrome: Expose resume result via debugfs Date: Mon, 17 Jun 2019 14:52:34 -0700 Message-Id: <20190617215234.260982-1-evgreen@chromium.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For ECs that support it, the EC returns the number of slp_s0 transitions and whether or not there was a timeout in the resume response. Expose the last resume result to usermode via debugfs so that usermode can detect and report S0ix timeouts. Signed-off-by: Evan Green --- Changes in v2: - Moved from sysfs to debugfs (Enric) - Added documentation (Enric) --- Documentation/ABI/testing/debugfs-cros-ec | 22 ++++++++++++++++++++++ drivers/mfd/cros_ec.c | 6 +++++- drivers/platform/chrome/cros_ec_debugfs.c | 7 +++++++ include/linux/mfd/cros_ec.h | 1 + 4 files changed, 35 insertions(+), 1 deletion(-) diff --git a/Documentation/ABI/testing/debugfs-cros-ec b/Documentation/ABI/testing/debugfs-cros-ec index 573a82d23c89..008b31422079 100644 --- a/Documentation/ABI/testing/debugfs-cros-ec +++ b/Documentation/ABI/testing/debugfs-cros-ec @@ -32,3 +32,25 @@ Description: is used for synchronizing the AP host time with the EC log. An error is returned if the command is not supported by the EC or there is a communication problem. + +What: /sys/kernel/debug/cros_ec/last_resume_result +Date: June 2019 +KernelVersion: 5.3 +Description: + Some ECs have a feature where they will track transitions to + the (Intel) processor's SLP_S0 line, in order to detect cases + where a system failed to go into S0ix. When the system resumes, + an EC with this feature will return a summary of SLP_S0 + transitions that occurred. The last_resume_result file returns + the most recent response from the AP's resume message to the EC. + + The bottom 31 bits contain a count of the number of SLP_S0 + transitions that occurred since the suspend message was + received. Bit 31 is set if the EC attempted to wake the + system due to a timeout when watching for SLP_S0 transitions. + Callers can use this to detect a wake from the EC due to + S0ix timeouts. The result will be zero if no suspend + transitions have been attempted, or the EC does not support + this feature. + + Output will be in the format: "0x%08x\n". diff --git a/drivers/mfd/cros_ec.c b/drivers/mfd/cros_ec.c index 5d5c41ac3845..2a9ac5213893 100644 --- a/drivers/mfd/cros_ec.c +++ b/drivers/mfd/cros_ec.c @@ -102,12 +102,16 @@ static int cros_ec_sleep_event(struct cros_ec_device *ec_dev, u8 sleep_event) /* For now, report failure to transition to S0ix with a warning. */ if (ret >= 0 && ec_dev->host_sleep_v1 && - (sleep_event == HOST_SLEEP_EVENT_S0IX_RESUME)) + (sleep_event == HOST_SLEEP_EVENT_S0IX_RESUME)) { + ec_dev->last_resume_result = + buf.u.resp1.resume_response.sleep_transitions; + WARN_ONCE(buf.u.resp1.resume_response.sleep_transitions & EC_HOST_RESUME_SLEEP_TIMEOUT, "EC detected sleep transition timeout. Total slp_s0 transitions: %d", buf.u.resp1.resume_response.sleep_transitions & EC_HOST_RESUME_SLEEP_TRANSITIONS_MASK); + } return ret; } diff --git a/drivers/platform/chrome/cros_ec_debugfs.c b/drivers/platform/chrome/cros_ec_debugfs.c index cd3fb9c22a44..663bebf699bf 100644 --- a/drivers/platform/chrome/cros_ec_debugfs.c +++ b/drivers/platform/chrome/cros_ec_debugfs.c @@ -447,6 +447,13 @@ static int cros_ec_debugfs_probe(struct platform_device *pd) debugfs_create_file("uptime", 0444, debug_info->dir, debug_info, &cros_ec_uptime_fops); + if (!strcmp(ec->class_dev.kobj.name, CROS_EC_DEV_NAME)) { + debugfs_create_x32("last_resume_result", + 0444, + debug_info->dir, + &ec->ec_dev->last_resume_result); + } + ec->debug_info = debug_info; dev_set_drvdata(&pd->dev, ec); diff --git a/include/linux/mfd/cros_ec.h b/include/linux/mfd/cros_ec.h index 5ddca44be06d..45aba26db964 100644 --- a/include/linux/mfd/cros_ec.h +++ b/include/linux/mfd/cros_ec.h @@ -155,6 +155,7 @@ struct cros_ec_device { struct ec_response_get_next_event_v1 event_data; int event_size; u32 host_event_wake_mask; + u32 last_resume_result; }; /** -- 2.20.1