scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2025-12-25 09:17:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:opencomputeproject/OpenNetworkLinux

Browse Source
This commit is contained in:
Jeffrey Townsend
2018-04-18 17:53:42 +00:00
parent 5da18631b4 ab0f4cc359
commit cf116fb82a
4 changed files with 48 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/modules/builds/x86-64-accton-as6812-32x-fan.c
View File

@@ -32,6 +32,7 @@
#include <linux/kthread.h>
#include <linux/device.h>
#include <linux/platform_device.h>
#include <linux/delay.h>
#define FAN_MAX_NUMBER 5
#define FAN_SPEED_CPLD_TO_RPM_STEP 150
@@ -268,7 +269,7 @@ static int accton_as6812_32x_fan_write_value(u8 reg, u8 value)
static void accton_as6812_32x_fan_update_device(struct device *dev)
{
int speed, r_speed, fault, r_fault, direction, ctrl_speed;
int i;
int i, retry_count;
mutex_lock(&fan_data->update_lock);
@@ -298,6 +299,7 @@ static void accton_as6812_32x_fan_update_device(struct device *dev)
for (i = 0; i < FAN_MAX_NUMBER; i++)
{
retry_count = 5;
/* Update fan data
*/
@@ -314,12 +316,21 @@ static void accton_as6812_32x_fan_update_device(struct device *dev)
/* fan speed
*/
speed = accton_as6812_32x_fan_read_value(fan_speed_reg[i]);
r_speed = accton_as6812_32x_fan_read_value(fanr_speed_reg[i]);
if ( (speed < 0) || (r_speed < 0) )
{
DEBUG_PRINT("[Error!!][%s][%d] \n", __FUNCTION__, __LINE__);
goto _exit; /* error */
while (retry_count) {
retry_count--;
speed = accton_as6812_32x_fan_read_value(fan_speed_reg[i]);
r_speed = accton_as6812_32x_fan_read_value(fanr_speed_reg[i]);
if ( (speed < 0) || (r_speed < 0) )
{
DEBUG_PRINT("[Error!!][%s][%d] \n", __FUNCTION__, __LINE__);
goto _exit; /* error */
}
if ( (speed == 0) || (r_speed == 0) )
{
msleep(200);
continue;
}
break;
}
DEBUG_PRINT("[fan%d:] speed:%d, r_speed=%d \n", i, speed, r_speed);

34
packages/platforms/accton/x86-64/x86-64-accton-as7312-54x/onlp/builds/src/module/src/ledi.c
View File

@@ -80,7 +80,7 @@ led_light_mode_map_t led_map[] = {
{LED_DIAG, LED_MODE_AMBER, ONLP_LED_MODE_ORANGE},
{LED_DIAG, LED_MODE_RED, ONLP_LED_MODE_RED},
{LED_LOC, LED_MODE_OFF, ONLP_LED_MODE_OFF},
{LED_LOC, LED_MODE_BLUE, ONLP_LED_MODE_BLUE},
{LED_LOC, LED_MODE_AMBER, ONLP_LED_MODE_ORANGE},
{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}
@@ -159,15 +159,27 @@ static int onlp_to_driver_led_mode(enum onlp_led_id id, onlp_led_mode_t onlp_led
return 0;
}
/* Get the highest bit position of input value.*/
static int _log2(int val) {
int bits = sizeof(val)*8 - 1;
int i, t;
for (i = bits; i>=0; i--) {
t = (val >> i);
if ( t & 1)
return i;
}
return i;
}
/*
* This function will be called prior to any other onlp_ledi_* functions.
*/
int
onlp_ledi_init(void)
{
onlp_ledi_mode_set(ONLP_LED_ID_CREATE(LED_DIAG), ONLP_LED_MODE_OFF);
onlp_ledi_mode_set(ONLP_LED_ID_CREATE(LED_LOC), ONLP_LED_MODE_OFF);
onlp_ledi_mode_set(ONLP_LED_ID_CREATE(LED_DIAG), ONLP_LED_MODE_OFF);
onlp_ledi_mode_set(ONLP_LED_ID_CREATE(LED_LOC), ONLP_LED_MODE_OFF);
return ONLP_STATUS_OK;
}
@@ -220,9 +232,19 @@ onlp_ledi_set(onlp_oid_t id, int on_or_off)
if (!on_or_off) {
return onlp_ledi_mode_set(id, ONLP_LED_MODE_OFF);
}
} else {
int rv;
return ONLP_STATUS_E_UNSUPPORTED;
onlp_led_mode_t mode = ONLP_LED_MODE_OFF;
onlp_led_info_t led_info;
rv = onlp_ledi_info_get(id, &led_info);
if (rv < 0)
return rv;
/*If multiple color is supported, take the mode at highest bit.*/
mode = _log2(led_info.caps);
return onlp_ledi_mode_set(id, mode);
}
}
/*

31
packages/platforms/accton/x86-64/x86-64-accton-as7326-56x/onlp/builds/src/module/src/platform_lib.c
View File

@@ -5,41 +5,12 @@
#include "x86_64_accton_as7326_56x_log.h"
static int _onlp_file_write(char *filename, char *buffer, int buf_size, int data_len)
{
int fd;
int len;
if ((buffer == NULL) || (buf_size < 0)) {
return -1;
}
if ((fd = open(filename, O_WRONLY, S_IWUSR)) == -1) {
return -1;
}
if ((len = write(fd, buffer, buf_size)) < 0) {
close(fd);
return -1;
}
if ((close(fd) == -1)) {
return -1;
}
if ((len > buf_size) || (data_len != 0 && len != data_len)) {
return -1;
}
return 0;
}
int onlp_file_write_integer(char *filename, int value)
{
char buf[8] = {0};
sprintf(buf, "%d", value);
return _onlp_file_write(filename, buf, (int)strlen(buf), 0);
return onlp_file_write((uint8_t*)buf, strlen(buf), filename);
}
int onlp_file_read_binary(char *filename, char *buffer, int buf_size, int data_len)

2
packages/platforms/accton/x86-64/x86-64-accton-as7326-56x/platform-config/r0/src/python/x86_64_accton_as7326_56x_r0/__init__.py
View File

@@ -6,7 +6,7 @@ class OnlPlatform_x86_64_accton_as7326_56x_r0(OnlPlatformAccton,
PLATFORM='x86-64-accton-as7326-56x-r0'
MODEL="AS7326-56X"
SYS_OBJECT_ID=".7326.54"
SYS_OBJECT_ID=".7326.56"
def baseconfig(self):
self.insmod('optoe')