Skip to content
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

Jump to bottom

[AS5835-54x] Support psu_fan_dir sysfs for YM-1401A PSU #884

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[AS5835-54x] Support psu_fan_dir sysfs for YM-1401A PSU #884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2fab66d
[AS5835-54x] Support psu_fan_dir sysfs for YM-1401A PSU
May 3, 2022
b01a015
Merge branch 'master' into as5835_54x_psu_fan_dir_20220503
jostar-yang Jun 13, 2024
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
29 changes: 18 additions & 11 deletions packages/base/any/kernels/modules/ym2651y.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,18 +872,25 @@ static struct ym2651y_data *ym2651y_update_device(struct device *dev)
dev_dbg(&client->dev, "reg %d, err %d\n", command, status);
goto exit;
}

status = ym2651y_read_block(client, command, data->mfr_serial, buf+1);
if (data->mfr_serial[0] < ARRAY_SIZE(data->mfr_serial)-2) {
data->mfr_serial[data->mfr_serial[0] + 1] = '\0';
}
else {
data->mfr_serial[ARRAY_SIZE(data->mfr_serial)-1] = '\0';
if(!strncmp("YM-1401A", data->mfr_model+1, strlen("YM-1401A")))
{
data->mfr_serial[0] = '\0';
data->fan_dir[0] = '\0';
}

if (status < 0) {
dev_dbg(&client->dev, "reg %d, err %d\n", command, status);
goto exit;
else
{
status = ym2651y_read_block(client, command, data->mfr_serial, buf+1);
if (data->mfr_serial[0] < ARRAY_SIZE(data->mfr_serial)-2) {
data->mfr_serial[data->mfr_serial[0] + 1] = '\0';
}
else {
data->mfr_serial[ARRAY_SIZE(data->mfr_serial)-1] = '\0';
}

if (status < 0) {
dev_dbg(&client->dev, "reg %d, err %d\n", command, status);
goto exit;
}
}
}

Expand Down
27 changes: 25 additions & 2 deletions packages/platforms/accton/x86-64/as5835-54x/modules/builds/x86-64-accton-as5835-54x-psu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@
#define SERIAL_NUM_LEN 18
#define SERIAL_NUM_REG_OFFSET 0x35


#define FAN_DIR_LEN 3

#define IS_POWER_GOOD(id, value) (!!(value & BIT(id*4 + 1)))
#define IS_PRESENT(id, value) (!(value & BIT(id*4)))

Expand All @@ -66,6 +69,7 @@ struct as5835_54x_psu_data {
u8 status; /* Status(present/power_good) register read from CPLD */
char model_name[MODEL_NAME_LEN+1]; /* Model name, read from eeprom */
char serial[SERIAL_NUM_LEN+1]; /* Serial number, read from eeprom*/
char fan_dir[FAN_DIR_LEN+1]; /* fan_dir, read from model_name to get F2B or B2F*/
};

static struct as5835_54x_psu_data *as5835_54x_psu_update_device(struct device *dev);
Expand All @@ -74,7 +78,8 @@ enum as5835_54x_psu_sysfs_attributes {
PSU_PRESENT,
PSU_MODEL_NAME,
PSU_POWER_GOOD,
PSU_SERIAL_NUMBER
PSU_SERIAL_NUMBER,
PSU_FAN_DIR
};

/* sysfs attributes for hwmon
Expand All @@ -83,12 +88,14 @@ static SENSOR_DEVICE_ATTR(psu_present, S_IRUGO, show_status, NULL, PSU_PRESENT);
static SENSOR_DEVICE_ATTR(psu_model_name, S_IRUGO, show_string, NULL, PSU_MODEL_NAME);
static SENSOR_DEVICE_ATTR(psu_power_good, S_IRUGO, show_status, NULL, PSU_POWER_GOOD);
static SENSOR_DEVICE_ATTR(psu_serial_numer, S_IRUGO, show_string, NULL, PSU_SERIAL_NUMBER);
static SENSOR_DEVICE_ATTR(psu_fan_dir, S_IRUGO, show_string, NULL, PSU_FAN_DIR);

static struct attribute *as5835_54x_psu_attributes[] = {
&sensor_dev_attr_psu_present.dev_attr.attr,
&sensor_dev_attr_psu_model_name.dev_attr.attr,
&sensor_dev_attr_psu_power_good.dev_attr.attr,
&sensor_dev_attr_psu_serial_numer.dev_attr.attr,
&sensor_dev_attr_psu_fan_dir.dev_attr.attr,
NULL
};

Expand Down Expand Up @@ -138,9 +145,13 @@ static ssize_t show_string(struct device *dev, struct device_attribute *da,
if (attr->index == PSU_MODEL_NAME) {
str = data->model_name;
}
else { /* PSU_SERIAL_NUBMER */
else if ( attr->index == PSU_SERIAL_NUMBER ) {
str = data->serial;
}
else {
str = data->fan_dir;
}


mutex_unlock(&data->update_lock);
return sprintf(buf, "%s\n", str);
Expand Down Expand Up @@ -311,6 +322,7 @@ static struct as5835_54x_psu_data *as5835_54x_psu_update_device(struct device *d

memset(data->model_name, 0, sizeof(data->model_name));
memset(data->serial, 0, sizeof(data->serial));
memset(data->fan_dir, 0, sizeof(data->fan_dir));

if (IS_PRESENT(data->index, data->status)) {
/* Read model name */
Expand Down Expand Up @@ -339,6 +351,17 @@ static struct as5835_54x_psu_data *as5835_54x_psu_update_device(struct device *d
else {
data->serial[SERIAL_NUM_LEN] = '\0';
}
/*if model name = YM-1401A. */
if (!strncmp(data->model_name, "YM-1401ABR", strlen("YM-1401ABR")) )
{
strncpy(data->fan_dir, "F2B", FAN_DIR_LEN);
}
else if (!strncmp(data->model_name, "YM-1401ACR", strlen("YM-1401ACR")) )
{
strncpy(data->fan_dir, "B2F", FAN_DIR_LEN); /*YM-1401ACR*/
}
else
data->fan_dir[0]='\0';
}

data->last_updated = jiffies;
Expand Down
5 changes: 3 additions & 2 deletions ...s/accton/x86-64/as5835-54x/onlp/builds/x86_64_accton_as5835_54x/module/src/platform_lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,9 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)

if (strncmp(mn, "YM-1401A", 8) == 0) {
char *fd = NULL;

node = (id == PSU1_ID) ? PSU1_AC_PMBUS_NODE(psu_fan_dir) : PSU2_AC_PMBUS_NODE(psu_fan_dir);

node = (id == PSU1_ID) ? PSU1_AC_HWMON_NODE(psu_fan_dir) : PSU2_AC_HWMON_NODE(psu_fan_dir);

ret = onlp_file_read_str(&fd, node);

if (ret <= 0 || ret > PSU_FAN_DIR_LEN || fd == NULL) {
Expand Down