Reintroduce cpupower to set PL1, PL2 and PL4 manually, or restore default values

Update maximum fan speed

Author: Noahdecoco74

baseboard/fwk/fan.c

@@ -104,9 +104,9 @@ int fan_rpm_to_percent(int fan, int rpm)
 		 * if we want a performance mode we can tweak this
 		 * to get a few more % of fan speed to unlock additional
 		 * cooling TODO FRAMEWORK */
-		// FAN_HARDARE_MAX = 7100
-		// Tested max : 7900 RPM on flat surface, 8800 RPM when intake blocked
-		pct = (rpm - min) / ((FAN_HARDARE_MAX - min) / 100);
+		// original FAN_HARDARE_MAX = 7100
+		// Tested max : 7400 RPM on flat surface, 8500 RPM when intake blocked
+		pct = (rpm - min) / ((max - min) / 100);
 		/*CPRINTS(" Fan max min : %d , %d", max, min);*/
 	}
 	/*CPRINTS(" Fan PCT = %d ", pct);*/
@@ -185,7 +185,7 @@ void fan_set_rpm_target(int ch, int rpm)
 	rpm_setting[ch] = rpm;
 	if (chipset_in_state(CHIPSET_STATE_ON) && rpm == 0 &&
 		!timestamp_expired(fan_spindown_time, NULL)) {
-		rpm = 1200;
+		rpm = fans[0].rpm->rpm_min;
 	}
 
 	pct = fan_rpm_to_percent(ch, rpm);

board/hx20/board.c

@@ -973,9 +973,9 @@ const struct fan_conf fan_conf_0 = {
 
 /* Default */
 const struct fan_rpm fan_rpm_0 = {
-	.rpm_min = 1800,
-	.rpm_start = 1800,
-	.rpm_max = 6800, /* Todo: Derate by -7% so all units have same performance */
+	.rpm_min = 1200,
+	.rpm_start = 1200,
+	.rpm_max = 7400,
 };
 
 const struct fan_t fans[FAN_CH_COUNT] = {

board/hx20/board.h

@@ -394,7 +394,7 @@
 #define CONFIG_FANS 1
 #undef CONFIG_FAN_INIT_SPEED
 #define CONFIG_FAN_INIT_SPEED 15
-#define FAN_HARDARE_MAX 7100
+#define FAN_HARDARE_MAX 7400
 #define CONFIG_TEMP_SENSOR
 #define CONFIG_DPTF
 #define CONFIG_TEMP_SENSOR_F75303

board/hx20/cpu_power.c

@@ -21,11 +21,23 @@
 #define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args)
 #define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args)
 
-#define POWER_LIMIT_1_W	50
-
-static int pl1_watt;
-static int pl2_watt;
-static int pl4_watt;
+// Loaded on EC reset
+#define POWER_LIMIT_1_W_DEFAULT	40
+#define POWER_LIMIT_2_W_DEFAULT	64
+#define POWER_LIMIT_4_W_DEFAULT	121
+
+// Loaded by ectool command "cpupower default"
+#define POWER_LIMIT_1_W_USER_DEFAULT	28
+#define POWER_LIMIT_2_W_USER_DEFAULT	64
+#define POWER_LIMIT_4_W_USER_DEFAULT	121
+
+static int POWER_LIMIT_1_W = POWER_LIMIT_1_W_DEFAULT;
+static int POWER_LIMIT_2_W = POWER_LIMIT_2_W_DEFAULT;
+static int POWER_LIMIT_4_W = POWER_LIMIT_4_W_DEFAULT;
+
+static int pl1_watt = POWER_LIMIT_1_W_DEFAULT;
+static int pl2_watt = POWER_LIMIT_2_W_DEFAULT;
+static int pl4_watt = POWER_LIMIT_4_W_DEFAULT;
 static int psys_watt;
 bool manual_ctl;
 
@@ -47,6 +59,7 @@ void update_soc_power_limit(bool force_update, bool force_no_adapter)
 	int pps_power_budget;
 	int battery_percent;
 
+	static int old_pl1_watt = -1;
 	static int old_pl2_watt = -1;
 	static int old_pl4_watt = -1;
 	static int old_psys_watt = -1;
@@ -72,23 +85,23 @@ void update_soc_power_limit(bool force_update, bool force_no_adapter)
 		psys_watt = ((active_power * 95) / 100) - pps_power_budget;
 	} else {
 		/* ADP > 55W and Battery percentage >= 30% */
-		pl2_watt = 64;
-		pl4_watt = 121;
+		pl1_watt = POWER_LIMIT_1_W;
+		pl2_watt = POWER_LIMIT_2_W;
+		pl4_watt = POWER_LIMIT_4_W;
 		/* psys watt = adp watt * 0.95 + battery watt(55 W) * 0.7 - pps power budget */
 		psys_watt = ((active_power * 95) / 100) + 39 - pps_power_budget;
 	}
 	if (pl2_watt != old_pl2_watt || pl4_watt != old_pl4_watt ||
-			psys_watt != old_psys_watt || force_update) {
+			psys_watt != old_psys_watt || force_update || 
+			pl1_watt != old_pl1_watt) {
+		old_pl1_watt = pl1_watt;
 		old_psys_watt = psys_watt;
 		old_pl4_watt = pl4_watt;
 		old_pl2_watt = pl2_watt;
 
-		pl1_watt = POWER_LIMIT_1_W;
-		if (manual_ctl == false) {
-			CPRINTS("Updating SOC Power Limits: PL2 %d, PL4 %d, Psys %d, Adapter %d",
-				pl2_watt, pl4_watt, psys_watt, active_power);
-			set_pl_limits(pl1_watt, pl2_watt, pl4_watt, psys_watt);
-		}
+		CPRINTS("Updating SOC Power Limits: PL1 %d, PL2 %d, PL4 %d, Psys %d, Adapter %d",
+			pl1_watt, pl2_watt, pl4_watt, psys_watt, active_power);
+		set_pl_limits(pl1_watt, pl2_watt, pl4_watt, psys_watt);
 	}
 }
 
