Skip to content

Commit effe0e2

Browse files
fengkmfengkm
committed
tag onlpv1-py3-r6.1.3.1 from ufi-onlpv1-py3-dev branch (commit d83ebe6) with specific changes (R)
-------------------------------------------- 01. [All][Common] ------------- No Update 02. [S6301-56ST][r2.0.4] ------ No Update 03. [S6301-56STP][r2.0.5] ----- No Update 04. [S7801-54XS][r2.0.5] ------ No Update 05. [S8901-54XC][r2.0.5] ------ No Update 06. [S9110-32X][r2.0.5] ------- No Update 07. [S9300-32D][r2.0.7] ------- No Update 08. [S9301-32D][r2.0.6] ------- No Update 09. [S9301-32DB][r2.0.6] ------ No Update 10. [S9310-32D][r2.0.0] ------- No Update 11. [S9311-64D][r1.0.5] ------- No Update 12. [S9321-64E][r2.0.6] ------- No Update 13. [S9321-64EO][r2.0.6] ------ No Update 14. [S9500-22XST][r0.13] ------ No Update 15. [S9500-54CF][r2.0.0] ------ No Update 16. [S9501-16SMT][r1.0.17] ---- No Update 17. [S9501-18SMT][r1.0.22] ---- No Update 18. [S9501-28SMT][r1.0.24] ---- No Update 19. [S9502-12SM][r1.0.13] ----- No Update 20. [S9502-16SMT][r1.0.13] ---- No Update 21. [S9510-28DC][r2.0.4.1] - [x] revert the BIOS version tag format in onlpdump -x from "[BIOS]" to "[BIOS ]". - [x] revert the BMC version tag format in onlpdump -x from "[BMC]" to "[BMC ]". - [x] remove AIM_LOG_INFO messages in sfpi.c when calling onlp_sfpi_* APIs and the transceiver module is absent. 22. [S9510-30XC][r2.0.4] ------ No Update 23. [S9511-20CT][r1.0.2] ------ No Update 24. [S9600-28DX][r2.0.4] ------ No Update 25. [S9600-30DX][r2.0.4.1] - [x] revert the BIOS version tag format in onlpdump -x from "[BIOS]" to "[BIOS ]". - [x] revert the BMC version tag format in onlpdump -x from "[BMC]" to "[BMC ]". - [x] remove AIM_LOG_INFO messages in sfpi.c when calling onlp_sfpi_* APIs and the transceiver module is absent. 26. [S9600-32X][r2.0.4] ------- No Update 27. [S9600-48X][r2.0.0] ------- No Update 28. [S9600-56DX][r2.0.4] ------ No Update 29. [S9600-64X][r2.0.4] ------- No Update 30. [S9600-72XC][r2.0.4] ------ No Update 31. [S9600-102XC][r2.0.4] ----- No Update 32. [S9601-102XC][r1.0.3] ----- No Update 33. [S9601-104BC][r2.0.5] ----- No Update 34. [S9610-36D][r2.0.5] ------- No Update 35. [S9610-46DX][r2.0.5] ------ No Update 36. [S9610-48DX][r2.0.4.1] - [x] revert the BIOS version tag format in onlpdump -x from "[BIOS]" to "[BIOS ]". - [x] revert the BMC version tag format in onlpdump -x from "[BMC]" to "[BMC ]". - [x] remove AIM_LOG_INFO messages in sfpi.c when calling onlp_sfpi_* APIs and the transceiver module is absent. 37. [S9611-36D][r1.0.2] ------- No Update 38. [S9620-32E][r1.0.1] ------- No Update 39. [S9620-40DG][r1.0.0] ------ No Update 40. [S9620-54DC][r1.0.3] ------ No Update 41. [S9700-23D][r5.0.4] ------- No Update 42. [S9700-53DX][r5.0.4] ------ No Update 43. [S9701-78DC][r2.0.0] ------ No Update 44. [S9701-82DC][r2.0.4] ------ No Update 45. [S9705-48D][r5.0.4] ------- No Update 46. [S9710-76D][r2.0.5] ------- No Update 47. [S9720-56ED][r1.0.2] ------ No Update 48. [S9100-32X][r4.2.15] ------ No Update 49. [S9180-32X][r4.2.23] ------ No Update 50. [S9230-64X][r4.2.15] ------ No Update 51. [S9280-64X][r4.2.19] ------ No Update 52. [S9280-64X-4BWB][r4.2.18] - No Update
1 parent d83ebe6 commit effe0e2

