wspoon: Enable full water cooled fan control
Water cooled thermal parameters have been verified and ok'd to integrate
by thermal team. Air cooled thermal parameters are still being
characterized, so this keeps air cooled unchanged.
Change-Id: I3d90c30c07856b9d74896625b37ccdf9764e9ed4
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
diff --git a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
index 5b5c227..23722b4 100644
--- a/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
+++ b/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config-native/events.yaml
@@ -299,10 +299,10 @@
- name: set_floor_from_average_sensor_value
map:
value:
- - 27000: 7200
- - 32000: 7200
- - 37000: 7200
- - 40000: 7200
+ - 27000: 3000
+ - 32000: 4300
+ - 37000: 5000
+ - 40000: 5800
type: std::map<int64_t, uint64_t>
- name: set_ceiling_from_average_sensor_value
map:
@@ -327,9 +327,6 @@
- name: set_request_speed_base_with_max
- name: speed_changes_based_on_regulator_temps
zone_conditions:
- - name: air_cooled_chassis
- zones:
- - 0
- name: water_and_air_cooled_chassis
zones:
- 0
@@ -359,9 +356,6 @@
interval: 5
- name: speed_changes_based_on_pcie_temps
zone_conditions:
- - name: air_cooled_chassis
- zones:
- - 0
- name: water_and_air_cooled_chassis
zones:
- 0
@@ -406,40 +400,8 @@
type: bool
value: true
events:
- - name: speed_changes_based_on_core_temps
- zone_conditions:
- - name: air_cooled_chassis
- zones:
- - 0
- group: zone0_cores
- interface: xyz.openbmc_project.Sensor.Value
- property:
- name: Value
- type: int64_t
- actions:
- - name: set_net_increase_speed
- property: 73000
- factor:
- value: 1000
- type: int64_t
- delta:
- value: 400
- type: uint64_t
- - name: set_net_decrease_speed
- property: 70000
- factor:
- value: 1000
- type: int64_t
- delta:
- value: 40
- type: uint64_t
- timer:
- interval: 5
- name: speed_changes_based_on_dimm_temps
zone_conditions:
- - name: air_cooled_chassis
- zones:
- - 0
- name: water_and_air_cooled_chassis
zones:
- 0
@@ -467,67 +429,3 @@
type: uint64_t
timer:
interval: 5
- - name: speed_changes_based_on_gpu_core_temps
- zone_conditions:
- - name: air_cooled_chassis
- zones:
- - 0
- - name: water_and_air_cooled_chassis
- zones:
- - 0
- group: zone0_gpu_cores
- interface: xyz.openbmc_project.Sensor.Value
- property:
- name: Value
- type: int64_t
- actions:
- - name: set_net_increase_speed
- property: 78000
- factor:
- value: 1000
- type: int64_t
- delta:
- value: 600
- type: uint64_t
- - name: set_net_decrease_speed
- property: 75000
- factor:
- value: 1000
- type: int64_t
- delta:
- value: 40
- type: uint64_t
- timer:
- interval: 5
- - name: speed_changes_based_on_gpu_memory_temps
- zone_conditions:
- - name: air_cooled_chassis
- zones:
- - 0
- - name: water_and_air_cooled_chassis
- zones:
- - 0
- group: zone0_gpu_memory
- interface: xyz.openbmc_project.Sensor.Value
- property:
- name: Value
- type: int64_t
- actions:
- - name: set_net_increase_speed
- property: 80000
- factor:
- value: 1000
- type: int64_t
- delta:
- value: 600
- type: uint64_t
- - name: set_net_decrease_speed
- property: 77000
- factor:
- value: 1000
- type: int64_t
- delta:
- value: 40
- type: uint64_t
- timer:
- interval: 5