@@ -179,3 +192,41 @@ static int cmd_fan_mode(int argc, char **argv)
 DECLARE_CONSOLE_COMMAND(fanmode, cmd_fan_mode,
 			"[silent|normal|extreme]",
 			"Set/Get fan mode");
+
+/* Host command handler for CPU power limits */
+static enum ec_status host_command_cpu_power(struct host_cmd_handler_args *args)
+{
+	const struct ec_params_cpu_power *p = args->params;
+	struct ec_response_cpu_power *r = args->response;
+
+	/* If parameters provided, set the values */
+	if (args->params_size > 0 && p) {
+		/*
+		 * "default" from ectool is encoded as an all-zero payload.
+		 */
+		if (p->pl1_mW == 0 && p->pl2_mW == 0 && p->pl4_mW == 0) {
+			POWER_LIMIT_1_W = POWER_LIMIT_1_W_USER_DEFAULT;
+			POWER_LIMIT_2_W = POWER_LIMIT_2_W_USER_DEFAULT;
+			POWER_LIMIT_4_W = POWER_LIMIT_4_W_USER_DEFAULT;
+		} else {
+			if (p->pl1_mW != 0)
+				POWER_LIMIT_1_W = p->pl1_mW / 1000;
+			if (p->pl2_mW != 0)
+				POWER_LIMIT_2_W = p->pl2_mW / 1000;
+			if (p->pl4_mW != 0)
+				POWER_LIMIT_4_W = p->pl4_mW / 1000;
+		}
+		update_soc_power_limit(true, false);
+	}
+
+	/* Return current power limits in mW */
+	r->pl1_mW = pl1_watt * 1000;
+	r->pl2_mW = pl2_watt * 1000;
+	r->pl4_mW = pl4_watt * 1000;
+	r->psys_mW = psys_watt * 1000;
+
+	args->response_size = sizeof(*r);
+	return EC_RES_SUCCESS;
+}
+
+DECLARE_HOST_COMMAND(EC_CMD_CPU_POWER, host_command_cpu_power, EC_VER_MASK(0));

board/hx30/board.h

@@ -411,7 +411,7 @@
 /*#define CONFIG_FAN_RPM_CUSTOM*/
 #undef CONFIG_FAN_INIT_SPEED
 #define CONFIG_FAN_INIT_SPEED 15
-#define FAN_HARDARE_MAX 7900
+#define FAN_HARDARE_MAX 7100
 #define CONFIG_TEMP_SENSOR
 #define CONFIG_DPTF
 #define CONFIG_TEMP_SENSOR_F75303

