Skip to content
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

Jump to bottom

Fby3.5 hd support bom3 sensor #468

Closed
wants to merge 8 commits into from
Closed

Fby3.5 hd support bom3 sensor #468

wants to merge 8 commits into from

Conversation

Yi-Shum
Copy link
Collaborator

@Yi-Shum Yi-Shum commented Aug 5, 2022

Summary:

  • Support VR sensor MP2856GUT
  • Add the sensor config table of 3rd source sensor, replace sensor talbe to it if board revision is SYS_BOARD_EVT_BOM3.

Dependency: #467

Test Plan:

  • Build Code: Pass

Known issue:

  • Pout reading for MP2856GUT is larger than expected, still checking with FAE.

Log:
Third source boar

root@bmc-oob:~# sensor-util slot1
...
HSC Temp                     (0xE) :   47.12 C     | (ok)
CPU0 VR Temp                 (0xF) :   49.00 C     | (ok)
SOC VR Temp                  (0x10) :   51.00 C     | (ok)
CPU1 VR Temp                 (0x11) :   34.00 C     | (ok)
PVDDIO VR Temp               (0x12) :   34.00 C     | (ok)
PVDD11 VR Temp               (0x13) :   31.00 C     | (ok)
P12V_STBY Vol                (0x14) :   12.00 Volts | (ok)
PVDD18_S5 Vol                (0x15) :    1.81 Volts | (ok)
P3V3_STBY Vol                (0x16) :    3.30 Volts | (ok)
PVDD11_S3 Vol                (0x17) :    1.10 Volts | (ok)
P3V_BAT Vol                  (0x18) :    3.08 Volts | (ok)
PVDD33_S5 Vol                (0x19) :    3.31 Volts | (ok)
P5V_STBY Vol                 (0x1A) :    4.99 Volts | (ok)
P12V_MEM_1 Vol               (0x1B) :   12.05 Volts | (ok)
P12V_MEM_0 Vol               (0x1C) :   12.03 Volts | (ok)
P1V2_STBY Vol                (0x1D) :    1.20 Volts | (ok)
P3V3_M2 Vol                  (0x1E) :    3.31 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.93 Volts | (ok)
PVDDIO VR Vol                (0x24) :    1.10 Volts | (ok)
PVDD11 VR Vol                (0x25) :    1.10 Volts | (ok)
HSC Output Cur               (0x26) :   12.75 Amps  | (ok)
CPU0 VR Cur                  (0x27) :   12.75 Amps  | (ok)
SOC VR Cur                   (0x28) :   59.75 Amps  | (ok)
CPU1 VR Cur                  (0x29) :   16.75 Amps  | (ok)
PVDDIO VR Cur                (0x2A) :   31.75 Amps  | (ok)
PVDD11 VR Cur                (0x2B) :    3.25 Amps  | (ok)
HSC Input Pwr                (0x2C) :  155.15 Watts | (ok)
CPU0 VR Pwr                  (0x2D) :   96.00 Watts | (ok)
SOC VR Pwr                   (0x2E) :  568.00 Watts | (ucr)
CPU1 VR Pwr                  (0x2F) :  120.00 Watts | (ok)
PVDDIO VR Pwr                (0x30) :  280.00 Watts | (ucr)
PVDD11 VR Pwr                (0x31) :   32.00 Watts | (ok)
...

