Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Gwendal Grignou <gwendal@chromium.org>
To:     groeck@chromium.org, bleung@chromium.org,
        enric.balletbo@collabora.com, twawrzynczak@chromium.org
Cc:     linux-kernel@vger.kernel.org,
        Gwendal Grignou <gwendal@chromium.org>
Subject: [PATCH] platform: cros_ec_debugfs: control uptime information request
Date:   Wed, 20 May 2020 22:28:32 -0700
Message-Id: <20200521052832.66620-1-gwendal@chromium.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

When EC does not support uptime command (EC_CMD_GET_UPTIME_INFO),
return -EPROTO to read of /sys/kernel/debug/cros_ec/uptime without
calling the EC after the first try.

The EC console log will not contain EC_CMD_GET_UPTIME_INFO anymore.

Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
---
 drivers/platform/chrome/cros_ec_debugfs.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/platform/chrome/cros_ec_debugfs.c b/drivers/platform/chrome/cros_ec_debugfs.c
index 6ae484989d1f5..70a29afb6d9e7 100644
--- a/drivers/platform/chrome/cros_ec_debugfs.c
+++ b/drivers/platform/chrome/cros_ec_debugfs.c
@@ -49,6 +49,8 @@ struct cros_ec_debugfs {
 	struct delayed_work log_poll_work;
 	/* EC panicinfo */
 	struct debugfs_blob_wrapper panicinfo_blob;
+	/* EC uptime */
+	bool uptime_supported;
 };
 
 /*
@@ -256,12 +258,19 @@ static ssize_t cros_ec_uptime_read(struct file *file, char __user *user_buf,
 	char read_buf[32];
 	int ret;
 
+	if (!debug_info->uptime_supported)
+		return -EPROTO;
+
 	resp = (struct ec_response_uptime_info *)&msg.resp;
 
 	msg.cmd.command = EC_CMD_GET_UPTIME_INFO;
 	msg.cmd.insize = sizeof(*resp);
 
 	ret = cros_ec_cmd_xfer_status(ec_dev, &msg.cmd);
+	if (ret == -EPROTO && msg.cmd.result == EC_RES_INVALID_COMMAND) {
+		debug_info->uptime_supported = false;
+		return ret;
+	}
 	if (ret < 0)
 		return ret;
 
@@ -434,6 +443,9 @@ static int cros_ec_debugfs_probe(struct platform_device *pd)
 	debug_info->ec = ec;
 	debug_info->dir = debugfs_create_dir(name, NULL);
 
+	/* Give uptime a chance to run. */
+	debug_info->uptime_supported = true;
+
 	ret = cros_ec_create_panicinfo(debug_info);
 	if (ret)
 		goto remove_debugfs;
-- 
2.26.2.761.g0e0b3e54be-goog