Skip to content

[AS7816-64x]Add PSU SN to ym2651y drv #7627

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

Closed
wants to merge 4 commits into from
Closed

[AS7816-64x]Add PSU SN to ym2651y drv #7627

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
abcc1a2
[AS7816-64x]Add PSU SN to ym2651y drv
May 17, 2021
51a6390
Modify psu_serial_numn to psu_mfr_serial
Aug 17, 2021
6fbe4e2
Ignore YM-1401A to read SN in pmbus
Jan 6, 2022
2b39cb2
Fix checking model_name for YM-1401A
Jan 11, 2022
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
98 changes: 87 additions & 11 deletions platform/broadcom/sonic-platform-modules-accton/common/modules/ym2651y.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ enum chips {
YM2651,
YM2401,
YM2851,
YPEB1200AM
YM1401A,
YPEB1200AM
};

/* Each client has this additional data
Expand All @@ -66,8 +67,9 @@ struct ym2651y_data {
u16 fan_duty_cycle[2]; /* Register value */
u8 fan_dir[4]; /* Register value */
u8 pmbus_revision; /* Register value */
u8 mfr_serial[21]; /* Register value */
u8 mfr_id[10]; /* Register value */
u8 mfr_model[10]; /* Register value */
u8 mfr_model[16]; /* Register value */
u8 mfr_revsion[3]; /* Register value */
u16 mfr_vin_min; /* Register value */
u16 mfr_vin_max; /* Register value */
Expand Down Expand Up @@ -116,6 +118,7 @@ enum ym2651y_sysfs_attributes {
PSU_MFR_ID,
PSU_MFR_MODEL,
PSU_MFR_REVISION,
PSU_MFR_SERIAL,
PSU_MFR_VIN_MIN,
PSU_MFR_VIN_MAX,
PSU_MFR_VOUT_MIN,
Expand Down Expand Up @@ -144,6 +147,7 @@ static SENSOR_DEVICE_ATTR(psu_pmbus_revision, S_IRUGO, show_byte, NULL, PSU_PM
static SENSOR_DEVICE_ATTR(psu_mfr_id, S_IRUGO, show_ascii, NULL, PSU_MFR_ID);
static SENSOR_DEVICE_ATTR(psu_mfr_model, S_IRUGO, show_ascii, NULL, PSU_MFR_MODEL);
static SENSOR_DEVICE_ATTR(psu_mfr_revision, S_IRUGO, show_ascii, NULL, PSU_MFR_REVISION);
static SENSOR_DEVICE_ATTR(psu_mfr_serial, S_IRUGO, show_ascii, NULL, PSU_MFR_SERIAL);
static SENSOR_DEVICE_ATTR(psu_mfr_vin_min, S_IRUGO, show_linear, NULL, PSU_MFR_VIN_MIN);
static SENSOR_DEVICE_ATTR(psu_mfr_vin_max, S_IRUGO, show_linear, NULL, PSU_MFR_VIN_MAX);
static SENSOR_DEVICE_ATTR(psu_mfr_vout_min, S_IRUGO, show_linear, NULL, PSU_MFR_VOUT_MIN);
Expand Down Expand Up @@ -178,6 +182,7 @@ static struct attribute *ym2651y_attributes[] = {
&sensor_dev_attr_psu_mfr_id.dev_attr.attr,
&sensor_dev_attr_psu_mfr_model.dev_attr.attr,
&sensor_dev_attr_psu_mfr_revision.dev_attr.attr,
&sensor_dev_attr_psu_mfr_serial.dev_attr.attr,
&sensor_dev_attr_psu_mfr_vin_min.dev_attr.attr,
&sensor_dev_attr_psu_mfr_vin_max.dev_attr.attr,
&sensor_dev_attr_psu_mfr_pout_max.dev_attr.attr,
Expand Down Expand Up @@ -355,21 +360,26 @@ static ssize_t show_ascii(struct device *dev, struct device_attribute *da,

switch (attr->index) {
case PSU_FAN_DIRECTION: /* psu_fan_dir */

if (data->chip==YPEB1200AM)
{
memcpy(data->fan_dir, "F2B", 3);
data->fan_dir[3]='\0';
}

ptr = data->fan_dir;
break;
case PSU_MFR_SERIAL: /* psu_mfr_serial */
ptr = data->mfr_serial+1; /* The first byte is the count byte of string. */
break;
case PSU_MFR_ID: /* psu_mfr_id */
ptr = data->mfr_id;
ptr = data->mfr_id+1; /* The first byte is the count byte of string. */
break;
case PSU_MFR_MODEL: /* psu_mfr_model */
ptr = data->mfr_model;
ptr = data->mfr_model+1; /* The first byte is the count byte of string. */
break;
case PSU_MFR_REVISION: /* psu_mfr_revision */
ptr = data->mfr_revsion;
ptr = data->mfr_revsion+1;
break;
default:
return 0;
Expand Down Expand Up @@ -415,7 +425,7 @@ static ssize_t show_vout(struct device *dev, struct device_attribute *da,
struct i2c_client *client = to_i2c_client(dev);
struct ym2651y_data *data = i2c_get_clientdata(client);

if (data->chip == YM2401) {
if (data->chip == YM2401 || data->chip==YM1401A) {
return show_vout_by_mode(dev, da, buf);
}
else {
Expand Down Expand Up @@ -493,6 +503,7 @@ static const struct i2c_device_id ym2651y_id[] = {
{ "ym2651", YM2651 },
{ "ym2401", YM2401 },
{ "ym2851", YM2851 },
{ "ym1401a",YM1401A},
{ "ype1200am", YPEB1200AM },
{}
};
Expand Down Expand Up @@ -561,8 +572,8 @@ static struct ym2651y_data *ym2651y_update_device(struct device *dev)

if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
|| !data->valid) {
int i, status;
u8 command;
int i, status, length;
u8 command, buf;
u8 fan_dir[5] = {0};
struct reg_data_byte regs_byte[] = { {0x19, &data->capability},
{0x20, &data->vout_mode},
Expand Down Expand Up @@ -599,6 +610,7 @@ static struct ym2651y_data *ym2651y_update_device(struct device *dev)
dev_dbg(&client->dev, "reg %d, err %d\n",
regs_byte[i].reg, status);
*(regs_byte[i].value) = 0;
goto exit;
}
else {
*(regs_byte[i].value) = status;
Expand All @@ -614,6 +626,7 @@ static struct ym2651y_data *ym2651y_update_device(struct device *dev)
dev_dbg(&client->dev, "reg %d, err %d\n",
regs_word[i].reg, status);
*(regs_word[i].value) = 0;
goto exit;
}
else {
*(regs_word[i].value) = status;
Expand All @@ -626,28 +639,84 @@ static struct ym2651y_data *ym2651y_update_device(struct device *dev)

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

strncpy(data->fan_dir, fan_dir+1, ARRAY_SIZE(data->fan_dir)-1);
data->fan_dir[ARRAY_SIZE(data->fan_dir)-1] = '\0';


/* Read mfr_id */
command = 0x99;
status = ym2651y_read_block(client, command, data->mfr_id,
ARRAY_SIZE(data->mfr_id)-1);
data->mfr_id[ARRAY_SIZE(data->mfr_id)-1] = '\0';

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

/* Read mfr_model */
command = 0x9a;
status = ym2651y_read_block(client, command, data->mfr_model,
ARRAY_SIZE(data->mfr_model)-1);
data->mfr_model[ARRAY_SIZE(data->mfr_model)-1] = '\0';
length = 1;
/* Read first byte to determine the length of data */
status = ym2651y_read_block(client, command, &buf, length);
if (status < 0) {
dev_dbg(&client->dev, "reg %d, err %d\n", command, status);
goto exit;
}
status = ym2651y_read_block(client, command, data->mfr_model, buf+1);

if ((buf+1) >= (ARRAY_SIZE(data->mfr_model)-1))
{
data->mfr_model[ARRAY_SIZE(data->mfr_model)-1] = '\0';
}
else
data->mfr_model[buf+1] = '\0';

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

/*YM-1401A PSU doens't support to get serial_num, so ignore it.
*It's vout doesn't support linear, so let it use show_vout_by_mode().
*/
if(!strncmp("YM-1401A", data->mfr_model+1, strlen("YM-1401A")))
{
data->chip=YM1401A;
}
else
{
/* Read mfr_serial */
command = 0x9e;
length = 1;
/* Read first byte to determine the length of data */
status = ym2651y_read_block(client, command, &buf, length);
if (status < 0) {
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 ((buf+1) >= (ARRAY_SIZE(data->mfr_serial)-1))
{
data->mfr_serial[ARRAY_SIZE(data->mfr_serial)-1] = '\0';
}
else
data->mfr_serial[buf+1] = '\0';

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



/* Read mfr_revsion */
command = 0x9b;
Expand All @@ -656,12 +725,19 @@ static struct ym2651y_data *ym2651y_update_device(struct device *dev)
data->mfr_revsion[ARRAY_SIZE(data->mfr_revsion)-1] = '\0';

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




data->last_updated = jiffies;
data->valid = 1;
}

exit:
mutex_unlock(&data->update_lock);

return data;
Expand Down