Skip to content

Commit

Permalink
olympic2.0: Support SKU 2.2 T8 and cancel 2.1 T8/RSC2 CacheStore
Browse files Browse the repository at this point in the history
Summary:
# Description
- Support BMC to determine T8 2.2 from FRU produce name and load the default fan table.
- Remove the code about canceled SKU (2.1 T8 and RSC2 CacheStore).

# Motivation
- The system SKU 2.1 T8 and RSC2 CacheStore are canceled. And need to support new SKU 2.2 T8.

X-link: facebookexternal/openbmc.wiwynn#3119

Test Plan:
1. Build pass on greatlakes.
2. Check system SKU and fan table is correct. root@bmc-oob:~# kv get system_sku
2.0
root@bmc-oob:~# fw-util bmc --version fscd
Fan Speed Controller Version: Olympic_GL_FSC-V2024.04.24 root@bmc-oob:~# fan-util --get
Fan 0 Speed: 3780 RPM (20%)
Fan 1 Speed: 3758 RPM (20%)
Fan 2 Speed: 3794 RPM (20%)
Fan 3 Speed: 3797 RPM (20%)
Fan Mode: Normal
FSCD Driver: linear_frontIO_inlet(all:slot1_fio_front_temp_c) Sensor Fail: None
Fan Fail: None

root@bmc-oob:~# kv get system_sku
2.2
root@bmc-oob:~# fw-util bmc --version fscd
Fan Speed Controller Version: Olympic_GL_2.2_FSC-V2024.07.15 root@bmc-oob:~# fan-util --get
Fan 0 Speed: 10731 RPM (70%)
Fan 1 Speed: 10830 RPM (70%)
Fan 2 Speed: 10830 RPM (70%)
Fan 3 Speed: 10751 RPM (70%)
Fan Mode: Normal
FSCD Driver: linear_cpu_temp+pid_cpu_temp(all:slot1_mb_soc_cpu_temp_c) Sensor Fail: None
Fan Fail: None

Reviewed By: amithash

Differential Revision: D59803805

fbshipit-source-id: f74e67db35c30b7566539e84413b3e3742eaa1b5
  • Loading branch information
SaraLin-wiwynn authored and facebook-github-bot committed Jul 18, 2024
1 parent 9fca98e commit 09e0fe6
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 467 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "Olympic_GL_2.1_FSC-V2024.06.18",
"version": "Olympic_GL_2.2_FSC-V2024.07.15",
"pwm_transition_value": 80,
"pwm_boost_value": 100,
"non_fanfail_limited_boost_value": 100,
Expand Down Expand Up @@ -258,7 +258,7 @@
"zones": {
"zone_1": {
"pwm_output": [0],
"expr_file": "FSC_CLASS1_type8_2.1_GL_zone1.fsc"
"expr_file": "FSC_CLASS1_type8_2.2_GL_zone1.fsc"
}
}
}

This file was deleted.

This file was deleted.

6 changes: 2 additions & 4 deletions meta-facebook/meta-fby35/recipes-fby35/fscd/fscd/setup-fan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -177,10 +177,8 @@ init_class1_fsc() {
8)
config_type="8"
sys_sku=$(get_system_sku)
if [[ "$sys_sku" == "Cache" ]]; then
target_fsc_config="/etc/FSC_CLASS1_type8_RSC_cache_GL_config.json"
elif [[ "$sys_sku" == "2.1" ]]; then
target_fsc_config="/etc/FSC_CLASS1_type8_2.1_GL_config.json"
if [[ "$sys_sku" == "2.2" ]]; then
target_fsc_config="/etc/FSC_CLASS1_type8_2.2_GL_config.json"
else
target_fsc_config="/etc/FSC_CLASS1_type8_GL_config.json"
fi
Expand Down
12 changes: 4 additions & 8 deletions meta-facebook/meta-fby35/recipes-fby35/fscd/fscd_0.3.bbappend
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,8 @@ LOCAL_URI += " \
file://FSC_CLASS1_type8_GL_zone1.fsc \
file://FSC_CLASS1_JI_config.json \
file://FSC_CLASS1_JI_zone1.fsc \
file://FSC_CLASS1_type8_2.1_GL_config.json \
file://FSC_CLASS1_type8_2.1_GL_zone1.fsc \
file://FSC_CLASS1_type8_RSC_cache_GL_config.json \
file://FSC_CLASS1_type8_RSC_cache_GL_zone1.fsc \
file://FSC_CLASS1_type8_2.2_GL_config.json \
file://FSC_CLASS1_type8_2.2_GL_zone1.fsc \
"

RDEPENDS:${PN} += "bash"
Expand All @@ -57,8 +55,7 @@ FSC_CONFIG += "FSC_CLASS1_type1_config.json \
FSC_CLASS1_GL_config.json \
FSC_CLASS1_type8_GL_config.json \
FSC_CLASS1_JI_config.json \
FSC_CLASS1_type8_2.1_GL_config.json \
FSC_CLASS1_type8_RSC_cache_GL_config.json \
FSC_CLASS1_type8_2.2_GL_config.json \
"

FSC_ZONE_CONFIG += "FSC_CLASS1_type1_zone1.fsc \
Expand All @@ -71,7 +68,6 @@ FSC_ZONE_CONFIG += "FSC_CLASS1_type1_zone1.fsc \
FSC_CLASS1_GL_zone1.fsc \
FSC_CLASS1_type8_GL_zone1.fsc \
FSC_CLASS1_JI_zone1.fsc \
FSC_CLASS1_type8_2.1_GL_zone1.fsc \
FSC_CLASS1_type8_RSC_cache_GL_zone1.fsc \
FSC_CLASS1_type8_2.2_GL_zone1.fsc \
"
FSC_INIT_FILE += "setup-fan.sh"
Loading

0 comments on commit 09e0fe6

Please sign in to comment.