Add the ectool "charge_command_charge_get_regs".

This is to obtain some more Volt/Current/Watts meter readings from around the charger on the mainboard
so we can watch the power flow through the charger and battery and cpu.

Signed-off-by: James Courtier-Dutton <james@superbug.co.uk>

Author: James Courtier-Dutton

common/charge_state.c

@@ -23,6 +23,7 @@
 #include "hooks.h"
 #include "host_command.h"
 #include "i2c.h"
+#include "driver/ina2xx.h"
 #include "math_util.h"
 #include "power.h"
 #include "printf.h"
@@ -2168,6 +2169,34 @@ charge_command_charge_control3(struct host_cmd_handler_args *args)
 DECLARE_HOST_COMMAND(EC_CMD_CHARGE_CONTROL3, charge_command_charge_control3,
 		     EC_VER_MASK(3));
 
+static enum ec_status
+charge_command_charge_get_regs(struct host_cmd_handler_args *args)
+{
+	const struct ec_params_charge_get_regs *p = args->params;
+	struct ec_response_charge_get_regs *r = args->response;
+	int rv;
+	int size = p->size; // This has to be 33
+	CPRINTS("p->size = %d\n", p->size);
+	int chgnum = p->chgnum;
+	CPRINTS("p->chgnum = %d\n", p->chgnum);
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
+	// Its the first variable in the structure, so it should be aligned.
+	uint32_t *regs = r->regs;
+	CPRINTS("regs = %p, r->regs = %p\n", regs, r->regs);
+	#pragma GCC diagnostic pop
+	rv = chg_chips[chgnum].drv->dump_registers_get(chgnum, regs, size);
+	CPRINTS("rv = %d\n", rv);
+	r->size = size;
+	r->pd_mV = ina2xx_get_voltage(0);
+	r->pd_mA = ina2xx_get_current2(0);
+	args->response_size = sizeof(*r);
+	
+	return rv;
+}
+DECLARE_HOST_COMMAND(EC_CMD_CHARGE_GET_REGS, charge_command_charge_get_regs,
+		     EC_VER_MASK(1));
+	
 static enum ec_status
 charge_command_current_limit(struct host_cmd_handler_args *args)
 {

driver/charger/isl9241.c

@@ -1454,6 +1454,99 @@ static void command_isl9241_dump(int chgnum)
 	dump_reg_range(chgnum, 0x90, 0x91);
 	dump_reg_range(chgnum, 0xFE, 0xFF);
 }