@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
@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)
...
```
@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 5, 2022
garnermic
garnermic requested changes Aug 5, 2022
View reviewed changes
Copy link
Contributor

@garnermic garnermic left a comment

Choose a reason for hiding this comment

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

Few minor changes requested. Thanks!

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(
Copy link
Contributor

Choose a reason for hiding this comment

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

Please reformat to make this section easier to read.

meta-facebook/yv35-hd/src/platform/plat_class.c
gpio_set(HSC_OCP_GPIO3_R, GPIO_HIGH);
} else if (hsc_module == HSC_MODULE_LTC4282) {
ilim_adjust = ILIM_ADJUST_2OU_EXP;
}
Copy link
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 to capture invalid hsc_module value.

meta-facebook/yv35-hd/src/platform/plat_class.c
}
} else if (_1ou_status.present && (_1ou_status.card_type != TYPE_1OU_RAINBOW_FALLS)) {
printf("Unsupported configuration, 1ou card type %d\n", _1ou_status.card_type);
}
Copy link
Contributor

Choose a reason for hiding this comment

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

Add an else statemetn here or change else-if to else if it handles all failure cases.

@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
fby3.5: hd: Modify HSC OCP setting
a0546ad 
Summary:
- When HSC is ADM1278:
Default or 1ou is RBF, set HSC_OCP_GPIO1_R high.
If 2ou present, set HSC_OCP_GPIO3_R high, others low.
- When HSC is LTC4282:
Default or 1ou is RBF, set ILIM adjust to 0b001.
If 2ou present, set ILIM adjust to 0b011.

Test Plan:
- Build code: Pass
@Yi-Shum
add else statement of HSC OCP to handle all condition
82aca21
@Yi-Shum
fby3.5: hd: support bom3 sensor
81d2c41 
Summary:
- Support VR sensor MP2856GUT
- Add the sensor config table of 3rd source sensor, replace sensor talbe to it if board revision is SYS_BOARD_EVT_BOM3.

Test Plan:
- Build Code: Pass

Known issue:
- Pout reading for MP2856GUT is larger than expected, still checking with FAE.

Log:
Third source boar
```
Summary:

Support VR sensor MP2856GUT
Add the sensor config table of 3rd source sensor, replace sensor talbe to it if board revision is SYS_BOARD_EVT_BOM3.
Dependency: facebook#467

Test Plan:

Build Code: Pass
Known issue:

Pout reading for MP2856GUT is larger than expected, still checking with FAE.
Log:
Third source boar

