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 pull request #370 from zhouzi88/swl-4464

Browse Source 
Retry fan speed read when we see zero RPM, to make sure it's not a gl…
This commit is contained in:
Jeffrey Townsend
2018-04-18 09:51:21 -07:00
committed by GitHub
parent 9359bf8c4f 1d64485671
commit f77990e8ef
1 changed files with 18 additions and 7 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);