scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2025-12-26 17:57:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #246 from zhouzi88/master

Browse Source 
as7312 PSU bug fix
This commit is contained in:
Jeffrey Townsend
2017-09-27 15:04:58 -07:00
committed by GitHub
parent 86df0e7c8d e662a9b669
commit 8bae9f4c5d
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/base/any/onlp/src/sff/module/src/sff.c
View File

@@ -142,6 +142,16 @@ sff_module_type_get(const uint8_t* eeprom)
return SFF_MODULE_TYPE_40G_BASE_ER4;
}
if (SFF8472_MODULE_SFP(eeprom)
&& _sff8472_media_sfp28_cr(eeprom)) {
return SFF_MODULE_TYPE_25G_BASE_CR;
}
if (SFF8472_MODULE_SFP(eeprom)
&& _sff8472_media_sfp28_sr(eeprom)) {
return SFF_MODULE_TYPE_25G_BASE_SR;
}
if (SFF8472_MODULE_SFP(eeprom)
&& SFF8472_MEDIA_XGE_SR(eeprom)
&& !_sff8472_media_gbe_sx_fc_hack(eeprom))
@@ -182,16 +192,6 @@ sff_module_type_get(const uint8_t* eeprom)
return SFF_MODULE_TYPE_10G_BASE_CR;
}
if (SFF8472_MODULE_SFP(eeprom)
&& _sff8472_media_sfp28_cr(eeprom)) {
return SFF_MODULE_TYPE_25G_BASE_CR;
}
if (SFF8472_MODULE_SFP(eeprom)
&& _sff8472_media_sfp28_sr(eeprom)) {
return SFF_MODULE_TYPE_25G_BASE_SR;
}
if (SFF8472_MODULE_SFP(eeprom)
&& SFF8472_MEDIA_GBE_SX(eeprom))
return SFF_MODULE_TYPE_1G_BASE_SX;

3
packages/platforms/accton/x86-64/x86-64-accton-as7312-54x/onlp/builds/src/module/src/platform_lib.c
View File

@@ -99,8 +99,7 @@ psu_type_t get_psu_type(int id, char* modelname, int modelname_len)
/* Check AC model name */
node = (id == PSU1_ID) ? PSU1_AC_HWMON_NODE(psu_model_name) : PSU2_AC_HWMON_NODE(psu_model_name);
node = (id == PSU1_ID) ? PSU1_AC_PMBUS_NODE(psu_mfr_model) : PSU2_AC_PMBUS_NODE(psu_mfr_model);
if (onlp_file_read_string(node, model_name, sizeof(model_name), 0) != 0) {
return PSU_TYPE_UNKNOWN;
}

4
packages/platforms/accton/x86-64/x86-64-accton-as7312-54x/onlp/builds/src/module/src/platform_lib.h
View File

@@ -46,8 +46,8 @@
#define PSU1_AC_PMBUS_NODE(node) PSU1_AC_PMBUS_PREFIX#node
#define PSU2_AC_PMBUS_NODE(node) PSU2_AC_PMBUS_PREFIX#node
#define PSU1_AC_HWMON_PREFIX "/sys/bus/i2c/devices/11-0051/"
#define PSU2_AC_HWMON_PREFIX "/sys/bus/i2c/devices/10-0050/"
#define PSU2_AC_HWMON_PREFIX "/sys/bus/i2c/devices/11-0051/"
#define PSU1_AC_HWMON_PREFIX "/sys/bus/i2c/devices/10-0050/"
#define PSU1_AC_HWMON_NODE(node) PSU1_AC_HWMON_PREFIX#node
#define PSU2_AC_HWMON_NODE(node) PSU2_AC_HWMON_PREFIX#node