Merge pull request #709 from FrameworkComputer/fwk.led_control_ersx5

Follow the ERS to modify the LED behavior

Author: kiram9

util/config_allowed.txt

@@ -373,7 +373,6 @@ CONFIG_FAKE_SHMEM
 CONFIG_FANS
 CONFIG_FAN_DSLEEP
 CONFIG_FAN_DYNAMIC
-CONFIG_FAN_INIT_SPEED
 CONFIG_FAN_RPM_CUSTOM
 CONFIG_FAN_UPDATE_PERIOD
 CONFIG_FINGERPRINT_MCU

zephyr/program/lotus/azalea/src/project_diagnostics.c

@@ -7,6 +7,7 @@
 #include "board_adc.h"
 #include "console.h"
 #include "diagnostics.h"
+#include "dptf.h"
 #include "driver/temp_sensor/f75303.h"
 #include "fan.h"
 #include "hooks.h"
@@ -22,6 +23,13 @@
 #define F75303_PRODUCT_ID 0xFD
 #define F75303_ID	0x21
 
+void start_fan_deferred(void)
+{
+	/* force turn on the fan for diagnostic */
+	dptf_set_fan_duty_target(20);
+}
+DECLARE_DEFERRED(start_fan_deferred);
+
 void check_device_deferred(void)
 {
 	int touchpad = get_hardware_id(ADC_TOUCHPAD_ID);
@@ -42,16 +50,19 @@ void check_device_deferred(void)
 	if (product_id != F75303_ID)
 		set_diagnostic(DIAGNOSTICS_THERMAL_SENSOR, true);
 
-
 	if (!(fan_get_rpm_actual(0) > 100))
 		set_diagnostic(DIAGNOSTICS_NOFAN, true);
 
+	/* Exit the duty mode and let thermal to control the fan */
+	dptf_set_fan_duty_target(-1);
+
 	if (amd_ddr_initialized_check())
 		set_bios_diagnostic(CODE_DDR_FAIL);
 }
 DECLARE_DEFERRED(check_device_deferred);
 
 void project_diagnostics(void)
 {
+	hook_call_deferred(&start_fan_deferred_data, 500 * MSEC);
 	hook_call_deferred(&check_device_deferred_data, 2000 * MSEC);
 }

zephyr/program/lotus/include/lotus/gpu.h

@@ -8,6 +8,8 @@
 
 bool gpu_present(void);
 
+bool gpu_module_fault(void);
+
 void set_host_dp_ready(int ready);
 
 #endif /* __BOARD_GPU_H__ */

zephyr/program/lotus/include/lotus/input_module.h