include/ec_commands.h

@@ -6982,6 +6982,27 @@ struct ec_response_fan_mode {
 	uint8_t mode;  /* Current fan mode */
 } __ec_align1;
 
+/*****************************************************************************/
+/*
+ * CPU Power command
+ * Get/set CPU power limits
+ */
+#define EC_CMD_CPU_POWER 0x03D6
+
+struct ec_params_cpu_power {
+	uint32_t pl1_mW;  /* PL1 power in milliwatts (0 = query only) */
+	uint32_t pl2_mW;  /* PL2 power in milliwatts (0 = query only) */
+	uint32_t pl4_mW;  /* PL4 power in milliwatts (0 = query only) */
+} __ec_align4;
+
+struct ec_response_cpu_power {
+	uint32_t pl1_mW;	/* Current PL1 in mW */
+	uint32_t pl2_mW;	/* Current PL2 in mW */
+	uint32_t pl4_mW;	/* Current PL4 in mW */
+	uint32_t psys_mW;	/* Current Psys in mW */
+} __ec_align4;
+
+
 /****************************************************************************/
 /*
  * Reserve a range of host commands for board-specific, experimental, or

util/ectool.c

@@ -94,7 +94,7 @@ const char help_str[] =
 	"  chargestate\n"
 	"      Handle commands related to charge state v2 (and later)\n"
 	"  cpupower\n"
-	"      Get CPU power limits (PL1, PL2, PL4, Psys)\n"
+	"      Get or set CPU power limits (PL1, PL2, PL4, default)\n"
 	"  chipinfo\n"
 	"      Prints chip info\n"
 	"  cmdversions <cmd>\n"
@@ -129,6 +129,8 @@ const char help_str[] =
 	"      Set the maximum external power limit\n"
 	"  fanduty <percent>\n"
 	"      Forces the fan PWM to a constant duty cycle\n"
+	"  fanmode [mode]\n"
+	"      Prints or sets fan curve profile\n"
 	"  flasherase <offset> <size>\n"
 	"      Erases EC flash\n"
 	"  flasheraseasync <offset> <size>\n"
@@ -600,6 +602,36 @@ static int cmd_fan_mode(int argc, char *argv[])
 	return 0;
 }
 
+static int cmd_cpu_power(int argc, char *argv[])
+{
+	struct ec_params_cpu_power p = {};
+	struct ec_response_cpu_power r;
+	int rv;
+
+	/* A default reset is encoded as an all-zero payload. */
+	if (argc == 2 && !strcasecmp(argv[1], "default")) {
+		rv = ec_command(EC_CMD_CPU_POWER, 0, &p, sizeof(p), &r, sizeof(r));
+	} else if (argc >= 4) {
+		p.pl1_mW = strtol(argv[1], NULL, 0) * 1000;
+		p.pl2_mW = strtol(argv[2], NULL, 0) * 1000;
+		p.pl4_mW = strtol(argv[3], NULL, 0) * 1000;
+		rv = ec_command(EC_CMD_CPU_POWER, 0, &p, sizeof(p), &r, sizeof(r));
+	} else {
+		/* Query only */
+		rv = ec_command(EC_CMD_CPU_POWER, 0, NULL, 0, &r, sizeof(r));
+	}
+
+	if (rv < 0)
+		return rv;
+
+	printf("CPU Power Limits:\n");
+	printf("  PL1: %u W\n", r.pl1_mW / 1000);
+	printf("  PL2: %u W\n", r.pl2_mW / 1000);
+	printf("  PL4: %u W\n", r.pl4_mW / 1000);
+	printf("  Psys: %u W\n", r.psys_mW / 1000);
+	return 0;
+}
+
 static void cmd_hostevent_help(char *cmd)
 {
 	fprintf(stderr,
@@ -10163,6 +10195,7 @@ const struct command commands[] = {
 	{"chipinfo", cmd_chipinfo},
 	{"cmdversions", cmd_cmdversions},
 	{"console", cmd_console},
+	{"cpupower", cmd_cpu_power},
 	{"cec", cmd_cec},
 	{"echash", cmd_ec_hash},
 	{"eventclear", cmd_host_event_clear},