diff --git a/meta-ampere/meta-jade/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml b/meta-ampere/meta-jade/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml index d1adc119b2fb..ae5781daf267 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml +++ b/meta-ampere/meta-jade/recipes-phosphor/fans/phosphor-fan-control-events-config/events.yaml @@ -39,11 +39,16 @@ groups: type: /xyz/openbmc_project/sensors members: - /temperature/peripheral0 - - name: zone0_nvme - description: Group of nvme temperature sensors for zone 0 + - name: zone0_bp_nvme + description: Group of BP nvme temperature sensors for zone 0 type: /xyz/openbmc_project/sensors members: - - /temperature/nvme_max + - /temperature/nvme_bp_max + - name: zone0_m2_nvme + description: Group of M2 nvme temperature sensors for zone 0 + type: /xyz/openbmc_project/sensors + members: + - /temperature/nvme_m2_max matches: - name: propertiesChanged parameters: @@ -252,7 +257,16 @@ events: - name: set_speed_from_max_sensor_value map: value: - - 1000: 64 + - 1000: 38 + - 18000: 38 + - 20000: 41 + - 21000: 43 + - 22000: 46 + - 24000: 48 + - 28000: 51 + - 32000: 56 + - 34000: 59 + - 36000: 61 - 40000: 64 - 41000: 66 - 42000: 69 @@ -293,7 +307,12 @@ events: - name: set_speed_from_max_sensor_value map: value: - - 1000: 64 + - 1000: 38 + - 65000: 38 + - 66000: 43 + - 67000: 48 + - 68000: 54 + - 69000: 59 - 70000: 64 - 71000: 69 - 72000: 74 @@ -350,7 +369,12 @@ events: - name: set_speed_from_max_sensor_value map: value: - - 1000: 64 + - 1000: 38 + - 45000: 38 + - 46000: 43 + - 47000: 48 + - 48000: 54 + - 49000: 59 - 50000: 64 - 51000: 69 - 52000: 74 @@ -413,32 +437,31 @@ events: - name: set_speed_from_max_sensor_value map: value: - - 1000: 64 - - 64000: 64 - - 65000: 66 - - 66000: 69 - - 67000: 71 - - 68000: 74 - - 69000: 77 - - 70000: 82 - - 71000: 87 - - 72000: 92 - - 73000: 97 - - 74000: 102 - - 75000: 107 - - 76000: 112 - - 77000: 117 - - 78000: 122 - - 79000: 128 - - 80000: 133 - - 81000: 138 - - 82000: 143 - - 83000: 148 - - 84000: 153 - - 85000: 158 - - 86000: 163 - - 87000: 168 - - 88000: 173 + - 1000: 38 + - 65000: 38 + - 66000: 43 + - 67000: 51 + - 68000: 54 + - 69000: 56 + - 70000: 61 + - 71000: 66 + - 72000: 71 + - 73000: 77 + - 74000: 82 + - 75000: 87 + - 76000: 92 + - 77000: 97 + - 78000: 102 + - 79000: 107 + - 80000: 112 + - 81000: 122 + - 82000: 128 + - 83000: 133 + - 84000: 140 + - 85000: 148 + - 86000: 156 + - 87000: 163 + - 88000: 171 - 89000: 179 - 90000: 186 - 91000: 194 @@ -460,9 +483,9 @@ events: target: value: 3 type: int - - name: set_wiwynn_algo_on_nvme_temp + - name: set_wiwynn_algo_on_bp_nvme_temp groups: - - name: zone0_nvme + - name: zone0_bp_nvme interface: xyz.openbmc_project.Sensor.Value property: name: Value @@ -478,7 +501,12 @@ events: - name: set_speed_from_max_sensor_value map: value: - - 1000: 64 + - 1000: 38 + - 35000: 38 + - 36000: 43 + - 37000: 48 + - 38000: 54 + - 39000: 59 - 40000: 64 - 41000: 66 - 42000: 69 @@ -519,4 +547,36 @@ events: target: value: 4 type: int + - name: set_wiwynn_algo_on_m2_nvme_temp + groups: + - name: zone0_m2_nvme + interface: xyz.openbmc_project.Sensor.Value + property: + name: Value + type: int64_t + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty + actions: + - name: set_speed_from_max_sensor_value + map: + value: + - 1000: 38 + - 61000: 38 + - 68000: 38 + - 69000: 204 + type: std::map + neg_hysteresis: + value: 1000 + type: int64_t + pos_hysteresis: + value: 0 + type: int64_t + target: + value: 5 + type: int diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json index a3c3ebe3f0a3..7844f9e825e0 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json @@ -507,7 +507,7 @@ }, { "Desc":{ - "Name":"nvme_max", + "Name":"nvme_bp_max", "SensorType":"temperature" }, "Threshold":{ @@ -685,7 +685,24 @@ "Name": "nvme23", "SensorType": "temperature" } - }, + } + ] + }, + "Expression": "max(0,(n0 == n0) ? n0 : NULL,(n1 == n1) ? n1 : NULL,(n2 == n2) ? n2 : NULL,(n3 == n3) ? n3 : NULL,(n4 == n4) ? n4 : NULL,(n5 == n5) ? n5 : NULL,(n6 == n6) ? n6 : NULL,(n7 == n7) ? n7 : NULL,(n8 == n8) ? n8 : NULL,(n9 == n9) ? n9 : NULL,(n10 == n10) ? n10 : NULL,(n11 == n11) ? n11 : NULL,(n12 == n12) ? n12 : NULL,(n13 == n13) ? n13 : NULL,(n14 == n14) ? n14 : NULL,(n15 == n15) ? n15 : NULL,(n16 == n16) ? n16 : NULL,(n17 == n17) ? n17 : NULL,(n18 == n18) ? n18 : NULL,(n19 == n19) ? n19 : NULL,(n20 == n20) ? n20 : NULL,(n21 == n21) ? n21 : NULL,(n22 == n22) ? n22 : NULL,(n23 == n23) ? n23 : NULL)" + }, + { + "Desc":{ + "Name":"nvme_m2_max", + "SensorType":"temperature" + }, + "Threshold":{ + "CriticalHigh": 80, + "CriticalLow": 0, + "WarningHigh": 70, + "WarningLow": 5 + }, + "Params":{ + "DbusParam": [ { "ParamName": "n24", "Desc": { @@ -702,7 +719,7 @@ } ] }, - "Expression": "max(0,(n0 == n0) ? n0 : NULL,(n1 == n1) ? n1 : NULL,(n2 == n2) ? n2 : NULL,(n3 == n3) ? n3 : NULL,(n4 == n4) ? n4 : NULL,(n5 == n5) ? n5 : NULL,(n6 == n6) ? n6 : NULL,(n7 == n7) ? n7 : NULL,(n8 == n8) ? n8 : NULL,(n9 == n9) ? n9 : NULL,(n10 == n10) ? n10 : NULL,(n11 == n11) ? n11 : NULL,(n12 == n12) ? n12 : NULL,(n13 == n13) ? n13 : NULL,(n14 == n14) ? n14 : NULL,(n15 == n15) ? n15 : NULL,(n16 == n16) ? n16 : NULL,(n17 == n17) ? n17 : NULL,(n18 == n18) ? n18 : NULL,(n19 == n19) ? n19 : NULL,(n20 == n20) ? n20 : NULL,(n21 == n21) ? n21 : NULL,(n22 == n22) ? n22 : NULL,(n23 == n23) ? n23 : NULL,(n24 == n24) ? n24 : NULL,(n25 == n25) ? n25 : NULL)" + "Expression": "max(0,(n24 == n24) ? n24 : NULL,(n25 == n25) ? n25 : NULL)" } ]