1 files changed, 42 insertions, 2 deletions
diff --git a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-policy/fan-errors.yaml b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-policy/fan-errors.yaml
index 486e536ad..40d022109 100644
--- a/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-policy/fan-errors.yaml
+++ b/meta-openbmc-machines/meta-openpower/meta-rcs/meta-talos/recipes-phosphor/fans/talos-fan-policy/fan-errors.yaml
@@ -116,6 +116,18 @@
       meta: COOLING_TYPE
       property: WaterCooled
 
+- name: second cpu controlled
+  description: >
+    'Whether or not the second CPU is installed and under thermal control.'
+  class: group
+  group: property
+  type: boolean
+  members:
+    - interface: org.open_power.OCC.Status
+      path: /org/open_power/control/occ1
+      meta: SECOND_CPU_CONTROLLED
+      property: OccActive
+
 - name: watch chassis state
   description: >
     'Trigger logic on chassis power state changes.'
@@ -588,7 +600,7 @@
   paths: fan5
   properties: fan present
   defer: 20000000us
-  callback: check cooling type notpresent error
+  callback: check second cpu controlled notpresent error
   countop: '<'
   countbound: 1
   op: '=='
@@ -603,7 +615,7 @@
   condition: count
   paths: fan5
   properties: fan functional
-  callback: check cooling type nonfunctional error
+  callback: check second cpu controlled nonfunctional error
   countop: '>'
   countbound: 0
   op: '=='
@@ -637,6 +649,34 @@
   op: '=='
   bound: true
 
+- name: check second cpu controlled nonfunctional error
+  description: >
+    'If this condition passes the second CPU is controlled and will create a
+     nonfunctional error for fan 6 in air cooled mode.'
+  class: condition
+  condition: count
+  paths: chassis
+  properties: second cpu controlled
+  callback: check cooling type nonfunctional error
+  countop: '=='
+  countbound: 0
+  op: '=='
+  bound: true
+
+- name: check second cpu controlled notpresent error
+  description: >
+    'If this condition passes the second CPU is controlled and will create a
+     notpresent error for fan 6 in air cooled mode.'
+  class: condition
+  condition: count
+  paths: chassis
+  properties: second cpu controlled
+  callback: check cooling type notpresent error
+  countop: '=='
+  countbound: 0
+  op: '=='
+  bound: true
+
 - name: notpresent fan0 error
   class: callback
   callback: elog