Skip to content

fby3.5: hd: Support second source sensor#464

Closed
Yi-Shum wants to merge 5 commits into
facebook:mainfrom
Yi-Shum:fby3.5-hd-support_BOM2_sensor
Closed

fby3.5: hd: Support second source sensor#464
Yi-Shum wants to merge 5 commits into
facebook:mainfrom
Yi-Shum:fby3.5-hd-support_BOM2_sensor

Conversation

@Yi-Shum

@Yi-Shum Yi-Shum commented Aug 4, 2022 •
edited
Loading

Copy link
Copy Markdown
Collaborator

Summary:

  • Support temperature sensor G788P87U.
  • Support VR sensor xdpe19283b.
  • Check HSC sensor type by GPIO HSC_TYPE_0/1.
  • Check VR and temperature sensor type by board revision.

Dependency: #462

Test Plan:

  • Build Code: PASS.

Log:
Second source board

root@bmc-oob:~# sensor-util slot1
...
HSC Temp                     (0xE) :   48.12 C     | (ok)
CPU0 VR Temp                 (0xF) :   57.00 C     | (ok)
SOC VR Temp                  (0x10) :   56.00 C     | (ok)
CPU1 VR Temp                 (0x11) :   38.00 C     | (ok)
PVDDIO VR Temp               (0x12) :   38.00 C     | (ok)
PVDD11 VR Temp               (0x13) :   36.00 C     | (ok)
P12V_STBY Vol                (0x14) :   12.11 Volts | (ok)
PVDD18_S5 Vol                (0x15) :    1.83 Volts | (ok)
P3V3_STBY Vol                (0x16) :    3.34 Volts | (ok)
PVDD11_S3 Vol                (0x17) :    1.11 Volts | (ok)
P3V_BAT Vol                  (0x18) :    3.19 Volts | (ok)
PVDD33_S5 Vol                (0x19) :    3.34 Volts | (ok)
P5V_STBY Vol                 (0x1A) :    5.01 Volts | (ok)
P12V_MEM_1 Vol               (0x1B) :   12.11 Volts | (ok)
P12V_MEM_0 Vol               (0x1C) :   12.13 Volts | (ok)
P1V2_STBY Vol                (0x1D) :    1.21 Volts | (ok)
P3V3_M2 Vol                  (0x1E) :    3.33 Volts | (ok)
P1V8_STBY Vol                (0x1F) :    1.81 Volts | (ok)
HSC Input Vol                (0x20) :   12.05 Volts | (ok)
CPU0 VR Vol                  (0x21) :    0.92 Volts | (ok)
SOC VR Vol                   (0x22) :    1.19 Volts | (ok)
CPU1 VR Vol                  (0x23) :    0.92 Volts | (ok)
PVDDIO VR Vol                (0x24) :    1.10 Volts | (ok)
PVDD11 VR Vol                (0x25) :    1.10 Volts | (ok)
HSC Output Cur               (0x26) :   13.26 Amps  | (ok)
CPU0 VR Cur                  (0x27) :    8.56 Amps  | (ok)
SOC VR Cur                   (0x28) :   60.31 Amps  | (ok)
CPU1 VR Cur                  (0x29) :   13.69 Amps  | (ok)
PVDDIO VR Cur                (0x2A) :   29.00 Amps  | (ok)
PVDD11 VR Cur                (0x2B) :    2.00 Amps  | (ok)
HSC Input Pwr                (0x2C) :  159.84 Watts | (ok)
CPU0 VR Pwr                  (0x2D) :    7.88 Watts | (ok)
SOC VR Pwr                   (0x2E) :   72.12 Watts | (ok)
CPU1 VR Pwr                  (0x2F) :   12.38 Watts | (ok)
PVDDIO VR Pwr                (0x30) :   31.88 Watts | (ok)
PVDD11 VR Pwr                (0x31) :    2.25 Watts | (ok)
...
Yi-Shum added 2 commits August 4, 2022 14:37
@Yi-Shum
fby3.5: hd: Modify SDR table
fc42395 
Summary:
- Set UCT/LCT of some sensor.

Test Plan:
- Build Code: PASS
@Yi-Shum
fby3.5: hd: Modify APML DIMM temperature sensor
a826603 
Summary:
- Read DIMM temperatures of TS0 and TS1, and select the higher as the
result.

Test Plan:
- Build Code: PASS
@facebook-github-bot facebook-github-bot added the CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed. label Aug 4, 2022
@Yi-Shum Yi-Shum force-pushed the fby3.5-hd-support_BOM2_sensor branch from 0443e07 to 90094d4 Compare August 5, 2022 02:29
Yi-Shum added 2 commits August 5, 2022 10:58
@Yi-Shum
Merge branch 'main'
eed2a67
@Yi-Shum
fby3.5: hd: Support second source sensor
1c87fd9 
Summary:
- Support temperature sensor G788P87U.
- Support VR sensor xdpe19283b.
- Check HSC sensor type by GPIO HSC_TYPE_0/1.
- Check VR and temperature sensor type by board revision.

Test Plan:
- Build Code: PASS.