+static enum ec_error_list command_isl9241_dump_get(int chgnum, uint32_t *regs, int size) {
+	int index = 0;
+	int reg;
+	int regval;
+	int rv;
+	if (size != 33) {
+		ccprintf("ERROR: Size != 31\n");
+		return EC_ERROR_PARAM2;
+	}
+	if (!regs) {
+		ccprintf("ERROR: Regs = NULL\n");
+		return EC_ERROR_PARAM1;
+	}
+	// 2
+	for (reg = 0x14; reg <= 0x15; reg++) {
+		rv = isl9241_read(chgnum, reg, &regval);
+		if (!rv)
+			ccprintf("0x%04x\n", regval);
+		else
+			ccprintf("ERR (%d)\n", rv);
+		regs[index] = regval;
+		index++;
+	}
+	// 8
+	for (reg = 0x38; reg <= 0x40; reg++) {
+		rv = isl9241_read(chgnum, reg, &regval);
+		if (!rv)
+			ccprintf("0x%04x\n", regval);
+		else
+			ccprintf("ERR (%d)\n", rv);
+		regs[index] = regval;
+		index++;
+	}
+	// 1
+	for (reg = 0x43; reg <= 0x43; reg++) {
+		rv = isl9241_read(chgnum, reg, &regval);
+		if (!rv)
+			ccprintf("0x%04x\n", regval);
+		else
+			ccprintf("ERR (%d)\n", rv);
+		regs[index] = regval;
+		index++;
+	}
+
+	// 8
+	for (reg = 0x47; reg <= 0x4F; reg++) {
+		rv = isl9241_read(chgnum, reg, &regval);
+		if (!rv)
+			ccprintf("0x%04x\n", regval);
+		else
+			ccprintf("ERR (%d)\n", rv);
+		regs[index] = regval;
+		index++;
+	}
+
+	// 8
+	for (reg = 0x80; reg <= 0x87; reg++) {
+		rv = isl9241_read(chgnum, reg, &regval);
+		if (!rv)
+			ccprintf("0x%04x\n", regval);
+		else
+			ccprintf("ERR (%d)\n", rv);
+		regs[index] = regval;
+		index++;
+	}
+
+	// 2
+	for (reg = 0x90; reg <= 0x91; reg++) {
+		rv = isl9241_read(chgnum, reg, &regval);
+		if (!rv)
+			ccprintf("0x%04x\n", regval);
+		else
+			ccprintf("ERR (%d)\n", rv);
+		regs[index] = regval;
+		index++;
+	}
+
+	// 2
+	for (reg = 0xFE; reg <= 0xFF; reg++) {
+		rv = isl9241_read(chgnum, reg, &regval);
+		if (!rv)
+			ccprintf("0x%04x\n", regval);
+		else
+			ccprintf("ERR (%d)\n", rv);
+		regs[index] = regval;
+		index++;
+	}
+	ccprintf("index=%d\n", index);
+	// Total: 2 + 9 + 1 + 9 + 8 + 2 + 2 = 33
+	cflush();
+	return EC_SUCCESS;
+}
+
 #endif /* CONFIG_CMD_CHARGER_DUMP */
 
 const struct charger_drv isl9241_drv = {
@@ -1487,6 +1580,7 @@ const struct charger_drv isl9241_drv = {
 #endif
 #ifdef CONFIG_CMD_CHARGER_DUMP
 	.dump_registers = &command_isl9241_dump,
+	.dump_registers_get = &command_isl9241_dump_get,
 #endif
 #ifdef CONFIG_CHARGER_DUMP_PROCHOT
 	.dump_prochot = &isl9241_dump_prochot_status,

driver/ina2xx.c

@@ -12,6 +12,7 @@
 #include "system.h"
 #include "timer.h"
 #include "util.h"
+#include "board_adc.h"
 
 /* Console output macros */
 #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ##args)
@@ -69,6 +70,21 @@ int ina2xx_get_current(uint8_t idx)
 	return (int)curr;
 }
 
+int ina2xx_get_current2(uint8_t idx)
+{
+	static int shunt_register;
+	int16_t sv = ina2xx_read(0, INA2XX_REG_SHUNT_VOLT);
+	if (board_get_version() >= BOARD_VERSION_7)
+        	shunt_register = 10;
+	else
+		shunt_register = 5;
+	int shunt = INA2XX_SHUNT_UV(sv);
+	int curr = shunt / shunt_register;
+
+	return curr;
+}
+
+
 int ina2xx_get_power(uint8_t idx)
 {
 	uint16_t pow = ina2xx_read(idx, INA2XX_REG_POWER);

driver/ina2xx.h

@@ -120,6 +120,9 @@ int ina2xx_get_voltage(uint8_t idx);
 /* Return current in milliAmps */
 int ina2xx_get_current(uint8_t idx);
 
+/* Return shunt current in milliAmps */
+int ina2xx_get_current2(uint8_t idx);
+
 /* Return power in milliWatts */
 int ina2xx_get_power(uint8_t idx);
 

include/charger.h

@@ -163,6 +163,7 @@ struct charger_drv {
 
 	/* Dumps charger registers */
 	void (*dump_registers)(int chgnum);
+	enum ec_error_list (*dump_registers_get)(int chgnum, uint32_t *reg, int size);
 
 	/* Dumps prochot status information */
 	void (*dump_prochot)(int chgnum);

include/ec_commands.h

@@ -4728,6 +4728,24 @@ struct ec_response_charge_control3 {
 	uint8_t reserved2;
 } __ec_align4;
 
+
+/* Charge get_regs commands */
+
+#define EC_CMD_CHARGE_GET_REGS 0x3e97
+#define EC_VER_CHARGE_GET_REGS 1
+
+struct ec_params_charge_get_regs {
+	int size; /* enum charge_control_mode */
+	int chgnum; /* charger number */
+} __ec_align4;
+
+struct ec_response_charge_get_regs {
+	uint32_t regs[33];
+	int size; /* number of regs returned */
+	int pd_mV;
+	int pd_mA;
+} __ec_align4;
+
 /*****************************************************************************/
 
 /* Snapshot console output buffer for use by EC_CMD_CONSOLE_READ. */