6 files changed

Lines changed: 29 additions & 29 deletions

File tree

  • packages/platforms/ufispace/x86-64
    • s9510-28dc/onlp/builds/x86_64_ufispace_s9510_28dc/module/src
    • s9600-30dx/onlp/builds/x86_64_ufispace_s9600_30dx/module/src
    • s9610-48dx/onlp/builds/x86_64_ufispace_s9610_48dx/module/src

‎packages/platforms/ufispace/x86-64/s9510-28dc/onlp/builds/x86_64_ufispace_s9510_28dc/module/src/sfpi.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ int onlp_sfpi_dev_readb(int port, uint8_t devaddr, uint8_t addr)
788788
int bus = ufi_port_to_eeprom_bus(port);
789789

790790
if (onlp_sfpi_is_present(port) != 1) {
791-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
791+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
792792
return ONLP_STATUS_OK;
793793
}
794794

@@ -808,7 +808,7 @@ int onlp_sfpi_dev_writeb(int port, uint8_t devaddr, uint8_t addr, uint8_t value)
808808
int bus = ufi_port_to_eeprom_bus(port);
809809

810810
if (onlp_sfpi_is_present(port) != 1) {
811-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
811+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
812812
return ONLP_STATUS_OK;
813813
}
814814

@@ -832,7 +832,7 @@ int onlp_sfpi_dev_readw(int port, uint8_t devaddr, uint8_t addr)
832832
int bus = ufi_port_to_eeprom_bus(port);
833833

834834
if(onlp_sfpi_is_present(port) != 1) {
835-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
835+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
836836
return ONLP_STATUS_OK;
837837
}
838838

