Merge remote-tracking branch 'github-private/marigold' into marigold.rw_support

Author: JohnAZoidberg

.github/workflows/zephyr-build.yml

@@ -26,7 +26,7 @@ jobs:
       matrix:
         platform: [
           # Marigold builder uses same folder for all
-          { name: marigold, folder: marigold1, ver: "1.0.2", sha_len: 7, zephyr_ref: "marigold", cmsis_ref: "cros/chromeos-main" },
+          { name: marigold, folder: marigold1, ver: "2.0.0", sha_len: 7, zephyr_ref: "marigold", cmsis_ref: "cros/chromeos-main" },
           # Lotus and Azalea official releases are NOT coming from this branch
           { name: lotus, folder: marigold1, ver: "0.0.0", sha_len: 7, zephyr_ref: "marigold", cmsis_ref: "cros/chromeos-main" },
           { name: azalea, folder: marigold1, ver: "0.0.0", sha_len: 7, zephyr_ref: "marigold", cmsis_ref: "cros/chromeos-main" },

common/thermal.c

@@ -97,7 +97,7 @@ static void thermal_control(void)
 	int fmax = 0;
 	int temp_fan_configured = 0;
 #else
-	int temp[TEMP_SENSOR_COUNT];
+	int temp[TEMP_SENSOR_COUNT] = {0};
 #endif
 #endif
 
@@ -121,16 +121,16 @@ static void thermal_control(void)
 		/* read one */
 		rv = temp_sensor_read(i, &t);
 
-#if defined(CONFIG_FANS) && defined(CONFIG_CUSTOM_FAN_CONTROL)
-		/* Store all sensors value */
-		temp[i] = K_TO_C(t);
-#endif
-
 		if (rv != EC_SUCCESS)
 			continue;
 		else
 			num_sensors_read++;
 
+#if defined(CONFIG_FANS) && defined(CONFIG_CUSTOM_FAN_CONTROL)
+		/* Store all sensors value */
+		temp[i] = K_TO_C(t);
+#endif
+
 		/* check all the limits */
 		for (j = 0; j < EC_TEMP_THRESH_COUNT; j++) {
 			int limit = thermal_params[i].temp_host[j];

zephyr/program/framework/CMakeLists.txt

@@ -16,6 +16,7 @@ zephyr_library_sources("src/diagnostics.c")
 zephyr_library_sources("src/ucsi.c")
 zephyr_library_sources("src/als.c")
 zephyr_library_sources("src/hid_device.c")
+zephyr_library_sources("src/temperature_filter.c")
 
 zephyr_library_sources_ifdef(CONFIG_PLATFORM_EC_LED_COMMON
 	"src/led_pwm.c")
@@ -53,6 +54,8 @@ if(DEFINED CONFIG_BOARD_LOTUS)
 			"lotus/src/thermal.c"
 			"lotus/src/gpu_configuration.c"
 			"lotus/src/gpu_f75303.c"
+			"src/temperature_filter.c"
+
 
 
 	)
@@ -92,6 +95,7 @@ if(DEFINED CONFIG_BOARD_MARIGOLD)
 			"marigold/src/project_diagnostics.c"
 			"marigold/src/power_button_x86.c"
 			"marigold/src/temperature.c"
+			"marigold/src/thermal.c"
 	)
 
 endif()

zephyr/program/framework/Kconfig

@@ -35,6 +35,13 @@ config CHIPSET_AMD
 	  Framework project which uses the AMD chipset.
 	  Enable the AMD feature.
 
+config PD_USB_PID
+	hex "PD Controller's USB PID"
+	default 0x0001
+	help
+		The USB Product ID (PID) of the PD controller
+		Default is the one we used on 11th Gen and forgot to update on every project since.
+
 config PD_CHIP_CCG8
 	bool "Select CCG8 PD chip"
 	default n
@@ -81,6 +88,14 @@ config PD_CCG6_SOC_UART_DEBUG_PORT
 		EC needs to switch the external mux to turn on the path for SoC
 		uart.
 
+config PD_CCG6_WAIT_STABLE_TIMER
+	int "The timer to wait X ms to setup the PD chip"
+	default 0
+	depends on PD_CHIP_CCG6
+	help
+	    EC should wait X ms the PD chip run in stable mode then start to
+		communicate.
+
 config PD_COMMON_VBUS_CONTROL
 	bool "Enable CCG common vbus control"
 	help

zephyr/program/framework/azalea/led_pins.dtsi

@@ -80,6 +80,7 @@
 
 			color_power_white: color-power-white {
 				led-color = "LED_WHITE";
+				/* maximum duty */
 				led-values = <55>;
 			};
 		};

zephyr/program/framework/azalea/led_policy.dtsi

