Skip to content

[Accton][AS4630-54pe/te] Support 2nd source PSU #1019

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

Open
roger530-ho wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Accton][AS4630-54pe/te] Support 2nd source PSU #1019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion packages/base/any/kernels/modules/ym2651y.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,9 @@ static ssize_t show_vout(struct device *dev, struct device_attribute *da,
return show_vout_by_mode(dev, da, buf);
}
else if ((strncmp(ptr, "DPS-850A", strlen("DPS-850A")) == 0)||
(strncmp(ptr, "YM-2851J", strlen("YM-2851J")) == 0)) {
(strncmp(ptr, "YM-2851J", strlen("YM-2851J")) == 0) ||
(strncmp(ptr, "UPD1501SA-1190G", strlen("UPD1501SA-1190G")) == 0) ||
(strncmp(ptr, "UPD1501SA-1290G", strlen("UPD1501SA-1290G")) == 0)) {
return show_vout_by_mode(dev, da, buf);
}
else {
Expand Down
142 changes: 112 additions & 30 deletions packages/platforms/accton/x86-64/as4630-54pe/modules/builds/x86-64-accton-as4630-54pe-psu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#define MAX_MODEL_NAME 20
#define MAX_SERIAL_NUMBER 19

static int models_min_offset = 0;
static ssize_t show_status(struct device *dev, struct device_attribute *da, char *buf);
static ssize_t show_string(struct device *dev, struct device_attribute *da, char *buf);
static int as4630_54pe_psu_read_block(struct i2c_client *client, u8 command, u8 *data,int data_len);
Expand Down Expand Up @@ -68,6 +69,37 @@ enum as4630_54pe_psu_sysfs_attributes {
PSU_SERIAL_NUMBER
};

enum psu_type {
PSU_YPEB1200, /* F2B */
PSU_YPEB1200AM, /* F2B */
PSU_UP1K21R_1085G, /* F2B */
UNKNOWN_PSU
};

struct model_name_info {
enum psu_type type;
u8 offset;
u8 length;
char* model_name;
};

struct model_name_info models[] = {
{ PSU_YPEB1200, 0x20, 11, "YPEB1200" },
{ PSU_YPEB1200AM, 0x20, 11, "YPEB1200AM" }, /* Replace YPEB1200-AM to YPEB1200AM */
{ PSU_UP1K21R_1085G, 0x20, 13, "UP1K21R-1085G" },
};

struct serial_number_info {
u8 offset;
u8 length;
};

struct serial_number_info serials[] = {
[PSU_YPEB1200] = { 0x35, 17 },
[PSU_YPEB1200AM] = { 0x35, 18 },
[PSU_UP1K21R_1085G] = { 0x3B, 9 },
};

/* sysfs attributes for hwmon
*/
static SENSOR_DEVICE_ATTR(psu_present, S_IRUGO, show_status, NULL, PSU_PRESENT);
Expand Down Expand Up @@ -148,6 +180,18 @@ static const struct attribute_group as4630_54pe_psu_group = {
.attrs = as4630_54pe_psu_attributes,
};

static int find_models_min_offset(void) {
int i, min_offset = models[0].offset;

for(i = 1; i < ARRAY_SIZE(models); i++) {
if(models[i].offset < min_offset) {
min_offset = models[i].offset;
}
}

return min_offset;
}

static int as4630_54pe_psu_probe(struct i2c_client *client,
const struct i2c_device_id *dev_id)
{
Expand All @@ -169,6 +213,7 @@ static int as4630_54pe_psu_probe(struct i2c_client *client,
data->valid = 0;
data->index = dev_id->driver_data;
mutex_init(&data->update_lock);
models_min_offset = find_models_min_offset();

dev_info(&client->dev, "chip found\n");

Expand Down Expand Up @@ -266,11 +311,12 @@ static struct as4630_54pe_psu_data *as4630_54pe_psu_update_device(struct device
{
struct i2c_client *client = to_i2c_client(dev);
struct as4630_54pe_psu_data *data = i2c_get_clientdata(client);
char temp_model_name[MAX_MODEL_NAME] = {0};

if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
|| !data->valid) {
int status;
int power_good = 0;
int i, power_good = 0;

dev_dbg(&client->dev, "Starting as4630_54pe update\n");

Expand All @@ -293,47 +339,83 @@ static struct as4630_54pe_psu_data *as4630_54pe_psu_update_device(struct device
power_good = ( (data->status >> 2) & 0x1);

if (power_good) {
status = as4630_54pe_psu_read_block(client, 0x20, data->model_name,
ARRAY_SIZE(data->model_name)-1);
enum psu_type type = UNKNOWN_PSU;

status = as4630_54pe_psu_read_block(client, models_min_offset,
temp_model_name,
ARRAY_SIZE(temp_model_name));
if (status < 0) {
data->model_name[0] = '\0';
dev_dbg(&client->dev, "unable to read model name from (0x%x)\n", client->addr);
goto exit;
}
else if(!strncmp(data->model_name, "YPEB1200", strlen("YPEB1200")))
{
if (data->model_name[9]=='A' && data->model_name[10]=='M')
{
data->model_name[8]='A';
data->model_name[9]='M';
data->model_name[strlen("YPEB1200AM")]='\0';
}
else
data->model_name[strlen("YPEB1200")]='\0';
}
else
{
data->model_name[ARRAY_SIZE(data->model_name)-1] = '\0';

for (i = 0; i < ARRAY_SIZE(models); i++) {
if ((models[i].length+1) > ARRAY_SIZE(data->model_name)) {
dev_dbg(&client->dev,
"invalid models[%d].length(%d), should not exceed the size of data->model_name(%ld)\n",
i, models[i].length, ARRAY_SIZE(data->model_name));
continue;
}

snprintf(data->model_name, models[i].length + 1, "%s",
temp_model_name + (models[i].offset - models_min_offset));

if(!strncmp(data->model_name, "YPEB1200", strlen("YPEB1200")))
{
if (data->model_name[9]=='A' && data->model_name[10]=='M')
{
data->model_name[8]='A';
data->model_name[9]='M';
data->model_name[strlen("YPEB1200AM")]='\0';
}
else
data->model_name[strlen("YPEB1200")]='\0';
}

/* Determine if the model name is known, if not, read next index */
if (strcmp(data->model_name, models[i].model_name) == 0) {
type = models[i].type;
break;
}

data->model_name[0] = '\0';
}
/* Read from offset 0x35 ~ 0x46 (18 bytes) */
status = as4630_54pe_psu_read_block(client, 0x35,data->serial_number, MAX_SERIAL_NUMBER);
if (status < 0)
{
data->serial_number[0] = '\0';
dev_dbg(&client->dev, "unable to read model name from (0x%x) offset(0x35)\n", client->addr);

if (type < ARRAY_SIZE(serials)) {
if ((serials[type].length+1) > ARRAY_SIZE(data->serial_number)) {
dev_dbg(&client->dev,
"invalid serials[%d].length(%d), should not exceed the size of data->serial_number(%ld)\n",
type, serials[type].length, ARRAY_SIZE(data->serial_number));
goto exit;
}

memset(data->serial_number, 0, sizeof(data->serial_number));
status = as4630_54pe_psu_read_block(client, serials[type].offset,
data->serial_number,
serials[type].length);
if (status < 0) {
dev_dbg(&client->dev,
"unable to read serial from (0x%x) offset(0x%02x)\n",
client->addr, serials[type].length);
goto exit;
}
else {
data->serial_number[serials[type].length]= '\0';
}
}
if (!strncmp(data->model_name, "YPEB1200AM", strlen("YPEB1200AM"))) /*for YPEB1200AM, SN length=18*/
{
data->serial_number[MAX_SERIAL_NUMBER-1]='\0';
else {
dev_dbg(&client->dev, "invalid PSU type(%d)\n", type);
return data;
}
else
data->serial_number[MAX_SERIAL_NUMBER-2]='\0';

}


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

exit:

return data;
}

Expand Down
5 changes: 4 additions & 1 deletion ...atforms/accton/x86-64/as4630-54pe/onlp/builds/x86_64_accton_as4630_54pe/module/src/fani.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,10 @@ _onlp_get_fan_direction_on_psu(void)
continue;
}

if (PSU_TYPE_AC_F2B == psu_type) {
if (PSU_TYPE_ACBEL == psu_type ||
PSU_TYPE_YM2651Y == psu_type ||
PSU_TYPE_YPEB1200A == psu_type ||
PSU_TYPE_UP1K21R_1085G == psu_type) {
return ONLP_FAN_STATUS_F2B;
}
else {
Expand Down
9 changes: 8 additions & 1 deletion ...accton/x86-64/as4630-54pe/onlp/builds/x86_64_accton_as4630_54pe/module/src/platform_lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ int onlp_file_read_string(char *filename, char *buffer, int buf_size, int data_l
return ret;
}

#define I2C_PSU_MODEL_NAME_LEN 11
#define I2C_PSU_MODEL_NAME_LEN 14
#define I2C_PSU_FAN_DIR_LEN 3

psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
Expand Down Expand Up @@ -126,6 +126,13 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
aim_strlcpy(modelname, model_name, (modelname_len>strlen(model_name))?strlen(model_name):modelname_len-1);
return PSU_TYPE_YPEB1200A;
}

if (!strncmp(model_name, "UP1K21R-1085G", strlen("UP1K21R-1085G")))
{
if (modelname)
aim_strlcpy(modelname, model_name, (modelname_len>strlen(model_name))?strlen(model_name):modelname_len-1);
return PSU_TYPE_UP1K21R_1085G;
}
return PSU_TYPE_UNKNOWN;
}
int
Expand Down
1 change: 1 addition & 0 deletions ...accton/x86-64/as4630-54pe/onlp/builds/x86_64_accton_as4630_54pe/module/src/platform_lib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ typedef enum psu_type {
PSU_TYPE_ACBEL,
PSU_TYPE_YM2651Y,
PSU_TYPE_YPEB1200A,
PSU_TYPE_UP1K21R_1085G,
PSU_TYPE_AC_F2B,
PSU_TYPE_AC_B2F
} psu_type_t;
Expand Down
1 change: 1 addition & 0 deletions ...atforms/accton/x86-64/as4630-54pe/onlp/builds/x86_64_accton_as4630_54pe/module/src/psui.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ onlp_psui_info_get(onlp_oid_t id, onlp_psu_info_t* info)
break;
case PSU_TYPE_YM2651Y:
case PSU_TYPE_YPEB1200A:
case PSU_TYPE_UP1K21R_1085G:
ret = psu_ym2651y_info_get(info);
break;
case PSU_TYPE_UNKNOWN: /* User insert a unknown PSU or unplugged.*/
Expand Down
Loading