@@ -852,7 +852,7 @@ int onlp_sfpi_dev_writew(int port, uint8_t devaddr, uint8_t addr, uint16_t value
852852
int bus = ufi_port_to_eeprom_bus(port);
853853

854854
if(onlp_sfpi_is_present(port) != 1) {
855-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
855+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
856856
return ONLP_STATUS_OK;
857857
}
858858

@@ -875,7 +875,7 @@ int onlp_sfpi_dev_read(int port, uint8_t devaddr, uint8_t addr, uint8_t* rdata,
875875
int bus = ufi_port_to_eeprom_bus(port);
876876

877877
if (onlp_sfpi_is_present(port) != 1) {
878-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
878+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
879879
return ONLP_STATUS_OK;
880880
}
881881

@@ -897,7 +897,7 @@ int onlp_sfpi_dev_write(int port, uint8_t devaddr, uint8_t addr, uint8_t* data,
897897
int bus = ufi_port_to_eeprom_bus(port);
898898

899899
if (onlp_sfpi_is_present(port) != 1) {
900-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
900+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
901901
return ONLP_STATUS_OK;
902902
}
903903

@@ -927,7 +927,7 @@ int onlp_sfpi_dom_read(int port, uint8_t data[256])
927927
VALIDATE_SFP_PORT(port);
928928

929929
if (onlp_sfpi_is_present(port) != 1) {
930-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
930+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
931931
return ONLP_STATUS_OK;
932932
}
933933

‎packages/platforms/ufispace/x86-64/s9510-28dc/onlp/builds/x86_64_ufispace_s9510_28dc/module/src/sysi.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ static int ufi_sysi_platform_info_get(onlp_platform_info_t* pi)
222222

223223
pi->other_versions = aim_fstrdup(
224224
"\n"
225-
"[BIOS] %s\n"
226-
"[BMC] %d.%d.%d\n"
225+
"[BIOS ] %s\n"
226+
"[BMC ] %d.%d.%d\n"
227227
"[MU] %s (%s)\n",
228228
bios_out,
229229
atoi(bmc_out1), atoi(bmc_out2), atoi(bmc_out3),

‎packages/platforms/ufispace/x86-64/s9600-30dx/onlp/builds/x86_64_ufispace_s9600_30dx/module/src/sfpi.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -770,7 +770,7 @@ int onlp_sfpi_dev_read(int port, uint8_t devaddr, uint8_t addr, uint8_t* rdata,
770770
VALIDATE_PORT(port);
771771

772772
if (onlp_sfpi_is_present(port) != 1) {
773-
AIM_LOG_INFO("sfp module (port=%d) is absent. \n", port);
773+
//AIM_LOG_INFO("sfp module (port=%d) is absent. \n", port);
774774
return ONLP_STATUS_OK;
775775
}
776776

@@ -829,7 +829,7 @@ int onlp_sfpi_dev_write(int port, uint8_t devaddr, uint8_t addr, uint8_t* data,
829829
VALIDATE_PORT(port);
830830

831831
if (onlp_sfpi_is_present(port) != 1) {
832-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
832+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
833833
return ONLP_STATUS_OK;
834834
}
835835

@@ -867,7 +867,7 @@ int onlp_sfpi_dev_readb(int port, uint8_t devaddr, uint8_t addr)
867867
VALIDATE_PORT(port);
868868

869869
if (onlp_sfpi_is_present(port) != 1) {
870-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
870+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
871871
return ONLP_STATUS_OK;
872872
}
873873

@@ -923,7 +923,7 @@ int onlp_sfpi_dev_writeb(int port, uint8_t devaddr, uint8_t addr, uint8_t value)
923923
VALIDATE_PORT(port);
924924

925925
if (onlp_sfpi_is_present(port) != 1) {
926-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
926+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
927927
return ONLP_STATUS_OK;
928928
}
929929

@@ -961,7 +961,7 @@ int onlp_sfpi_dev_readw(int port, uint8_t devaddr, uint8_t addr)
961961
VALIDATE_PORT(port);
962962

963963
if (onlp_sfpi_is_present(port) != 1) {
964-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
964+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
965965
return ONLP_STATUS_OK;
966966
}
967967

@@ -1017,7 +1017,7 @@ int onlp_sfpi_dev_writew(int port, uint8_t devaddr, uint8_t addr, uint16_t value
10171017
VALIDATE_PORT(port);
10181018

10191019
if (onlp_sfpi_is_present(port) != 1) {
1020-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
1020+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
10211021
return ONLP_STATUS_OK;
10221022
}
10231023

@@ -1458,7 +1458,7 @@ int onlp_sfpi_eeprom_read(int port, uint8_t data[256])
14581458
memset(data, 0, expect_size);
14591459

14601460
if (onlp_sfpi_is_present(port) != 1) {
1461-
AIM_LOG_INFO("sfp module (port=%d) is absent. \n", port);
1461+
//AIM_LOG_INFO("sfp module (port=%d) is absent. \n", port);
14621462
return ONLP_STATUS_OK;
14631463
}
14641464

@@ -1533,7 +1533,7 @@ int onlp_sfpi_dom_read(int port, uint8_t data[256])
15331533
VALIDATE_SFP_PORT(port);
15341534

15351535
if (onlp_sfpi_is_present(port) != 1) {
1536-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
1536+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
15371537
return ONLP_STATUS_OK;
15381538
} else if (IS_SFP(port)) {
15391539
return ONLP_STATUS_E_UNSUPPORTED;

‎packages/platforms/ufispace/x86-64/s9600-30dx/onlp/builds/x86_64_ufispace_s9600_30dx/module/src/sysi.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ static int ufi_sysi_platform_info_get(onlp_platform_info_t* pi)
145145

146146
pi->other_versions = aim_fstrdup(
147147
"\n"
148-
"[BIOS] %s\n"
149-
"[BMC] %d.%d.%d\n"
148+
"[BIOS ] %s\n"
149+
"[BMC ] %d.%d.%d\n"
150150
"[MU] %s (%s)\n",
151151
bios_out,
152152
atoi(bmc_out1), atoi(bmc_out2), atoi(bmc_out3),

‎packages/platforms/ufispace/x86-64/s9610-48dx/onlp/builds/x86_64_ufispace_s9610_48dx/module/src/sfpi.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -910,7 +910,7 @@ int onlp_sfpi_dev_readb(int port, uint8_t devaddr, uint8_t addr)
910910
int bus = ufi_port_to_eeprom_bus(port);
911911

912912
if (onlp_sfpi_is_present(port) != 1) {
913-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
913+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
914914
return ONLP_STATUS_OK;
915915
}
916916

@@ -932,7 +932,7 @@ int onlp_sfpi_dev_writeb(int port, uint8_t devaddr, uint8_t addr, uint8_t value)
932932
int bus = ufi_port_to_eeprom_bus(port);
933933

934934
if (onlp_sfpi_is_present(port) != 1) {
935-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
935+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
936936
return ONLP_STATUS_OK;
937937
}
938938

@@ -957,7 +957,7 @@ int onlp_sfpi_dev_readw(int port, uint8_t devaddr, uint8_t addr)
957957
int bus = ufi_port_to_eeprom_bus(port);
958958

959959
if (onlp_sfpi_is_present(port) != 1) {
960-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
960+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
961961
return ONLP_STATUS_OK;
962962
}
963963

@@ -978,7 +978,7 @@ int onlp_sfpi_dev_writew(int port, uint8_t devaddr, uint8_t addr, uint16_t value
978978
int bus = ufi_port_to_eeprom_bus(port);
979979

980980
if (onlp_sfpi_is_present(port) != 1) {
981-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
981+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
982982
return ONLP_STATUS_OK;
983983
}
984984

@@ -1002,7 +1002,7 @@ int onlp_sfpi_dev_read(int port, uint8_t devaddr, uint8_t addr, uint8_t* rdata,
10021002
int bus = ufi_port_to_eeprom_bus(port);
10031003

10041004
if (onlp_sfpi_is_present(port) != 1) {
1005-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
1005+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
10061006
return ONLP_STATUS_OK;
10071007
}
10081008
#if REORG_DEV_CLASS_ENABLE
@@ -1026,7 +1026,7 @@ int onlp_sfpi_dev_write(int port, uint8_t devaddr, uint8_t addr, uint8_t* data,
10261026
int bus = ufi_port_to_eeprom_bus(port);
10271027

10281028
if (onlp_sfpi_is_present(port) != 1) {
1029-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
1029+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
10301030
return ONLP_STATUS_OK;
10311031
}
10321032

@@ -1055,7 +1055,7 @@ int onlp_sfpi_dom_read(int port, uint8_t data[256])
10551055
VALIDATE_SFP_PORT(port);
10561056

10571057
if (onlp_sfpi_is_present(port) != 1) {
1058-
AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
1058+
//AIM_LOG_INFO("sfp module (port=%d) is absent.\n", port);
10591059
return ONLP_STATUS_OK;
10601060
}
10611061

‎packages/platforms/ufispace/x86-64/s9610-48dx/onlp/builds/x86_64_ufispace_s9610_48dx/module/src/sysi.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ static int ufi_sysi_platform_info_get(onlp_platform_info_t* pi)
156156

157157
pi->other_versions = aim_fstrdup(
158158
"\n"
159-
"[BIOS] %s\n"
160-
"[BMC] %d.%d.%d\n"
159+
"[BIOS ] %s\n"
160+
"[BMC ] %d.%d.%d\n"
161161
"[MU] %s (%s)\n",
162162
bios_out,
163163
atoi(bmc_out1), atoi(bmc_out2), atoi(bmc_out3),
@@ -385,4 +385,4 @@ void onlp_sysi_platform_info_free(onlp_platform_info_t* info)
385385
int onlp_sysi_debug(aim_pvs_t* pvs, int argc, char** argv)
386386
{
387387
return ONLP_STATUS_E_UNSUPPORTED;
388-
}
388+
}

0 commit comments

Comments
 (0)