@@ -48,6 +48,8 @@ enum input_deck_mux {
 
 int get_deck_state(void);
 
+bool input_deck_is_fully_populated(void);
+
 void input_modules_powerdown(void);
 
 void set_detect_mode(int mode);

zephyr/program/lotus/lotus/src/gpu.c

@@ -28,11 +28,18 @@ LOG_MODULE_REGISTER(gpu, LOG_LEVEL_INF);
 #define GPU_F75303_I2C_ADDR_FLAGS 0x4D
 
 static int module_present;
+static int module_fault;
+
 bool gpu_present(void)
 {
 	return module_present;
 }
 
+bool gpu_module_fault(void)
+{
+	return module_fault;
+}
+
 static void update_gpu_ac_power_state(void)
 {
 	if (extpower_is_present() && module_present) {
@@ -67,11 +74,14 @@ void check_gpu_module(void)
 		LOG_INF("Detected single interposer device");
 		module_present = 1;
 		break;
-
-	default:
+	case VALID_BOARDID(BOARD_VERSION_15, BOARD_VERSION_15):
 		LOG_INF("No gpu module detected %d %d", gpu_id_0, gpu_id_1);
-		/* Framework TODO remove for DVT, for now force on  unless feature is enabled */
 		module_present = 0;
+		break;
+	default:
+		LOG_INF("GPU module Fault");
+		module_present = 0;
+		module_fault = 1;
 	break;
 	}
 

zephyr/program/lotus/lotus/src/input_module.c

@@ -47,6 +47,26 @@ int get_detect_mode(void)
 	return detect_mode;
 }
 
+bool input_deck_is_fully_populated(void)
+{
+	int idx;
+	int input_deck_sum = 0;
+
+	/* Touchpad disconnected */
+	if (hub_board_id[TOUCHPAD] != BOARD_VERSION_13)
+		return false;
+
+	for (idx = 0; idx < TOUCHPAD; idx++) {
+		if (hub_board_id[idx] != BOARD_VERSION_15)
+			input_deck_sum += hub_board_id[idx];
+	}
+
+	/* The minimum value is BOARD_ID_8 (Generic A) + BOARD_ID_9 (Generic B)*/
+	if (input_deck_sum < 17)
+		return false;
+
+	return true;
+}
 
 static void set_hub_mux(uint8_t input)
 {

zephyr/program/lotus/lotus/src/project_diagnostics.c

@@ -6,6 +6,7 @@
 #include "board_host_command.h"
 #include "console.h"
 #include "diagnostics.h"
+#include "dptf.h"
 #include "fan.h"
 #include "gpu.h"
 #include "hooks.h"
@@ -16,26 +17,40 @@
 #define CPRINTS(format, args...) cprints(CC_SYSTEM, format, ## args)
 #define CPRINTF(format, args...) cprintf(CC_SYSTEM, format, ## args)
 
+void start_fan_deferred(void)
+{
+	/* force turn on the fan for diagnostic */
+	dptf_set_fan_duty_target(5);
+}
+DECLARE_DEFERRED(start_fan_deferred);
+
 void check_device_deferred(void)
 {
-	if (!gpu_present())
+	if (gpu_module_fault())
 		set_diagnostic(DIAGNOSTICS_GPU_MODULE_FAULT, true);
 
 	if (get_deck_state() != DECK_ON && !get_standalone_mode())
 		set_diagnostic(DIAGNOSTICS_INPUT_MODULE_FAULT, true);
 
+	/* force turn on the fan for diagnostic */
+	dptf_set_fan_duty_target(5);
+
 	if (!(fan_get_rpm_actual(0) > 100))
 		set_diagnostic(DIAGNOSTICS_NO_RIGHT_FAN, true);
 
 	if (!(fan_get_rpm_actual(1) > 100))
 		set_diagnostic(DIAGNOSTICS_NO_LEFT_FAN, true);
 
+	/* Exit the duty mode and let thermal to control the fan */
+	dptf_set_fan_duty_target(-1);
+
 	if (amd_ddr_initialized_check())
 		set_bios_diagnostic(CODE_DDR_FAIL);
 }
 DECLARE_DEFERRED(check_device_deferred);
 
 void project_diagnostics(void)
 {
+	hook_call_deferred(&start_fan_deferred_data, 500 * MSEC);
 	hook_call_deferred(&check_device_deferred_data, 2000 * MSEC);
 }

zephyr/program/lotus/src/led.c

@@ -15,6 +15,7 @@
 #include "charge_state.h"
 #include "chipset.h"
 #include "ec_commands.h"
+#include "extpower.h"
 #include "hooks.h"
 #include "host_command.h"
 #include "led.h"
@@ -27,6 +28,11 @@
 #include "diagnostics.h"
 #include "lid_switch.h"
 
+#ifdef CONFIG_BOARD_LOTUS
+#include "gpu.h"
+#include "input_module.h"
+#endif
+
 
 #include <zephyr/devicetree.h>
 #include <zephyr/drivers/gpio.h>
@@ -430,19 +436,25 @@ static void board_led_set_power(void)
 		led_set_color(LED_OFF, EC_LED_ID_POWER_LED);
 }
 
-static void chassis_open_blink_leds(void)
+static void multifunction_leds_control(int *colors, int num_color, int period)
 {
 	static uint32_t ticks;
+	static int idx;
 
 	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_right_side), 1);
 	gpio_pin_set_dt(GPIO_DT_FROM_NODELABEL(gpio_left_side), 1);
 
 	ticks++;
 