@@ -101,8 +101,31 @@
 
 			power_led {
 				led-id = "EC_LED_ID_POWER_LED";
+				transition = "LED_TRANSITION_LINEAR";
+
+				/* period-ms =
+				 *	target time * tick time (200ms) / deferred time (10ms)
+				 */
+
+				/* Fade time target 600ms (In, low to high) */
 				color-0 {
+					led-color = "LED_WHITE";
+					period-ms = <12000>;
+				};
+				/* Duration time target 900ms */
+				color-1 {
+					led-color = "LED_WHITE";
+					period-ms = <18000>;
+				};
+				/* Fade time target 600ms (Out, high to low) */
+				color-2 {
+					led-color = "LED_OFF";
+					period-ms = <12000>;
+				};
+				/* Interval time target 1900ms */
+				color-3 {
 					led-color = "LED_OFF";
+					period-ms = <37000>;
 				};
 			};
 		};

zephyr/program/framework/azalea/src/power_sequence.c

@@ -428,7 +428,7 @@ enum power_state power_handle_state(enum power_state state)
 		/* wait VR power good */
 		if (power_wait_signals(IN_VR_PGOOD)) {
 			/* something wrong, turn off power and force to g3 */
-			set_diagnostic(DIAGNOSTICS_VCCIN_AUX_VR, 1);
+			set_diagnostic(DIAGNOSTICS_HW_PGOOD_VR, 1);
 			chipset_force_g3();
 			return POWER_G3;
 		}

zephyr/program/framework/include/cypress_pd_common.h

@@ -49,9 +49,15 @@
 #define CCG_CUST_C_CTRL_CONTROL_REG	0x003B
 #define CCG_HPI_VERSION			0x003C
 /*User registers from 0x40 to 0x48 are used for BB retimer */
+#ifdef CONFIG_PD_CHIP_CCG8
 #define CCG_DPM_CMD_REG			0x0040
 #define CCG_MUX_CFG_REG			0x0041
 #define CCG_DEINIT_PORT_REG		0x0042
+#elif defined(CONFIG_PD_CHIP_CCG6)
+#define CCG_DPM_CMD_REG			0x004C
+#define CCG_MUX_CFG_REG			0x004D
+#define CCG_DEINIT_PORT_REG		0x004E
+#endif
 #define CCG_ICL_STS_REG			0x0042
 #define CCG_ICL_BB_RETIMER_CMD_REG	0x0046
 #define CCG_ICL_BB_RETIMER_DAT_REG	0x0048
@@ -426,6 +432,7 @@ enum ccg_response {
 
 enum ccg_pd_state {
 	CCG_STATE_ERROR,
+	CCG_STATE_WAIT_STABLE,
 	CCG_STATE_POWER_ON,
 	CCG_STATE_APP_SETUP,
 	CCG_STATE_READY,
@@ -765,6 +772,13 @@ int cypd_vbus_state_check(void);
  */
 int cypd_get_ac_power(void);
 
+/**
+ * Return active port voltage, return by mV.
+ *
+ * @return int
+ */
+int cypd_get_active_port_voltage(void);
+
 /**
  * Set Pdo profile for safety action
  *

zephyr/program/framework/include/intel_cpu_power_interface.h

@@ -6,8 +6,6 @@
 #ifndef __CROS_EC_INTEL_CPU_POWER_INTERFACE_H
 #define __CROS_EC_INTEL_CPU_POWER_INTERFACE_H
 
-#define POWER_LIMIT_1_W	30
-
 /******************** Tau Value (TimeWindow)*************************************
  * 0.5sec: 0x1; 0.6sec : 0x52, 0.7sec: 0x92; 0.8sec : 0xD2
  * 1sec: 0x14;  1.25sec: 0x54; 1.5sec: 0x94; 1.75sec: 0xD4
@@ -19,6 +17,7 @@
  *******************************************************************************/
 #define TIME_WINDOW_PL1		0xDC
 #define TIME_WINDOW_PL2		0xDC
+#define TIME_WINDOW_PSYSPL2		0xDC
 
 /******************** PL3 TimeWindow *******************************************
  * 1ms: 0x00;  1.25ms: 0x40;  1.5ms: 0xC0;  1.75ms: 0x80
@@ -64,9 +63,10 @@
 
 extern int pl1_watt;
 extern int pl2_watt;
-extern int pl4_watt;
 extern int pl3_watt;
+extern int pl4_watt;
+extern int psyspl2_watt;
 
-int set_pl_limits(int pl1, int pl2, int pl4);
+int set_pl_limits(int pl1, int pl2, int pl4, int psyspl2);
 
 #endif

zephyr/program/framework/include/led.h

@@ -29,12 +29,6 @@
 #define FP_LED_MEDIUM 40
 #define FP_LED_LOW 15
 
-#define BREATH_ON_LENGTH_HIGH	62
-#define BREATH_ON_LENGTH_MID	72
-#define BREATH_ON_LENGTH_LOW	90
-
-#define BREATH_OFF_LENGTH 200
-
 enum led_color {
 	LED_OFF,
 	LED_RED,
@@ -172,7 +166,7 @@ void led_set_color_with_pattern(const struct led_pattern_node_t *led);
  */
 void board_led_apply_color(void);
 
-void pwm_set_breath_dt(int percent);
+void update_pwr_led_level(void);
 
 #ifdef TEST_BUILD
 const struct led_pins_node_t *led_get_node(enum led_color color,