meta-ethanolx: Add support for system fans
Add system fans to entity manager configuration files
and to IPMI YAML configuration files.
Signed-off-by: Konstantin Aladyshev <aladyshev22@gmail.com>
Change-Id: Ib86a09553073b6ecf112232ca939758ecc5516c9
diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager/ethanolx-baseboard.json b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager/ethanolx-baseboard.json
index 0ce9f80..cea3d06 100644
--- a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager/ethanolx-baseboard.json
+++ b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager/ethanolx-baseboard.json
@@ -11,6 +11,36 @@
"Type": "FanConnector"
},
{
+ "Name": "SYS FAN1 connector",
+ "Status": "disabled",
+ "Type": "FanConnector"
+ },
+ {
+ "Name": "SYS FAN2 connector",
+ "Status": "disabled",
+ "Type": "FanConnector"
+ },
+ {
+ "Name": "SYS FAN3 connector",
+ "Status": "disabled",
+ "Type": "FanConnector"
+ },
+ {
+ "Name": "SYS FAN4 connector",
+ "Status": "disabled",
+ "Type": "FanConnector"
+ },
+ {
+ "Name": "SYS FAN5 connector",
+ "Status": "disabled",
+ "Type": "FanConnector"
+ },
+ {
+ "Name": "SYS FAN6 connector",
+ "Status": "disabled",
+ "Type": "FanConnector"
+ },
+ {
"Address": "0x48",
"Bus": 7,
"Name": "BMC",
diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager/ethanolx-chassis.json b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager/ethanolx-chassis.json
index ff4cbdc..329ed02 100644
--- a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager/ethanolx-chassis.json
+++ b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/entity-manager/ethanolx-chassis.json
@@ -69,6 +69,216 @@
"Value": 8000
}
]
+ },
+ {
+ "Index": 2,
+ "BindConnector": "SYS FAN1 connector",
+ "MaxReading": 6000,
+ "Name": "SYS_FAN1",
+ "Type": "AspeedFan",
+ "Pwm": 3,
+ "Tachs": [3],
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 10
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 10000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 8000
+ }
+ ]
+ },
+ {
+ "Index": 3,
+ "BindConnector": "SYS FAN2 connector",
+ "MaxReading": 6000,
+ "Name": "SYS_FAN2",
+ "Type": "AspeedFan",
+ "Pwm": 4,
+ "Tachs": [4],
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 10
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 10000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 8000
+ }
+ ]
+ },
+ {
+ "Index": 4,
+ "BindConnector": "SYS FAN3 connector",
+ "MaxReading": 6000,
+ "Name": "SYS_FAN3",
+ "Type": "AspeedFan",
+ "Pwm": 5,
+ "Tachs": [5],
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 10
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 10000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 8000
+ }
+ ]
+ },
+ {
+ "Index": 5,
+ "BindConnector": "SYS FAN4 connector",
+ "MaxReading": 6000,
+ "Name": "SYS_FAN4",
+ "Type": "AspeedFan",
+ "Pwm": 6,
+ "Tachs": [6],
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 10
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 10000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 8000
+ }
+ ]
+ },
+ {
+ "Index": 6,
+ "BindConnector": "SYS FAN5 connector",
+ "MaxReading": 6000,
+ "Name": "SYS_FAN5",
+ "Type": "AspeedFan",
+ "Pwm": 7,
+ "Tachs": [7],
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 10
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 10000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 8000
+ }
+ ]
+ },
+ {
+ "Index": 7,
+ "BindConnector": "SYS FAN6 connector",
+ "MaxReading": 6000,
+ "Name": "SYS_FAN6",
+ "Type": "AspeedFan",
+ "Pwm": 8,
+ "Tachs": [8],
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 10
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 10000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 8000
+ }
+ ]
}
],
"Name": "AMD EthanolX Chassis",
diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config/ethanolx-ipmi-sensors.yaml b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config/ethanolx-ipmi-sensors.yaml
index 24f8279..e9a25cc 100644
--- a/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config/ethanolx-ipmi-sensors.yaml
+++ b/meta-amd/meta-ethanolx/recipes-phosphor/configuration/ethanolx-yaml-config/ethanolx-ipmi-sensors.yaml
@@ -200,3 +200,129 @@
Offsets:
0x0:
type: double
+
+11:
+ entityID: 0x1D
+ sensorType: 0x04
+ path: /xyz/openbmc_project/sensors/fan_tach/SYS_FAN1
+ sensorReadingType: 0x01
+ multiplierM: 40
+ offsetB: 0
+ bExp: 0
+ unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
+ scale: 0
+ rExp: 0
+ mutability: Mutability::Read
+ serviceInterface: org.freedesktop.DBus.Properties
+ readingType: readingData
+ interfaces:
+ xyz.openbmc_project.Sensor.Value:
+ Value:
+ Offsets:
+ 0x0:
+ type: double
+
+12:
+ entityID: 0x1D
+ sensorType: 0x04
+ path: /xyz/openbmc_project/sensors/fan_tach/SYS_FAN2
+ sensorReadingType: 0x01
+ multiplierM: 40
+ offsetB: 0
+ bExp: 0
+ unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
+ scale: 0
+ rExp: 0
+ mutability: Mutability::Read
+ serviceInterface: org.freedesktop.DBus.Properties
+ readingType: readingData
+ interfaces:
+ xyz.openbmc_project.Sensor.Value:
+ Value:
+ Offsets:
+ 0x0:
+ type: double
+
+13:
+ entityID: 0x1D
+ sensorType: 0x04
+ path: /xyz/openbmc_project/sensors/fan_tach/SYS_FAN3
+ sensorReadingType: 0x01
+ multiplierM: 40
+ offsetB: 0
+ bExp: 0
+ unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
+ scale: 0
+ rExp: 0
+ mutability: Mutability::Read
+ serviceInterface: org.freedesktop.DBus.Properties
+ readingType: readingData
+ interfaces:
+ xyz.openbmc_project.Sensor.Value:
+ Value:
+ Offsets:
+ 0x0:
+ type: double
+
+14:
+ entityID: 0x1D
+ sensorType: 0x04
+ path: /xyz/openbmc_project/sensors/fan_tach/SYS_FAN4
+ sensorReadingType: 0x01
+ multiplierM: 40
+ offsetB: 0
+ bExp: 0
+ unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
+ scale: 0
+ rExp: 0
+ mutability: Mutability::Read
+ serviceInterface: org.freedesktop.DBus.Properties
+ readingType: readingData
+ interfaces:
+ xyz.openbmc_project.Sensor.Value:
+ Value:
+ Offsets:
+ 0x0:
+ type: double
+
+15:
+ entityID: 0x1D
+ sensorType: 0x04
+ path: /xyz/openbmc_project/sensors/fan_tach/SYS_FAN5
+ sensorReadingType: 0x01
+ multiplierM: 40
+ offsetB: 0
+ bExp: 0
+ unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
+ scale: 0
+ rExp: 0
+ mutability: Mutability::Read
+ serviceInterface: org.freedesktop.DBus.Properties
+ readingType: readingData
+ interfaces:
+ xyz.openbmc_project.Sensor.Value:
+ Value:
+ Offsets:
+ 0x0:
+ type: double
+
+16:
+ entityID: 0x1D
+ sensorType: 0x04
+ path: /xyz/openbmc_project/sensors/fan_tach/SYS_FAN6
+ sensorReadingType: 0x01
+ multiplierM: 40
+ offsetB: 0
+ bExp: 0
+ unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS
+ scale: 0
+ rExp: 0
+ mutability: Mutability::Read
+ serviceInterface: org.freedesktop.DBus.Properties
+ readingType: readingData
+ interfaces:
+ xyz.openbmc_project.Sensor.Value:
+ Value:
+ Offsets:
+ 0x0:
+ type: double