Skip to content

[Accton][platform][AS7326-56X] onlpdump shall show the correct LED re… #1023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ec-michael-shih wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Accton][platform][AS7326-56X] onlpdump shall show the correct LED re… #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 43 additions & 4 deletions packages/platforms/accton/x86-64/as7326-56x/modules/builds/x86-64-accton-as7326-56x-leds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ struct accton_as7326_56x_led_data {
struct mutex update_lock;
char valid; /* != 0 if registers are valid */
unsigned long last_updated; /* In jiffies */
u8 reg_val[2];
u8 reg_val[5];
};

static struct accton_as7326_56x_led_data *ledctl = NULL;
Expand All @@ -59,6 +59,12 @@ static struct accton_as7326_56x_led_data *ledctl = NULL;
#define LED_MODE_DIAG_OFF_VALUE (0x07)
#define LED_TYPE_LOC_REG_MASK (0x3F)
#define LED_MODE_LOC_OFF_VALUE (0x07)
#define LED_TYPE_FAN_REG_MASK (0x3F)
#define LED_MODE_FAN_OFF_VALUE (0x07)
#define LED_TYPE_PSU1_REG_MASK (0x3F)
#define LED_MODE_PSU1_OFF_VALUE (0x07)
#define LED_TYPE_PSU2_REG_MASK (0x3F)
#define LED_MODE_PSU2_OFF_VALUE (0x07)

enum led_type {
LED_TYPE_DIAG,
Expand All @@ -76,6 +82,9 @@ struct led_reg {
static const struct led_reg led_reg_map[] = {
{(1<<LED_TYPE_DIAG), 0x24},
{(1<<LED_TYPE_LOC) , 0x25},
{(1<<LED_TYPE_FAN) , 0x23},
{(1<<LED_TYPE_PSU1), 0x21},
{(1<<LED_TYPE_PSU2), 0x22},
};


Expand Down Expand Up @@ -127,6 +136,18 @@ static struct led_type_mode led_type_mode_data[] = {
{LED_TYPE_LOC, LED_MODE_BLUE_BLINK, LED_TYPE_LOC_REG_MASK, 0x27, 0x23},
{LED_TYPE_LOC, LED_MODE_AMBER_BLINK, LED_TYPE_LOC_REG_MASK, 0x1f, 0x1c},
{LED_TYPE_LOC, LED_MODE_PURPLE_BLINK, LED_TYPE_LOC_REG_MASK, 0x2f, 0x2a},

{LED_TYPE_FAN, LED_MODE_OFF, LED_TYPE_FAN_REG_MASK, LED_MODE_FAN_OFF_VALUE},
{LED_TYPE_FAN, LED_MODE_RED, LED_TYPE_FAN_REG_MASK, 0x06, 0x06},
{LED_TYPE_FAN, LED_MODE_GREEN, LED_TYPE_FAN_REG_MASK, 0x05, 0x05},

{LED_TYPE_PSU1, LED_MODE_OFF, LED_TYPE_PSU1_REG_MASK, LED_MODE_PSU1_OFF_VALUE},
{LED_TYPE_PSU1, LED_MODE_RED, LED_TYPE_PSU1_REG_MASK, 0x06, 0x06},
{LED_TYPE_PSU1, LED_MODE_GREEN, LED_TYPE_PSU1_REG_MASK, 0x05, 0x05},

{LED_TYPE_PSU2, LED_MODE_OFF, LED_TYPE_PSU2_REG_MASK, LED_MODE_PSU2_OFF_VALUE},
{LED_TYPE_PSU2, LED_MODE_RED, LED_TYPE_PSU2_REG_MASK, 0x06, 0x06},
{LED_TYPE_PSU2, LED_MODE_GREEN, LED_TYPE_PSU2_REG_MASK, 0x05, 0x05},
};


Expand Down Expand Up @@ -298,6 +319,24 @@ static enum led_brightness accton_as7326_56x_led_auto_get(struct led_classdev *c
return LED_MODE_AUTO;
}

static enum led_brightness accton_as7326_56x_led_fan_get(struct led_classdev *cdev)
{
accton_as7326_56x_led_update();
return led_reg_val_to_light_mode(LED_TYPE_FAN, ledctl->reg_val[2]);
}

static enum led_brightness accton_as7326_56x_led_psu1_get(struct led_classdev *cdev)
{
accton_as7326_56x_led_update();
return led_reg_val_to_light_mode(LED_TYPE_PSU1, ledctl->reg_val[3]);
}

static enum led_brightness accton_as7326_56x_led_psu2_get(struct led_classdev *cdev)
{
accton_as7326_56x_led_update();
return led_reg_val_to_light_mode(LED_TYPE_PSU2, ledctl->reg_val[4]);
}

static struct led_classdev accton_as7326_56x_leds[] = {
[LED_TYPE_DIAG] = {
.name = "accton_as7326_56x_led::diag",
Expand All @@ -319,23 +358,23 @@ static struct led_classdev accton_as7326_56x_leds[] = {
.name = "accton_as7326_56x_led::fan",
.default_trigger = "unused",
.brightness_set = accton_as7326_56x_led_auto_set,
.brightness_get = accton_as7326_56x_led_auto_get,
.brightness_get = accton_as7326_56x_led_fan_get,
.flags = LED_CORE_SUSPENDRESUME,
.max_brightness = LED_MODE_AUTO,
},
[LED_TYPE_PSU1] = {
.name = "accton_as7326_56x_led::psu1",
.default_trigger = "unused",
.brightness_set = accton_as7326_56x_led_auto_set,
.brightness_get = accton_as7326_56x_led_auto_get,
.brightness_get = accton_as7326_56x_led_psu1_get,
.flags = LED_CORE_SUSPENDRESUME,
.max_brightness = LED_MODE_AUTO,
},
[LED_TYPE_PSU2] = {
.name = "accton_as7326_56x_led::psu2",
.default_trigger = "unused",
.brightness_set = accton_as7326_56x_led_auto_set,
.brightness_get = accton_as7326_56x_led_auto_get,
.brightness_get = accton_as7326_56x_led_psu2_get,
.flags = LED_CORE_SUSPENDRESUME,
.max_brightness = LED_MODE_AUTO,
},
Expand Down
12 changes: 9 additions & 3 deletions ...platforms/accton/x86-64/as7326-56x/onlp/builds/x86_64_accton_as7326_56x/module/src/ledi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,15 @@ led_light_mode_map_t led_map[] = {
{LED_LOC, LED_MODE_RED_BLINK, ONLP_LED_MODE_RED_BLINKING},
{LED_LOC, LED_MODE_BLUE_BLINK, ONLP_LED_MODE_BLUE_BLINKING},
{LED_LOC, LED_MODE_PURPLE_BLINK, ONLP_LED_MODE_PURPLE_BLINKING},
{LED_FAN, LED_MODE_AUTO, ONLP_LED_MODE_AUTO},
{LED_PSU1, LED_MODE_AUTO, ONLP_LED_MODE_AUTO},
{LED_PSU2, 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_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_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}
};

static char last_path[][10] = /* must map with onlp_led_id */
Expand Down