adc: Add ectool command for reading ADC channels.

BUG=b:76155036, b:112757066
BRANCH=None
TEST=Flash nocturne; update ectool; verify that `ectool adcread <ch>`
works as expected.

Change-Id: I42545d25f005a7eb9e0af54c8b5cb72d5d844084
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1180095
Commit-Ready: Aseda Aboagye <aaboagye@chromium.org>
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Edward Hill <ecgh@chromium.org>

3 files changed, 65 insertions, 1 deletions

diff --git a/common/adc.c b/common/adc.c
index 6375291a85..bbee4ce207 100644
--- a/common/adc.c
+++ b/common/adc.c
@@ -9,6 +9,8 @@
 #include "adc_chip.h"
 #include "common.h"
 #include "console.h"
+#include "ec_commands.h"
+#include "host_command.h"
 #include "util.h"
 
 /* 'adc' console command is not supported in continuous mode */
@@ -63,4 +65,24 @@ static int command_adc(int argc, char **argv)
 DECLARE_CONSOLE_COMMAND(adc, command_adc,
 			"[name]",
 			"Print ADC channel(s)");
-#endif
+
+static int hc_adc_read(struct host_cmd_handler_args *args)
+{
+	const struct ec_params_adc_read *params = args->params;
+	struct ec_response_adc_read *resp = args->response;
+	enum adc_channel ch = (enum adc_channel)params->adc_channel;
+	int32_t adc_value;
+
+	if (ch >= ADC_CH_COUNT)
+		return EC_RES_INVALID_PARAM;
+
+	adc_value = adc_read_channel(ch);
+	if (adc_value == ADC_READ_ERROR)
+		return EC_RES_ERROR;
+
+	resp->adc_value = adc_value;
+	args->response_size = sizeof(*resp);
+	return EC_RES_SUCCESS;
+}
+DECLARE_HOST_COMMAND(EC_CMD_ADC_READ, hc_adc_read, EC_VER_MASK(0));
+#endif /* CONFIG_ADC_PROFILE_FAST_CONTINUOUS */
diff --git a/include/ec_commands.h b/include/ec_commands.h
index a0289970c7..30b02024d7 100644
--- a/include/ec_commands.h
+++ b/include/ec_commands.h
@@ -4872,6 +4872,20 @@ struct __ec_align1 ec_params_rollback_add_entropy {
 	uint8_t action;
 };
 
+/*
+ * Perform a single read of a given ADC channel.
+ */
+#define EC_CMD_ADC_READ		0x0123
+
+struct __ec_align1 ec_params_adc_read {
+	uint8_t adc_channel;
+};
+
+struct __ec_align4 ec_response_adc_read {
+	int32_t adc_value;
+};
+
+
 /*****************************************************************************/
 /* The command range 0x200-0x2FF is reserved for Rotor. */
 
diff --git a/util/ectool.c b/util/ectool.c
index 929d5a4c65..e6332373c3 100644
--- a/util/ectool.c
+++ b/util/ectool.c
@@ -54,6 +54,8 @@ static struct option long_opts[] = {
 
 const char help_str[] =
 	"Commands:\n"
+	"  adcread <channel>\n"
+	"      Read an ADC channel.\n"
 	"  addentropy [reset]\n"
 	"      Add entropy to device secret\n"
 	"  autofanctrl <on>\n"
@@ -384,6 +386,31 @@ static int read_mapped_string(uint8_t offset, char *buffer, int max_size)
 	return ret;
 }
 
+int cmd_adc_read(int argc, char *argv[])
+{
+	char *e;
+	struct ec_params_adc_read p;
+	struct ec_response_adc_read r;
+	int rv;
+
+	if (argc < 2) {
+		fprintf(stderr, "Usage: %s <adc channel>\n", argv[0]);
+		return -1;
+	}
+
+	p.adc_channel = (uint8_t)strtoul(argv[1], &e, 0);
+	if (e && *e) {
+		fprintf(stderr, "\"%s\": invalid channel!\n", argv[1]);
+		return -1;
+	}
+
+	rv = ec_command(EC_CMD_ADC_READ, 0, &p, sizeof(p), &r, sizeof(r));
+	if (rv > 0)
+		printf("%s: %d\n", argv[1], r.adc_value);
+
+	return rv;
+}
+
 int cmd_add_entropy(int argc, char *argv[])
 {
 	struct ec_params_rollback_add_entropy p;
@@ -8229,6 +8256,7 @@ int cmd_cec(int argc, char *argv[])
 
 /* NULL-terminated list of commands */
 const struct command commands[] = {
+	{"adcread", cmd_adc_read},
 	{"addentropy", cmd_add_entropy},
 	{"autofanctrl", cmd_thermal_auto_fan_ctrl},
 	{"backlight", cmd_lcd_backlight},