Skip to content

Commit 743b7e8

Browse files
author
Willy Liu
committed
[ACCTON][AS9716-32D] Correct psu fan direction
1. Support psu FSH095, FSH019 2. Add psu fan dir 3. Modify status to UNPLUGGED when power isn't good 4. Show psu serial and model when power isn't good 5. Show full model name for 3Y PSU Signed-off-by: Willy Liu <willy@accton.com>
1 parent a134cb0 commit 743b7e8

5 files changed

Lines changed: 104 additions & 69 deletions

File tree

‎packages/platforms/accton/x86-64/as9716_32d/modules/builds/x86-64-accton-as9716-32d-psu.c‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include <linux/delay.h>
3535
#include <linux/dmi.h>
3636

37-
#define MAX_MODEL_NAME 16
37+
#define MAX_MODEL_NAME 20
3838
#define MAX_SERIAL_NUMBER 20
3939

4040
static ssize_t show_status(struct device *dev, struct device_attribute *da, char *buf);
@@ -75,7 +75,6 @@ static SENSOR_DEVICE_ATTR(psu_model_name, S_IRUGO, show_string, NULL, PSU_MOD
7575
static SENSOR_DEVICE_ATTR(psu_power_good, S_IRUGO, show_status, NULL, PSU_POWER_GOOD);
7676
static SENSOR_DEVICE_ATTR(psu_serial_number, S_IRUGO, show_string, NULL, PSU_SERIAL_NUMBER);
7777

78-
7978
static struct attribute *as9716_32d_psu_attributes[] = {
8079
&sensor_dev_attr_psu_present.dev_attr.attr,
8180
&sensor_dev_attr_psu_model_name.dev_attr.attr,
@@ -270,72 +269,73 @@ static struct as9716_32d_psu_data *as9716_32d_psu_update_device(struct device *d
270269
if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
271270
|| !data->valid) {
272271
int status;
273-
int power_good = 0;
274272

275273
dev_dbg(&client->dev, "Starting as9716_32d update\n");
276274

277275
/* Read psu status */
278276
status = as9716_32d_cpld_read(0x60, 0x3);
279-
280277
if (status < 0) {
281278
dev_dbg(&client->dev, "cpld reg 0x60 err %d\n", status);
282279
}
283280
else {
284281
data->status = status;
285282
}
286-
287283
/* Read model name */
288284
memset(data->model_name, 0, sizeof(data->model_name));
289285
memset(data->serial_number, 0, sizeof(data->serial_number));
290-
power_good = (data->status >> (3-data->index) & 0x1);
291-
292-
if (power_good) {
293-
status = as9716_32d_psu_read_block(client, 0x20, data->model_name,
286+
287+
status = as9716_32d_psu_read_block(client, 0x20, data->model_name,
294288
ARRAY_SIZE(data->model_name)-1);
295-
if (status < 0) {
296-
data->model_name[0] = '\0';
297-
dev_dbg(&client->dev, "unable to read model name from (0x%x)\n", client->addr);
289+
if (status < 0) {
290+
data->model_name[0] = '\0';
291+
dev_dbg(&client->dev, "unable to read model name from (0x%x)\n", client->addr);
292+
}
293+
else
294+
{
295+
if (!strncmp(data->model_name, "FSH082", strlen("FSH082")))
296+
{
297+
data->model_name[strlen("FSH082")]='\0';
298298
}
299-
else
299+
else if (!strncmp(data->model_name, "FSH095", strlen("FSH095")))
300300
{
301-
if (!strncmp(data->model_name, "FSH082", strlen("FSH082")))
302-
{
303-
data->model_name[strlen("FSH082")]='\0';
304-
}
305-
else if (!strncmp(data->model_name, "YESM1300", strlen("YESM1300")))
306-
{
307-
if (data->model_name[9]=='A' && data->model_name[10]=='M')
308-
{
309-
data->model_name[8]='A';
310-
data->model_name[9]='M';
311-
data->model_name[strlen("YESM1300AM")]='\0';
312-
}
313-
else
314-
data->model_name[strlen("YESM1300")]='\0';
315-
}
316-
else if (!strncmp(data->model_name, "YM-2651Y", strlen("YM-2651Y")))
301+
data->model_name[strlen("FSH095")]='\0';
302+
}
303+
else if (!strncmp(data->model_name, "FSF019", strlen("FSF019")))
304+
{
305+
data->model_name[strlen("FSF019")]='\0';
306+
}
307+
else if (!strncmp(data->model_name, "YESM1300", strlen("YESM1300")))
308+
{
309+
/* Adjust model name for YESM1300AM-2A01P10 and YESM1300AM-2R01P10 */
310+
memmove(&data->model_name[8], &data->model_name[9], 10);
311+
if (data->model_name[8]=='A' && data->model_name[9]=='M')
317312
{
318-
data->model_name[strlen("YM-2651Y")]='\0';
319-
}
313+
data->model_name[strlen("YESM1300AM-2A01P10")]='\0';
314+
}
320315
else
321-
data->model_name[ARRAY_SIZE(data->model_name)-1] = '\0';
322-
316+
data->model_name[strlen("YESM1300")]='\0';
323317
}
324-
/* Read from offset 0x35 ~ 0x47 */
325-
status = as9716_32d_psu_read_block(client, 0x35,data->serial_number, MAX_SERIAL_NUMBER);
326-
if (status < 0)
318+
else if (!strncmp(data->model_name, "YM-2651Y", strlen("YM-2651Y")))
327319
{
328-
data->serial_number[0] = '\0';
329-
dev_dbg(&client->dev, "unable to read model name from (0x%x) offset(0x2e)\n", client->addr);
320+
data->model_name[strlen("YM-2651Y")]='\0';
330321
}
331-
if (!strncmp(data->model_name, "YESM1300AM", strlen("YESM1300AM"))) /*for YESM1300AM, SN length=19*/
332-
{
333-
data->serial_number[MAX_SERIAL_NUMBER-1]='\0';
334-
}
335-
else /*for FSH082, SN length=18*/
336-
data->serial_number[MAX_SERIAL_NUMBER-2]='\0';
337-
322+
else
323+
data->model_name[ARRAY_SIZE(data->model_name)-1] = '\0';
324+
}
325+
/* Read from offset 0x35 ~ 0x47 */
326+
status = as9716_32d_psu_read_block(client, 0x35,data->serial_number, MAX_SERIAL_NUMBER);
327+
if (status < 0)
328+
{
329+
data->serial_number[0] = '\0';
330+
dev_dbg(&client->dev, "unable to read model name from (0x%x) offset(0x2e)\n", client->addr);
331+
}
332+
if ((!strncmp(data->model_name, "YESM1300AM-2A01P10", strlen("YESM1300AM-2A01P10")))
333+
|| (!strncmp(data->model_name, "YESM1300AM-2R01P10", strlen("YESM1300AM-2R01P10"))) ) /*for YESM1300AM, SN length=19*/
334+
{
335+
data->serial_number[MAX_SERIAL_NUMBER-1]='\0';
338336
}
337+
else /*for FSH082, SN length=18*/
338+
data->serial_number[MAX_SERIAL_NUMBER-2]='\0';
339339

340340
data->last_updated = jiffies;
341341
data->valid = 1;

‎packages/platforms/accton/x86-64/as9716_32d/onlp/builds/x86_64_accton_as9716_32d/module/src/fani.c‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,9 @@ _onlp_get_fan_direction_on_psu(void)
182182
continue;
183183
}
184184

185-
if (PSU_TYPE_AC_F2B == psu_type) {
185+
if ((PSU_TYPE_ACBEL_FSH082_F2B == psu_type)
186+
|| (PSU_TYPE_ACBEL_FSF019_F2B == psu_type)
187+
|| (PSU_TYPE_3Y_YESM1300AM_2A_F2B == psu_type)) {
186188
return ONLP_FAN_STATUS_F2B;
187189
}
188190
else {
@@ -193,13 +195,13 @@ _onlp_get_fan_direction_on_psu(void)
193195
return 0;
194196
}
195197

198+
196199
static int
197200
_onlp_fani_info_get_fan_on_psu(int pid, onlp_fan_info_t* info)
198201
{
199-
int val = 0;
200-
201-
info->status |= ONLP_FAN_STATUS_PRESENT;
202+
int val = 0;
202203

204+
info->status |= ONLP_FAN_STATUS_PRESENT;
203205
/* get fan direction
204206
*/
205207
info->status |= _onlp_get_fan_direction_on_psu();
@@ -214,7 +216,7 @@ _onlp_fani_info_get_fan_on_psu(int pid, onlp_fan_info_t* info)
214216
*/
215217
if (psu_ym2651y_pmbus_info_get(pid, "psu_fan1_speed_rpm", &val) == ONLP_STATUS_OK) {
216218
info->rpm = val;
217-
info->percentage = (info->rpm * 100) / MAX_PSU_FAN_SPEED;
219+
info->percentage = (info->rpm * 100) / MAX_PSU_FAN_SPEED;
218220
}
219221

220222
return ONLP_STATUS_OK;

‎packages/platforms/accton/x86-64/as9716_32d/onlp/builds/x86_64_accton_as9716_32d/module/src/platform_lib.c‎

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ int onlp_file_read_string(char *filename, char *buffer, int buf_size, int data_l
9090
return ret;
9191
}
9292

93-
#define I2C_PSU_MODEL_NAME_LEN 10
93+
#define I2C_PSU_MODEL_NAME_LEN 20
9494
#define I2C_PSU_FAN_DIR_LEN 3
9595

9696
psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
@@ -99,34 +99,54 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
9999
char model_name[I2C_PSU_MODEL_NAME_LEN + 1] = {0};
100100

101101
/* Check model name */
102-
node = (id == PSU1_ID) ? PSU1_AC_PMBUS_NODE(psu_mfr_model) : PSU2_AC_PMBUS_NODE(psu_mfr_model);
102+
node = (id == PSU1_ID) ? PSU1_AC_HWMON_NODE(psu_model_name) : PSU2_AC_HWMON_NODE(psu_model_name);
103103
memset(model_name, 0x0, I2C_PSU_MODEL_NAME_LEN + 1);
104104
memset(modelname, 0x0, modelname_len);
105105

106106
if (onlp_file_read_string(node, model_name, sizeof(model_name), 0) != 0) {
107-
108107
return PSU_TYPE_UNKNOWN;
109108
}
110-
109+
111110
if (!strncmp(model_name, "FSH082", strlen("FSH082")))
112111
{
113112
if (modelname)
114113
aim_strlcpy(modelname, model_name, strlen("FSH082")<(modelname_len-1)?(strlen("FSH082")+1):(modelname_len-1));
115-
116-
return PSU_TYPE_ACBEL;
114+
return PSU_TYPE_ACBEL_FSH082_F2B;
117115
}
118-
119-
if (!strncmp(model_name, "YESM1300AM", strlen("YESM1300AM")))
116+
117+
if (!strncmp(model_name, "FSH095", strlen("FSH095")))
120118
{
121119
if (modelname)
122-
aim_strlcpy(modelname, model_name, strlen("YESM1300AM")<(modelname_len-1)?(strlen("YESM1300AM")+1):(modelname_len-1));
120+
aim_strlcpy(modelname, model_name, strlen("FSH095")<(modelname_len-1)?(strlen("FSH095")+1):(modelname_len-1));
121+
return PSU_TYPE_ACBEL_FSH095_B2F;
122+
}
123123

124-
return PSU_TYPE_YESM1300;
124+
if (!strncmp(model_name, "FSF019", strlen("FSF019")))
125+
{
126+
if (modelname)
127+
aim_strlcpy(modelname, model_name, strlen("FSF019")<(modelname_len-1)?(strlen("FSF019")+1):(modelname_len-1));
128+
return PSU_TYPE_ACBEL_FSF019_F2B;
129+
}
130+
131+
if (!strncmp(model_name, "YESM1300AM", strlen("YESM1300AM")))
132+
{
133+
if (strstr(model_name, "-2A"))
134+
{
135+
if (modelname)
136+
aim_strlcpy(modelname, model_name, strlen("YESM1300AM-2A01P10")<(modelname_len-1)?(strlen("YESM1300AM-2A01P10")+1):(modelname_len-1));
137+
return PSU_TYPE_3Y_YESM1300AM_2A_F2B;
138+
}
139+
else if (strstr(model_name, "-2R"))
140+
{
141+
if (modelname)
142+
aim_strlcpy(modelname, model_name, strlen("YESM1300AM-2R01P10")<(modelname_len-1)?(strlen("YESM1300AM-2R01P10")+1):(modelname_len-1));
143+
return PSU_TYPE_3Y_YESM1300AM_2R_B2F;
144+
}
125145
}
126146
if (!strncmp(model_name, "YM-2651Y", strlen("YM-2651Y")))
127147
{
128148
if (modelname)
129-
aim_strlcpy(modelname, model_name, modelname_len-1);
149+
aim_strlcpy(modelname, model_name, modelname_len-1);
130150
return PSU_TYPE_YM2651Y;
131151
}
132152

‎packages/platforms/accton/x86-64/as9716_32d/onlp/builds/x86_64_accton_as9716_32d/module/src/platform_lib.h‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,12 @@ int psu_status_info_get(int id, char *node, int *value);
7676

7777
typedef enum psu_type {
7878
PSU_TYPE_UNKNOWN,
79-
PSU_TYPE_ACBEL,
80-
PSU_TYPE_YESM1300,
81-
PSU_TYPE_YM2651Y,
82-
PSU_TYPE_AC_F2B,
83-
PSU_TYPE_AC_B2F
79+
PSU_TYPE_ACBEL_FSH082_F2B,
80+
PSU_TYPE_ACBEL_FSH095_B2F,
81+
PSU_TYPE_ACBEL_FSF019_F2B,
82+
PSU_TYPE_3Y_YESM1300AM_2A_F2B,
83+
PSU_TYPE_3Y_YESM1300AM_2R_B2F,
84+
PSU_TYPE_YM2651Y
8485
} psu_type_t;
8586

8687
psu_type_t get_psu_type(int id, char* modelname, int modelname_len);
@@ -94,5 +95,14 @@ int psu_serial_number_get(int id, char *serial, int serial_len, char* model_name
9495
#define DEBUG_PRINT(format, ...)
9596
#endif
9697

98+
#define AIM_FREE_IF_PTR(p) \
99+
do \
100+
{ \
101+
if (p) { \
102+
aim_free(p); \
103+
p = NULL; \
104+
} \
105+
} while (0)
106+
97107
#endif /* __PLATFORM_LIB_H__ */
98108

‎packages/platforms/accton/x86-64/as9716_32d/onlp/builds/x86_64_accton_as9716_32d/module/src/psui.c‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ onlp_psui_info_get(onlp_oid_t id, onlp_psu_info_t* info)
182182
}
183183

184184
if (val != PSU_STATUS_POWER_GOOD) {
185-
info->status |= ONLP_PSU_STATUS_FAILED;
185+
info->status |= ONLP_PSU_STATUS_UNPLUGGED;
186186
}
187187

188188
/* Get PSU type
@@ -191,8 +191,11 @@ onlp_psui_info_get(onlp_oid_t id, onlp_psu_info_t* info)
191191

192192

193193
switch (psu_type) {
194-
case PSU_TYPE_ACBEL:
195-
case PSU_TYPE_YESM1300:
194+
case PSU_TYPE_ACBEL_FSH082_F2B:
195+
case PSU_TYPE_ACBEL_FSH095_B2F:
196+
case PSU_TYPE_ACBEL_FSF019_F2B:
197+
case PSU_TYPE_3Y_YESM1300AM_2A_F2B:
198+
case PSU_TYPE_3Y_YESM1300AM_2R_B2F:
196199
ret = psu_data_info_get(info);
197200
break;
198201
case PSU_TYPE_YM2651Y:

0 commit comments

Comments
 (0)