Log:
Second source board
```
Summary:

Support temperature sensor G788P87U.
Support VR sensor xdpe19283b.
Check HSC sensor type by GPIO HSC_TYPE_0/1.
Check VR and temperature sensor type by board revision.
Dependency: facebook#462

Test Plan:

Build Code: PASS.
Log:
Second source board

root@bmc-oob:~# sensor-util slot1
...
HSC Temp                     (0xE) :   48.12 C     | (ok)
CPU0 VR Temp                 (0xF) :   57.00 C     | (ok)
SOC VR Temp                  (0x10) :   56.00 C     | (ok)
CPU1 VR Temp                 (0x11) :   38.00 C     | (ok)
PVDDIO VR Temp               (0x12) :   38.00 C     | (ok)
PVDD11 VR Temp               (0x13) :   36.00 C     | (ok)
P12V_STBY Vol                (0x14) :   12.11 Volts | (ok)
PVDD18_S5 Vol                (0x15) :    1.83 Volts | (ok)
P3V3_STBY Vol                (0x16) :    3.34 Volts | (ok)
PVDD11_S3 Vol                (0x17) :    1.11 Volts | (ok)
P3V_BAT Vol                  (0x18) :    3.19 Volts | (ok)
PVDD33_S5 Vol                (0x19) :    3.34 Volts | (ok)
P5V_STBY Vol                 (0x1A) :    5.01 Volts | (ok)
P12V_MEM_1 Vol               (0x1B) :   12.11 Volts | (ok)
P12V_MEM_0 Vol               (0x1C) :   12.13 Volts | (ok)
P1V2_STBY Vol                (0x1D) :    1.21 Volts | (ok)
P3V3_M2 Vol                  (0x1E) :    3.33 Volts | (ok)
P1V8_STBY Vol                (0x1F) :    1.81 Volts | (ok)
HSC Input Vol                (0x20) :   12.05 Volts | (ok)
CPU0 VR Vol                  (0x21) :    0.92 Volts | (ok)
SOC VR Vol                   (0x22) :    1.19 Volts | (ok)
CPU1 VR Vol                  (0x23) :    0.92 Volts | (ok)
PVDDIO VR Vol                (0x24) :    1.10 Volts | (ok)
PVDD11 VR Vol                (0x25) :    1.10 Volts | (ok)
HSC Output Cur               (0x26) :   13.26 Amps  | (ok)
CPU0 VR Cur                  (0x27) :    8.56 Amps  | (ok)
SOC VR Cur                   (0x28) :   60.31 Amps  | (ok)
CPU1 VR Cur                  (0x29) :   13.69 Amps  | (ok)
PVDDIO VR Cur                (0x2A) :   29.00 Amps  | (ok)
PVDD11 VR Cur                (0x2B) :    2.00 Amps  | (ok)
HSC Input Pwr                (0x2C) :  159.84 Watts | (ok)
CPU0 VR Pwr                  (0x2D) :    7.88 Watts | (ok)
SOC VR Pwr                   (0x2E) :   72.12 Watts | (ok)
CPU1 VR Pwr                  (0x2F) :   12.38 Watts | (ok)
PVDDIO VR Pwr                (0x30) :   31.88 Watts | (ok)
PVDD11 VR Pwr                (0x31) :    2.25 Watts | (ok)
...
```
@Yi-Shum Yi-Shum force-pushed the fby3.5-hd-support_BOM2_sensor branch from 90094d4 to 1c87fd9 Compare August 5, 2022 03:33
@Yi-Shum Yi-Shum mentioned this pull request Aug 5, 2022
Closed
@Yi-Shum

Yi-Shum commented Aug 5, 2022

Copy link
Copy Markdown
Collaborator Author

Hi @garnermic ,
I have fixed the conflict and do the force update.
Please help to review again, thank you.
garnermic
garnermic requested changes Aug 5, 2022
View reviewed changes

@garnermic garnermic left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few minor changes to resolve. Thanks!
Comment thread common/shell/shell_platform.h Outdated
nct7718w) sensor_name_to_num(ltc4286)
sensor_name_to_num(amd_tsi)
sensor_name_to_num(apml_mailbox)
sensor_name_to_num(xdpe15284) sensor_name_to_num(ltc4282) sensor_name_to_num(

@garnermic garnermic Aug 5, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please reformat this to make it easier to read.

@Yi-Shum Yi-Shum Aug 8, 2022

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, I'll disable clang-format of this array.
Comment thread meta-facebook/yv35-hd/src/platform/plat_class.c
@@ -269,7 +279,34 @@ void init_platform_config()
printf("Unknown the 1OU card type, the voltage of ADC channel-6 is %fV\n",
voltage);
} else if (_1ou_status.card_type == TYPE_1OU_RAINBOW_FALLS) {

@garnermic garnermic Aug 5, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add an else statement at the end of the else if to ensure anything not handled by the if/else-if cases is caught and processed.

@Yi-Shum Yi-Shum Aug 8, 2022

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An else statement will be added to handle all conditions.
Comment thread meta-facebook/yv35-hd/src/platform/plat_class.c
gpio_set(HSC_OCP_GPIO1_R, GPIO_HIGH);
if (hsc_module == HSC_MODULE_ADM1278) {
gpio_set(HSC_OCP_GPIO1_R, GPIO_HIGH);
} else if (hsc_module == HSC_MODULE_LTC4282) {

@garnermic garnermic Aug 5, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add else statement to catch invalid hsc_module values.

@Yi-Shum Yi-Shum Aug 8, 2022

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An else statement will be added to handle all conditions.
@Yi-Shum
Modification based on meta's comments
2b028e8 
Summary:
- Add else statement to handle all condition of HSC module and 1ou card
type.
- Reformat array 'sensor_type_name' and 'sensor_status_name' to make it
easier to read.

Test Plan:
- Build Code: Pass
@Yi-Shum

Yi-Shum commented Aug 8, 2022

Copy link
Copy Markdown
Collaborator Author

Hi @garnermic ,
I modified it based on the comments.
Please review again, thank you.
@facebook-github-bot

facebook-github-bot commented Aug 8, 2022

Copy link
Copy Markdown
Contributor

@GoldenBug has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.

3 participants

@Yi-Shum @facebook-github-bot @garnermic