-	if ((ticks / 3) % 2)
-		led_set_color(LED_RED, EC_LED_ID_BATTERY_LED);
-	else
-		led_set_color(LED_OFF, EC_LED_ID_BATTERY_LED);
+	if ((ticks * 200) >= period) {
+		ticks = 0;
+		idx++;
+
+		if (idx >= num_color)
+			idx = 0;
+	}
+
+	led_set_color(colors[idx], EC_LED_ID_BATTERY_LED);
 }
 
 /* =============================== */
@@ -476,19 +488,67 @@ static void board_led_set_color(void)
 /* Called by hook task every HOOK_TICK_INTERVAL_MS */
 static void led_tick(void)
 {
+	int colors[3] = {LED_OFF, LED_OFF, LED_OFF};
+
 	if (led_auto_control_is_enabled(EC_LED_ID_POWER_LED))
 		board_led_set_power();
 
-	/* we have an error, override LED control*/
+	/* Debug Active */
 	if (diagnostics_tick())
 		return;
 
-	/* chassis open */
+	/* Battery disconnect active signal */
+	if (battery_is_cut_off()) {
+		colors[0] = LED_RED;
+		colors[1] = LED_BLUE;
+		colors[2] = LED_OFF;
+#ifdef CONFIG_BOARD_LOUTS
+		multifunction_leds_control(colors, 2, 1000);
+#else
+		multifunction_leds_control(colors, 2, 500);
+#endif
+		return;
+	}
+
+	/* C cover detect switch open */
 	if (gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_chassis_open_l)) == 0 &&
 		!get_standalone_mode()) {
-		chassis_open_blink_leds();
+		colors[0] = LED_RED;
+		colors[1] = LED_OFF;
+		colors[2] = LED_OFF;
+		multifunction_leds_control(colors, 2, 1000);
+		return;
+	}
+
+#ifdef CONFIG_BOARD_LOTUS
+	/* GPU bay cover detect switch open */
+	if (gpio_pin_get_dt(GPIO_DT_FROM_NODELABEL(gpio_f_beam_open_l)) == 0 &&
+		!get_standalone_mode()) {
+		colors[0] = LED_RED;
+		colors[1] = LED_AMBER;
+		colors[2] = LED_OFF;
+		multifunction_leds_control(colors, 3, 1000);
+		return;
+	}
+
+	/* GPU Bay Module Fault */
+	if (gpu_module_fault() && extpower_is_present()) {
+		colors[0] = LED_RED;
+		colors[1] = LED_AMBER;
+		colors[2] = LED_OFF;
+		multifunction_leds_control(colors, 3, 1000);
+		return;
+	}
+
+	/* Input Deck not fully populated */
+	if (!input_deck_is_fully_populated() && !get_standalone_mode()) {
+		colors[0] = LED_RED;
+		colors[1] = LED_BLUE;
+		colors[2] = LED_OFF;
+		multifunction_leds_control(colors, 3, 500);
 		return;
 	}
+#endif
 
 	board_led_set_color();
 }

zephyr/shim/include/config_chip.h

@@ -3120,8 +3120,10 @@ BUILD_ASSERT((DT_NUM_INST_STATUS_OKAY(mps_mp2964)) == 1,
 #endif
 
 #undef CONFIG_CUSTOMIZED_DESIGN
+#undef CONFIG_FAN_INIT_SPEED
 #ifdef CONFIG_PLATFORM_EC_CUSTOMIZED_DESIGN
 #define CONFIG_CUSTOMIZED_DESIGN
+#define CONFIG_FAN_INIT_SPEED 20
 #endif
 
 #undef CONFIG_SYSTEM_SAFE_MODE