diff --git a/packages/platforms/mellanox/any/src/mlnx_common/module/inc/mlnx_common/mlnx_common.h b/packages/platforms/mellanox/any/src/mlnx_common/module/inc/mlnx_common/mlnx_common.h index f2bd7dbe..a1c191fa 100644 --- a/packages/platforms/mellanox/any/src/mlnx_common/module/inc/mlnx_common/mlnx_common.h +++ b/packages/platforms/mellanox/any/src/mlnx_common/module/inc/mlnx_common/mlnx_common.h @@ -24,6 +24,7 @@ #define LED_TYPE_1 1 #define LED_TYPE_2 2 +#define LED_TYPE_3 3 /* led common id */ #define LED_RESERVED 0 @@ -40,6 +41,11 @@ #define LED_PSU2 4 #define LED_UID 5 +/*led type 3 id */ +#define LED_FAN5 6 +#define LED_FAN6 7 +#define LED_PSU_T3 8 + #define PERCENTAGE_MIN 60.0 #define PERCENTAGE_MAX 100.0 #define RPM_MAGIC_MIN 153.0 @@ -125,6 +131,7 @@ typedef struct mlnx_platform_info_s { onlp_fan_info_t* finfo; fan_path_T* fan_fnames; int fan_type; + int fan_per_module; int first_psu_fan_id; } mlnx_platform_info_t; diff --git a/packages/platforms/mellanox/any/src/mlnx_common/module/src/mlnx_common_fani.c b/packages/platforms/mellanox/any/src/mlnx_common/module/src/mlnx_common_fani.c index caa088ca..8eeea7c4 100644 --- a/packages/platforms/mellanox/any/src/mlnx_common/module/src/mlnx_common_fani.c +++ b/packages/platforms/mellanox/any/src/mlnx_common/module/src/mlnx_common_fani.c @@ -126,43 +126,33 @@ _onlp_fani_info_get_fan(int local_id, onlp_fan_info_t* info) int r_val, ret; float range = 0; float temp = 0; - float fru_index = 0; + int fru_index = 0; const char fan_model[]=FAN_MODEL; mlnx_platform_info_t* mlnx_platform_info = get_platform_info(); if(mlnx_platform_info->fan_type == FAN_TYPE_NO_EEPROM) - strncpy(info->model, fan_model, sizeof(info->model)); + strncpy(info->model, fan_model, sizeof(info->model)); if(!mlnx_platform_info->fan_fixed) { - /* We have 4 FRU with 2 fans(total 8 fans). - Eeprom is per FRU but not per fan. - So, need to convert fan ID to FRU ID.*/ - if (local_id % 2) { - fru_index = local_id / 2 + 1; - } else { - fru_index = local_id / 2; - } - /* get fan status - */ - if(mlnx_platform_info->fan_type == FAN_TYPE_EEPROM) { - ret = onlp_file_read_int(&r_val, "%s%s", PREFIX_MODULE_PATH, mlnx_platform_info->fan_fnames[(int)fru_index].status); - if (ret < 0) { - return ONLP_STATUS_E_INTERNAL; + /* not fixed FAN's can have more than 1 FAN per FRU. + EEPROM is per FRU but not per FAN. + So, need to convert fan ID to FRU ID.*/ + if (mlnx_platform_info->fan_per_module == 0) { + info->status |= ONLP_FAN_STATUS_FAILED; + return ONLP_STATUS_OK; } - if (r_val != FAN_STATUS_OK) { - info->status &= ~ONLP_FAN_STATUS_PRESENT; - return ONLP_STATUS_OK; - } - } - else { - ret = onlp_file_read_int(&r_val, "%s%s", PREFIX_MODULE_PATH, mlnx_platform_info->fan_fnames[local_id].status); + /* get fan status */ + fru_index = (local_id + mlnx_platform_info->fan_per_module -1) / mlnx_platform_info->fan_per_module; + + ret = onlp_file_read_int(&r_val, "%s%s", PREFIX_MODULE_PATH, mlnx_platform_info->fan_fnames[fru_index].status); if (ret < 0) { return ONLP_STATUS_E_INTERNAL; } - if (r_val != FAN_STATUS_OK) { - return ONLP_STATUS_OK; - } - } + if (r_val != FAN_STATUS_OK) { + if(mlnx_platform_info->fan_type == FAN_TYPE_EEPROM) + info->status &= ~ONLP_FAN_STATUS_PRESENT; + return ONLP_STATUS_OK; + } } /* Fixed system FAN is always present */ info->status |= ONLP_FAN_STATUS_PRESENT; @@ -230,9 +220,9 @@ _onlp_fani_info_get_fan_on_psu(int local_id, int psu_id, onlp_fan_info_t* info) } if (r_val != FAN_STATUS_OK) { - if(mlnx_platform_info->fan_type == FAN_TYPE_EEPROM) - info->status &= ~ONLP_FAN_STATUS_PRESENT; - return ONLP_STATUS_OK; + if(mlnx_platform_info->fan_type == FAN_TYPE_EEPROM) + info->status &= ~ONLP_FAN_STATUS_PRESENT; + return ONLP_STATUS_OK; } info->status |= ONLP_FAN_STATUS_PRESENT; @@ -259,7 +249,7 @@ _onlp_fani_info_get_fan_on_psu(int local_id, int psu_id, onlp_fan_info_t* info) info->percentage = (int)temp; if (0 != psu_read_eeprom((local_id-mlnx_platform_info->first_psu_fan_id)+1, NULL, info)) - return ONLP_STATUS_E_INTERNAL; + return ONLP_STATUS_E_INTERNAL; return ONLP_STATUS_OK; } diff --git a/packages/platforms/mellanox/any/src/mlnx_common/module/src/mlnx_common_ledi.c b/packages/platforms/mellanox/any/src/mlnx_common/module/src/mlnx_common_ledi.c index 8669cf52..23feeff1 100644 --- a/packages/platforms/mellanox/any/src/mlnx_common/module/src/mlnx_common_ledi.c +++ b/packages/platforms/mellanox/any/src/mlnx_common/module/src/mlnx_common_ledi.c @@ -37,9 +37,11 @@ #define LED_MODE_OFF "none" #define LED_MODE_GREEN "green" #define LED_MODE_RED "red" +#define LED_MODE_ORANGE "orange" #define LED_MODE_BLUE "blue" #define LED_MODE_GREEN_BLINK "green_blink" #define LED_MODE_RED_BLINK "red_blink" +#define LED_MODE_ORANGE_BLINK "orange_blink" #define LED_MODE_BLUE_BLINK "blue_blink" #define LED_MODE_AUTO "cpld_control" @@ -76,56 +78,90 @@ led_light_mode_map_t led_map[] = { {LED_FAN1, LED_MODE_OFF, ONLP_LED_MODE_OFF}, {LED_FAN1, LED_MODE_GREEN, ONLP_LED_MODE_GREEN}, {LED_FAN1, LED_MODE_RED, ONLP_LED_MODE_RED}, + {LED_FAN1, LED_MODE_ORANGE, ONLP_LED_MODE_ORANGE}, {LED_FAN1, LED_MODE_RED_BLINK, ONLP_LED_MODE_RED_BLINKING}, + {LED_FAN1, LED_MODE_ORANGE_BLINK, ONLP_LED_MODE_ORANGE_BLINKING}, {LED_FAN1, LED_MODE_GREEN_BLINK, ONLP_LED_MODE_GREEN_BLINKING}, {LED_FAN1, LED_MODE_AUTO, ONLP_LED_MODE_AUTO}, {LED_FAN2, LED_MODE_OFF, ONLP_LED_MODE_OFF}, {LED_FAN2, LED_MODE_GREEN, ONLP_LED_MODE_GREEN}, {LED_FAN2, LED_MODE_RED, ONLP_LED_MODE_RED}, + {LED_FAN2, LED_MODE_ORANGE, ONLP_LED_MODE_ORANGE}, {LED_FAN2, LED_MODE_RED_BLINK, ONLP_LED_MODE_RED_BLINKING}, + {LED_FAN2, LED_MODE_ORANGE_BLINK, ONLP_LED_MODE_ORANGE_BLINKING}, {LED_FAN2, LED_MODE_GREEN_BLINK, ONLP_LED_MODE_GREEN_BLINKING}, {LED_FAN2, LED_MODE_AUTO, ONLP_LED_MODE_AUTO}, {LED_FAN3, LED_MODE_OFF, ONLP_LED_MODE_OFF}, {LED_FAN3, LED_MODE_GREEN, ONLP_LED_MODE_GREEN}, {LED_FAN3, LED_MODE_RED, ONLP_LED_MODE_RED}, + {LED_FAN3, LED_MODE_ORANGE, ONLP_LED_MODE_ORANGE}, {LED_FAN3, LED_MODE_RED_BLINK, ONLP_LED_MODE_RED_BLINKING}, + {LED_FAN3, LED_MODE_ORANGE_BLINK, ONLP_LED_MODE_ORANGE_BLINKING}, {LED_FAN3, LED_MODE_GREEN_BLINK, ONLP_LED_MODE_GREEN_BLINKING}, {LED_FAN3, LED_MODE_AUTO, ONLP_LED_MODE_AUTO}, {LED_FAN4, LED_MODE_OFF, ONLP_LED_MODE_OFF}, {LED_FAN4, LED_MODE_GREEN, ONLP_LED_MODE_GREEN}, {LED_FAN4, LED_MODE_RED, ONLP_LED_MODE_RED}, + {LED_FAN4, LED_MODE_ORANGE, ONLP_LED_MODE_ORANGE}, {LED_FAN4, LED_MODE_RED_BLINK, ONLP_LED_MODE_RED_BLINKING}, + {LED_FAN4, LED_MODE_ORANGE_BLINK, ONLP_LED_MODE_ORANGE_BLINKING}, {LED_FAN4, LED_MODE_GREEN_BLINK, ONLP_LED_MODE_GREEN_BLINKING}, {LED_FAN4, LED_MODE_AUTO, ONLP_LED_MODE_AUTO}, + {LED_FAN5, LED_MODE_OFF, ONLP_LED_MODE_OFF}, + {LED_FAN5, LED_MODE_GREEN, ONLP_LED_MODE_GREEN}, + {LED_FAN5, LED_MODE_RED, ONLP_LED_MODE_RED}, + {LED_FAN5, LED_MODE_ORANGE, ONLP_LED_MODE_ORANGE}, + {LED_FAN5, LED_MODE_RED_BLINK, ONLP_LED_MODE_RED_BLINKING}, + {LED_FAN5, LED_MODE_ORANGE_BLINK, ONLP_LED_MODE_ORANGE_BLINKING}, + {LED_FAN5, LED_MODE_GREEN_BLINK, ONLP_LED_MODE_GREEN_BLINKING}, + {LED_FAN5, LED_MODE_AUTO, ONLP_LED_MODE_AUTO}, + + {LED_FAN6, LED_MODE_OFF, ONLP_LED_MODE_OFF}, + {LED_FAN6, LED_MODE_GREEN, ONLP_LED_MODE_GREEN}, + {LED_FAN6, LED_MODE_RED, ONLP_LED_MODE_RED}, + {LED_FAN6, LED_MODE_ORANGE, ONLP_LED_MODE_ORANGE}, + {LED_FAN6, LED_MODE_RED_BLINK, ONLP_LED_MODE_RED_BLINKING}, + {LED_FAN6, LED_MODE_ORANGE_BLINK, ONLP_LED_MODE_ORANGE_BLINKING}, + {LED_FAN6, LED_MODE_GREEN_BLINK, ONLP_LED_MODE_GREEN_BLINKING}, + {LED_FAN6, LED_MODE_AUTO, ONLP_LED_MODE_AUTO}, + {LED_PSU, LED_MODE_OFF, ONLP_LED_MODE_OFF}, {LED_PSU, LED_MODE_GREEN, ONLP_LED_MODE_GREEN}, {LED_PSU, LED_MODE_RED, ONLP_LED_MODE_RED}, + {LED_PSU, LED_MODE_ORANGE, ONLP_LED_MODE_ORANGE}, {LED_PSU, LED_MODE_RED_BLINK, ONLP_LED_MODE_RED_BLINKING}, + {LED_PSU, LED_MODE_ORANGE_BLINK, ONLP_LED_MODE_ORANGE_BLINKING}, {LED_PSU, LED_MODE_GREEN_BLINK, ONLP_LED_MODE_GREEN_BLINKING}, {LED_PSU, LED_MODE_AUTO, ONLP_LED_MODE_AUTO}, {LED_FAN, LED_MODE_OFF, ONLP_LED_MODE_OFF}, {LED_FAN, LED_MODE_GREEN, ONLP_LED_MODE_GREEN}, {LED_FAN, LED_MODE_RED, ONLP_LED_MODE_RED}, + {LED_FAN, LED_MODE_ORANGE, ONLP_LED_MODE_ORANGE}, {LED_FAN, LED_MODE_RED_BLINK, ONLP_LED_MODE_RED_BLINKING}, + {LED_FAN, LED_MODE_ORANGE_BLINK, ONLP_LED_MODE_ORANGE_BLINKING}, {LED_FAN, LED_MODE_GREEN_BLINK, ONLP_LED_MODE_GREEN_BLINKING}, {LED_FAN, LED_MODE_AUTO, ONLP_LED_MODE_AUTO}, {LED_PSU1, LED_MODE_OFF, ONLP_LED_MODE_OFF}, {LED_PSU1, LED_MODE_GREEN, ONLP_LED_MODE_GREEN}, {LED_PSU1, LED_MODE_RED, ONLP_LED_MODE_RED}, + {LED_PSU1, LED_MODE_ORANGE, ONLP_LED_MODE_ORANGE}, {LED_PSU1, LED_MODE_RED_BLINK, ONLP_LED_MODE_RED_BLINKING}, + {LED_PSU1, LED_MODE_ORANGE_BLINK, ONLP_LED_MODE_ORANGE_BLINKING}, {LED_PSU1, LED_MODE_GREEN_BLINK, ONLP_LED_MODE_GREEN_BLINKING}, {LED_PSU1, LED_MODE_AUTO, ONLP_LED_MODE_AUTO}, {LED_PSU2, LED_MODE_OFF, ONLP_LED_MODE_OFF}, {LED_PSU2, LED_MODE_GREEN, ONLP_LED_MODE_GREEN}, {LED_PSU2, LED_MODE_RED, ONLP_LED_MODE_RED}, + {LED_PSU2, LED_MODE_ORANGE, ONLP_LED_MODE_ORANGE}, {LED_PSU2, LED_MODE_RED_BLINK, ONLP_LED_MODE_RED_BLINKING}, + {LED_PSU2, LED_MODE_ORANGE_BLINK, ONLP_LED_MODE_ORANGE_BLINKING}, {LED_PSU2, LED_MODE_GREEN_BLINK, ONLP_LED_MODE_GREEN_BLINKING}, {LED_PSU2, LED_MODE_AUTO, ONLP_LED_MODE_AUTO}, @@ -133,25 +169,36 @@ led_light_mode_map_t led_map[] = { {LED_UID, LED_MODE_BLUE, ONLP_LED_MODE_BLUE}, {LED_UID, LED_MODE_BLUE_BLINK, ONLP_LED_MODE_BLUE_BLINKING}, {LED_UID, LED_MODE_AUTO, ONLP_LED_MODE_AUTO}, + + {LED_PSU_T3, LED_MODE_OFF, ONLP_LED_MODE_OFF}, + {LED_PSU_T3, LED_MODE_GREEN, ONLP_LED_MODE_GREEN}, + {LED_PSU_T3, LED_MODE_RED, ONLP_LED_MODE_RED}, + {LED_PSU_T3, LED_MODE_ORANGE, ONLP_LED_MODE_ORANGE}, + {LED_PSU_T3, LED_MODE_RED_BLINK, ONLP_LED_MODE_RED_BLINKING}, + {LED_PSU_T3, LED_MODE_ORANGE_BLINK, ONLP_LED_MODE_ORANGE_BLINKING}, + {LED_PSU_T3, LED_MODE_GREEN_BLINK, ONLP_LED_MODE_GREEN_BLINKING}, + {LED_PSU_T3, LED_MODE_AUTO, ONLP_LED_MODE_AUTO}, }; typedef struct led_colors { int id; - const char* color1; - const char* color2; + const char* color; } led_colors_t; static led_colors_t led_colors_map[] = { - {LED_SYSTEM, "green", "red"}, - {LED_FAN1, "green", "red"}, - {LED_FAN2, "green", "red"}, - {LED_FAN3, "green", "red"}, - {LED_FAN4, "green", "red"}, - {LED_PSU, "green", "red"}, - {LED_FAN, "green", "red"}, - {LED_PSU1, "green", "red"}, - {LED_PSU2, "green", "red"}, - {LED_UID, "blue", NULL}, + {LED_SYSTEM, "green"}, + {LED_FAN1, "green"}, + {LED_FAN2, "green"}, + {LED_FAN3, "green"}, + {LED_FAN4, "green"}, + {LED_FAN5, "green"}, + {LED_FAN6, "green"}, + {LED_PSU, "green"}, + {LED_FAN, "green"}, + {LED_PSU1, "green"}, + {LED_PSU2, "green"}, + {LED_UID, "blue"}, + {LED_PSU_T3, "green"}, }; static int driver_to_onlp_led_mode(int id, char* driver_led_mode) @@ -199,6 +246,10 @@ static int led_set_mode(onlp_oid_t id, onlp_led_mode_t mode) strcpy(color, "red"); blinking = 1; break; + case ONLP_LED_MODE_ORANGE_BLINKING: + strcpy(color, "orange"); + blinking = 1; + break; case ONLP_LED_MODE_GREEN_BLINKING: strcpy(color, "green"); blinking = 1; @@ -214,6 +265,9 @@ static int led_set_mode(onlp_oid_t id, onlp_led_mode_t mode) case ONLP_LED_MODE_RED: strcpy(color, "red"); break; + case ONLP_LED_MODE_ORANGE: + strcpy(color, "orange"); + break; case ONLP_LED_MODE_GREEN: strcpy(color, "green"); break; @@ -303,9 +357,9 @@ onlp_ledi_set(onlp_oid_t id, int on_or_off) if (id == led_colors_map[i].id) break; } - if (led_colors_map[i].color1) + if (led_colors_map[i].color) onlp_file_write((uint8_t*)LED_OFF, LED_MODE_LEN, - "%s%s_%s", prefix_path, mlnx_platform_info->led_fnames[id], led_colors_map[i].color1); + "%s%s_%s", prefix_path, mlnx_platform_info->led_fnames[id], led_colors_map[i].color); } } diff --git a/packages/platforms/mellanox/any/src/mlnx_common/module/src/mlnx_common_sysi.c b/packages/platforms/mellanox/any/src/mlnx_common/module/src/mlnx_common_sysi.c index 6fa3a415..64fd6985 100644 --- a/packages/platforms/mellanox/any/src/mlnx_common/module/src/mlnx_common_sysi.c +++ b/packages/platforms/mellanox/any/src/mlnx_common/module/src/mlnx_common_sysi.c @@ -379,13 +379,143 @@ onlp_sysi_platform_manage_leds_type2(void) return ONLP_STATUS_OK; } +int +onlp_sysi_platform_manage_leds_type3(void) +{ + int fan_number, psu_number; + onlp_led_mode_t mode, system_mode; + int min_fan_speed; + + int fan_led_id[6] = { LED_FAN1, LED_FAN2, LED_FAN3, LED_FAN4, LED_FAN5, LED_FAN6 }; + + int fan_problem = 0; + int psu_problem = 0; + + /* + * FAN Indicators + * + * Green - Fan is operating + * Orange - No power or Fan failure + * Off - No power + * + */ + for (fan_number = 1; fan_number <= mlnx_platform_info.fan_num; fan_number += 2) + { + /* each 2 fans had same led_fan */ + onlp_fan_info_t fi; + /* check fans */ + mode = ONLP_LED_MODE_GREEN; + if (onlp_fani_info_get(ONLP_FAN_ID_CREATE(fan_number), &fi) < 0) + { + mode = ONLP_LED_MODE_ORANGE; + fan_problem = 1; + } else if ((fi.status & ONLP_FAN_STATUS_PRESENT) == 0) { + if (mlnx_platform_info.fan_fixed == false) + { + /* Not present */ + mode = ONLP_LED_MODE_ORANGE; + fan_problem = 1; + } + } else if (fi.status & ONLP_FAN_STATUS_FAILED) { + mode = ONLP_LED_MODE_ORANGE; + fan_problem = 1; + } else { + min_fan_speed = onlp_fani_get_min_rpm(fan_number); + if (fi.rpm < min_fan_speed) + { + mode = ONLP_LED_MODE_ORANGE; + fan_problem = 1; + } + } + /* check fan i+1 */ + if (onlp_fani_info_get(ONLP_FAN_ID_CREATE(fan_number + 1), &fi) < 0) + { + mode = ONLP_LED_MODE_ORANGE; + fan_problem = 1; + } else if ((fi.status & 0x1) == 0) { + if (mlnx_platform_info.fan_fixed == false) + { + /* Not present */ + mode = ONLP_LED_MODE_ORANGE; + fan_problem = 1; + } + } else if (fi.status & ONLP_FAN_STATUS_FAILED) + { + mode = ONLP_LED_MODE_ORANGE; + fan_problem = 1; + } else { + min_fan_speed = onlp_fani_get_min_rpm(fan_number + 1); + if (fi.rpm < min_fan_speed) + { + mode = ONLP_LED_MODE_ORANGE; + fan_problem = 1; + } + } + onlp_ledi_mode_set( ONLP_OID_TYPE_CREATE(ONLP_OID_TYPE_LED, fan_led_id[fan_number / 2]), mode); + } + + for (psu_number = 1; psu_number <= mlnx_platform_info.psu_num; psu_number++) + { + onlp_psu_info_t pi; + if (onlp_psui_info_get(ONLP_PSU_ID_CREATE(psu_number), &pi) < 0) + { + psu_problem = 1; + } else { + if (mlnx_platform_info.psu_fixed) + { + /* Fixed system, PSU always in. Check only cable plugged. */ + if (pi.status & ONLP_PSU_STATUS_UNPLUGGED) + { + mode = ONLP_LED_MODE_ORANGE; + psu_problem = 1; + } + } else { + if ((pi.status & ONLP_PSU_STATUS_PRESENT) == 0) + { + /* Not present */ + psu_problem = 1; + } else if (pi.status & ONLP_PSU_STATUS_UNPLUGGED) { + psu_problem = 1; + } + } + } + } + + if (psu_problem) + mode = ONLP_LED_MODE_ORANGE; + else + mode = ONLP_LED_MODE_GREEN; + onlp_ledi_mode_set(ONLP_OID_TYPE_CREATE(ONLP_OID_TYPE_LED, LED_PSU), mode); + + /* Set System status LED green if no problem in FANs or PSUs */ + if (fan_problem || psu_problem) + system_mode = ONLP_LED_MODE_ORANGE; + else + system_mode = ONLP_LED_MODE_GREEN; + + onlp_ledi_mode_set(ONLP_OID_TYPE_CREATE(ONLP_OID_TYPE_LED, LED_SYSTEM), system_mode); + + return ONLP_STATUS_OK; +} + int onlp_sysi_platform_manage_leds(void) { - int res; - if(mlnx_platform_info.led_type == 1) - res=onlp_sysi_platform_manage_leds_type1(); - else - res=onlp_sysi_platform_manage_leds_type2(); - return res; + int res; + switch (mlnx_platform_info.led_type) { + case LED_TYPE_1: + res=onlp_sysi_platform_manage_leds_type1(); + break; + + case LED_TYPE_2: + res=onlp_sysi_platform_manage_leds_type2(); + break; + + case LED_TYPE_3: + res=onlp_sysi_platform_manage_leds_type3(); + break; + default: + res = ONLP_STATUS_E_INVALID; + } + return res; } diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2010/onlp/builds/src/module/src/fani.c b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2010/onlp/builds/src/module/src/fani.c index a4924279..b978252d 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2010/onlp/builds/src/module/src/fani.c +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2010/onlp/builds/src/module/src/fani.c @@ -70,6 +70,7 @@ onlp_fani_init(void) mlnx_platform_info->finfo = finfo; mlnx_platform_info->fan_fnames = fan_path; mlnx_platform_info->fan_type = FAN_TYPE_NO_EEPROM; + mlnx_platform_info->fan_per_module = 1; mlnx_platform_info->first_psu_fan_id = FIRST_PSU_FAN_ID; return ONLP_STATUS_OK; } diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2100/onlp/builds/src/module/src/fani.c b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2100/onlp/builds/src/module/src/fani.c index 8f05fe8a..e8d1e656 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2100/onlp/builds/src/module/src/fani.c +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2100/onlp/builds/src/module/src/fani.c @@ -71,6 +71,7 @@ onlp_fani_init(void) mlnx_platform_info->finfo = finfo; mlnx_platform_info->fan_fnames = fan_path; mlnx_platform_info->fan_type = FAN_TYPE_NO_EEPROM; + mlnx_platform_info->fan_per_module = 1; mlnx_platform_info->first_psu_fan_id = FIRST_PSU_FAN_ID; return ONLP_STATUS_OK; } diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410/onlp/builds/src/module/src/fani.c b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410/onlp/builds/src/module/src/fani.c index 9a47a312..72b977b1 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410/onlp/builds/src/module/src/fani.c +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410/onlp/builds/src/module/src/fani.c @@ -88,6 +88,7 @@ onlp_fani_init(void) mlnx_platform_info->finfo = finfo; mlnx_platform_info->fan_fnames = fan_path; mlnx_platform_info->fan_type = FAN_TYPE_EEPROM; + mlnx_platform_info->fan_per_module = 2; mlnx_platform_info->first_psu_fan_id = FIRST_PSU_FAN_ID; return ONLP_STATUS_OK; } diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410/onlp/builds/src/module/src/ledi.c b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410/onlp/builds/src/module/src/ledi.c index 7fdb1f37..6249d791 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410/onlp/builds/src/module/src/ledi.c +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2410/onlp/builds/src/module/src/ledi.c @@ -56,25 +56,25 @@ static onlp_led_info_t linfo[] = ONLP_LED_CAPS_RED | ONLP_LED_CAPS_RED_BLINKING | ONLP_LED_CAPS_AUTO, }, { - { ONLP_LED_ID_CREATE(LED_FAN1), "Chassis LED 2 (FAN1 LED)", 0 }, + { ONLP_LED_ID_CREATE(LED_FAN1), "Chassis LED 2 (FAN1 (1-2) )", 0 }, ONLP_LED_STATUS_PRESENT, ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_GREEN | ONLP_LED_CAPS_GREEN_BLINKING | ONLP_LED_CAPS_RED | ONLP_LED_CAPS_RED_BLINKING | ONLP_LED_CAPS_AUTO, }, { - { ONLP_LED_ID_CREATE(LED_FAN2), "Chassis LED 3 (FAN2 LED)", 0 }, + { ONLP_LED_ID_CREATE(LED_FAN2), "Chassis LED 3 (FAN2 (3-4)", 0 }, ONLP_LED_STATUS_PRESENT, ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_GREEN | ONLP_LED_CAPS_GREEN_BLINKING | ONLP_LED_CAPS_RED | ONLP_LED_CAPS_RED_BLINKING | ONLP_LED_CAPS_AUTO, }, { - { ONLP_LED_ID_CREATE(LED_FAN3), "Chassis LED 4 (FAN3 LED)", 0 }, + { ONLP_LED_ID_CREATE(LED_FAN3), "Chassis LED 4 (FAN3 (5-6) )", 0 }, ONLP_LED_STATUS_PRESENT, ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_GREEN | ONLP_LED_CAPS_GREEN_BLINKING | ONLP_LED_CAPS_RED | ONLP_LED_CAPS_RED_BLINKING | ONLP_LED_CAPS_AUTO, }, { - { ONLP_LED_ID_CREATE(LED_FAN4), "Chassis LED 5 (FAN4 LED)", 0 }, + { ONLP_LED_ID_CREATE(LED_FAN4), "Chassis LED 5 (FAN4 (7-8) )", 0 }, ONLP_LED_STATUS_PRESENT, ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_GREEN | ONLP_LED_CAPS_GREEN_BLINKING | ONLP_LED_CAPS_RED | ONLP_LED_CAPS_RED_BLINKING | ONLP_LED_CAPS_AUTO, diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700/onlp/builds/src/module/src/fani.c b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700/onlp/builds/src/module/src/fani.c index 69914db2..f77c3b6d 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700/onlp/builds/src/module/src/fani.c +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700/onlp/builds/src/module/src/fani.c @@ -88,6 +88,7 @@ onlp_fani_init(void) mlnx_platform_info->finfo = finfo; mlnx_platform_info->fan_fnames = fan_path; mlnx_platform_info->fan_type = FAN_TYPE_EEPROM; + mlnx_platform_info->fan_per_module = 2; mlnx_platform_info->first_psu_fan_id = FIRST_PSU_FAN_ID; return ONLP_STATUS_OK; } diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700/onlp/builds/src/module/src/ledi.c b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700/onlp/builds/src/module/src/ledi.c index 7fdb1f37..571866a7 100644 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700/onlp/builds/src/module/src/ledi.c +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2700/onlp/builds/src/module/src/ledi.c @@ -56,25 +56,25 @@ static onlp_led_info_t linfo[] = ONLP_LED_CAPS_RED | ONLP_LED_CAPS_RED_BLINKING | ONLP_LED_CAPS_AUTO, }, { - { ONLP_LED_ID_CREATE(LED_FAN1), "Chassis LED 2 (FAN1 LED)", 0 }, + { ONLP_LED_ID_CREATE(LED_FAN1), "Chassis LED 2 (FAN1 (1-2) )", 0 }, ONLP_LED_STATUS_PRESENT, ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_GREEN | ONLP_LED_CAPS_GREEN_BLINKING | ONLP_LED_CAPS_RED | ONLP_LED_CAPS_RED_BLINKING | ONLP_LED_CAPS_AUTO, }, { - { ONLP_LED_ID_CREATE(LED_FAN2), "Chassis LED 3 (FAN2 LED)", 0 }, + { ONLP_LED_ID_CREATE(LED_FAN2), "Chassis LED 3 (FAN2 (3-4) )", 0 }, ONLP_LED_STATUS_PRESENT, ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_GREEN | ONLP_LED_CAPS_GREEN_BLINKING | ONLP_LED_CAPS_RED | ONLP_LED_CAPS_RED_BLINKING | ONLP_LED_CAPS_AUTO, }, { - { ONLP_LED_ID_CREATE(LED_FAN3), "Chassis LED 4 (FAN3 LED)", 0 }, + { ONLP_LED_ID_CREATE(LED_FAN3), "Chassis LED 4 (FAN3 (4-6) )", 0 }, ONLP_LED_STATUS_PRESENT, ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_GREEN | ONLP_LED_CAPS_GREEN_BLINKING | ONLP_LED_CAPS_RED | ONLP_LED_CAPS_RED_BLINKING | ONLP_LED_CAPS_AUTO, }, { - { ONLP_LED_ID_CREATE(LED_FAN4), "Chassis LED 5 (FAN4 LED)", 0 }, + { ONLP_LED_ID_CREATE(LED_FAN4), "Chassis LED 5 (FAN4 (7-8) )", 0 }, ONLP_LED_STATUS_PRESENT, ONLP_LED_CAPS_ON_OFF | ONLP_LED_CAPS_GREEN | ONLP_LED_CAPS_GREEN_BLINKING | ONLP_LED_CAPS_RED | ONLP_LED_CAPS_RED_BLINKING | ONLP_LED_CAPS_AUTO, diff --git a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2740/onlp/builds/src/module/src/fani.c b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2740/onlp/builds/src/module/src/fani.c index 7e57fcb6..05ab232f 100755 --- a/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2740/onlp/builds/src/module/src/fani.c +++ b/packages/platforms/mellanox/x86-64/x86-64-mlnx-msn2740/onlp/builds/src/module/src/fani.c @@ -76,6 +76,7 @@ onlp_fani_init(void) mlnx_platform_info->finfo = finfo; mlnx_platform_info->fan_fnames = fan_path; mlnx_platform_info->fan_type = FAN_TYPE_NO_EEPROM; + mlnx_platform_info->fan_per_module = 1; mlnx_platform_info->first_psu_fan_id = FIRST_PSU_FAN_ID; return ONLP_STATUS_OK; }