root@bmc-oob:~# sensor-util slot1
...
HSC Temp                     (0xE) :   47.12 C     | (ok)
CPU0 VR Temp                 (0xF) :   49.00 C     | (ok)
SOC VR Temp                  (0x10) :   51.00 C     | (ok)
CPU1 VR Temp                 (0x11) :   34.00 C     | (ok)
PVDDIO VR Temp               (0x12) :   34.00 C     | (ok)
PVDD11 VR Temp               (0x13) :   31.00 C     | (ok)
P12V_STBY Vol                (0x14) :   12.00 Volts | (ok)
PVDD18_S5 Vol                (0x15) :    1.81 Volts | (ok)
P3V3_STBY Vol                (0x16) :    3.30 Volts | (ok)
PVDD11_S3 Vol                (0x17) :    1.10 Volts | (ok)
P3V_BAT Vol                  (0x18) :    3.08 Volts | (ok)
PVDD33_S5 Vol                (0x19) :    3.31 Volts | (ok)
P5V_STBY Vol                 (0x1A) :    4.99 Volts | (ok)
P12V_MEM_1 Vol               (0x1B) :   12.05 Volts | (ok)
P12V_MEM_0 Vol               (0x1C) :   12.03 Volts | (ok)
P1V2_STBY Vol                (0x1D) :    1.20 Volts | (ok)
P3V3_M2 Vol                  (0x1E) :    3.31 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.93 Volts | (ok)
PVDDIO VR Vol                (0x24) :    1.10 Volts | (ok)
PVDD11 VR Vol                (0x25) :    1.10 Volts | (ok)
HSC Output Cur               (0x26) :   12.75 Amps  | (ok)
CPU0 VR Cur                  (0x27) :   12.75 Amps  | (ok)
SOC VR Cur                   (0x28) :   59.75 Amps  | (ok)
CPU1 VR Cur                  (0x29) :   16.75 Amps  | (ok)
PVDDIO VR Cur                (0x2A) :   31.75 Amps  | (ok)
PVDD11 VR Cur                (0x2B) :    3.25 Amps  | (ok)
HSC Input Pwr                (0x2C) :  155.15 Watts | (ok)
CPU0 VR Pwr                  (0x2D) :   96.00 Watts | (ok)
SOC VR Pwr                   (0x2E) :  568.00 Watts | (ucr)
CPU1 VR Pwr                  (0x2F) :  120.00 Watts | (ok)
PVDDIO VR Pwr                (0x30) :  280.00 Watts | (ucr)
PVDD11 VR Pwr                (0x31) :   32.00 Watts | (ok)
...
```
@Yi-Shum Yi-Shum force-pushed the fby3.5-hd-support_BOM3_sensor branch from 3c59978 to 81d2c41 Compare August 8, 2022 10:11
@Yi-Shum
Copy link
Collaborator Author

Yi-Shum commented Aug 8, 2022

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

@facebook-github-bot
Copy link
Contributor

@GoldenBug has imported this pull request. If you are a Meta employee, you can view this diff on Phabricator.

@Yi-Shum
Copy link
Collaborator Author

Yi-Shum commented Aug 12, 2022

Close this PR since HSC OCP setting will be changed.
Will create another PR to support BOM3 sensor.

@Yi-Shum Yi-Shum closed this Aug 12, 2022
facebook-github-bot pushed a commit that referenced this pull request Aug 12, 2022
@Yi-Shum @facebook-github-bot
Fby3.5 hd support bom3 sensor (#468)
47ee82d 
Summary:
- Support VR sensor MP2856GUT
- Add the sensor config table of 3rd source sensor, replace sensor talbe to it if board revision is SYS_BOARD_EVT_BOM3.

Dependency: #467

Pull Request resolved: #468

Test Plan:
- Build Code: Pass

Known issue:
- Pout reading for MP2856GUT is larger than expected, still checking with FAE.

Log:
Third source boar
```
root@bmc-oob:~# sensor-util slot1
...
HSC Temp                     (0xE) :   47.12 C     | (ok)
CPU0 VR Temp                 (0xF) :   49.00 C     | (ok)
SOC VR Temp                  (0x10) :   51.00 C     | (ok)
CPU1 VR Temp                 (0x11) :   34.00 C     | (ok)
PVDDIO VR Temp               (0x12) :   34.00 C     | (ok)
PVDD11 VR Temp               (0x13) :   31.00 C     | (ok)
P12V_STBY Vol                (0x14) :   12.00 Volts | (ok)
PVDD18_S5 Vol                (0x15) :    1.81 Volts | (ok)
P3V3_STBY Vol                (0x16) :    3.30 Volts | (ok)
PVDD11_S3 Vol                (0x17) :    1.10 Volts | (ok)
P3V_BAT Vol                  (0x18) :    3.08 Volts | (ok)
PVDD33 (8abd13595b91e80483a23f1f1a3af919a502a536)_S5 Vol                (0x19) :    3.31 Volts | (ok)
P5V_STBY Vol                 (0x1A) :    4.99 Volts | (ok)
P12V_MEM_1 Vol               (0x1B) :   12.05 Volts | (ok)
P12V_MEM_0 Vol               (0x1C) :   12.03 Volts | (ok)
P1V2_STBY Vol                (0x1D) :    1.20 Volts | (ok)
P3V3_M2 Vol                  (0x1E) :    3.31 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.93 Volts | (ok)
PVDDIO VR Vol                (0x24) :    1.10 Volts | (ok)
PVDD11 VR Vol                (0x25) :    1.10 Volts | (ok)
HSC Output Cur               (0x26) :   12.75 Amps  | (ok)
CPU0 VR Cur                  (0x27) :   12.75 Amps  | (ok)
SOC VR Cur                   (0x28) :   59.75 Amps  | (ok)
CPU1 VR Cur                  (0x29) :   16.75 Amps  | (ok)
PVDDIO VR Cur                (0x2A) :   31.75 Amps  | (ok)
PVDD11 VR Cur                (0x2B) :    3.25 Amps  | (ok)
HSC Input Pwr                (0x2C) :  155.15 Watts | (ok)
CPU0 VR Pwr                  (0x2D) :   96.00 Watts | (ok)
SOC VR Pwr                   (0x2E) :  568.00 Watts | (ucr)
CPU1 VR Pwr                  (0x2F) :  120.00 Watts | (ok)
PVDDIO VR Pwr                (0x30) :  280.00 Watts | (ucr)
PVDD11 VR Pwr                (0x31) :   32.00 Watts | (ok)
...
```

Reviewed By: garnermic

Differential Revision: D38518270

Pulled By: GoldenBug

fbshipit-source-id: 15483ab462188061fca94e564f422fccd734fd6d
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@garnermic garnermic garnermic requested changes

Assignees
No one assigned
Labels
CLA Signed This label is managed by the Facebook bot. Authors need to sign the CLA before a PR can be reviewed.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Yi-Shum @facebook-github-bot @garnermic