diff options
Diffstat (limited to 'meta-amd')
15 files changed, 368 insertions, 108 deletions
diff --git a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf index 7469c9a1c..7fb6e7ec1 100644 --- a/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf +++ b/meta-amd/meta-ethanolx/conf/machine/ethanolx.conf @@ -24,6 +24,7 @@ OBMC_MACHINE_FEATURES += "\ VIRTUAL-RUNTIME_skeleton_workbook = "${MACHINE}-config" VIRTUAL-RUNTIME_obmc-host-state-manager ?= "x86-power-control" VIRTUAL-RUNTIME_obmc-chassis-state-manager ?= "x86-power-control" +VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors" PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-amd-apps" PREFERRED_PROVIDER_virtual/obmc-fan-mgmt = "packagegroup-amd-apps" 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 0ce9f8096..cea3d0602 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 ff4cbdc54..329ed0286 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 24f827902..e9a25ccce 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 diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@48.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@48.conf deleted file mode 100644 index 9cd98bb25..000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@48.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "BMC" -WARNLO_temp1= "5000" -WARNHI_temp1= "38000" -CRITHI_temp1 = "40000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@49.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@49.conf deleted file mode 100644 index 8e4a2afb6..000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@49.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "DIMM_P0_ABCD_P1_EFGH" -WARNLO_temp1= "5000" -WARNHI_temp1= "38000" -CRITHI_temp1 = "40000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4a.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4a.conf deleted file mode 100644 index 5c5c230be..000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4a.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "DIMM_P1_EFGH" -WARNLO_temp1= "5000" -WARNHI_temp1= "38000" -CRITHI_temp1 = "40000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4b.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4b.conf deleted file mode 100644 index 3570aafdf..000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4b.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "PCIe_Slots" -WARNLO_temp1= "5000" -WARNHI_temp1= "38000" -CRITHI_temp1 = "40000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4c.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4c.conf deleted file mode 100644 index 68143291a..000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4c.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "DIMM_P0_EFGH_P1_ABCD" -WARNLO_temp1= "5000" -WARNHI_temp1= "38000" -CRITHI_temp1 = "40000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4d.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4d.conf deleted file mode 100644 index 51a5e29d4..000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4d.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "DIMM_P1_ABCD" -WARNLO_temp1= "5000" -WARNHI_temp1= "38000" -CRITHI_temp1 = "40000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4e.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4e.conf deleted file mode 100644 index 0c28e5d25..000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4e.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "DIMM_P0_EFGH" -WARNLO_temp1= "5000" -WARNHI_temp1= "38000" -CRITHI_temp1 = "40000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4f.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4f.conf deleted file mode 100644 index 9a0eb7565..000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/lm75a@4f.conf +++ /dev/null @@ -1,8 +0,0 @@ -LABEL_temp1= "DIMM_P0_ABCD" -WARNLO_temp1= "5000" -WARNHI_temp1= "38000" -CRITHI_temp1 = "40000" -CRITLO_temp1 = "0" -MINVALUE_temp1 = "-128" -MAXVALUE_temp1 = "127" -EVENT_temp1= "WARNHI,WARNLO,CRITHI,CRITLO" diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf deleted file mode 100644 index 0620d1640..000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf +++ /dev/null @@ -1,23 +0,0 @@ -# EthanolX has 8 fan ports but only 2 are standard 4-wire fans with PWM and TACH. -LABEL_fan1 = "P0_Fan_Speed" -LABEL_fan2 = "P1_Fan_Speed" - -PWM_TARGET_fan1 = "1" -PWM_TARGET_fan2 = "2" - -WARNLO_fan1= "10" -WARNHI_fan1= "8000" -CRITHI_fan1 = "10000" -CRITLO_fan1 = "0" -MINVALUE_fan1 = "100" -MAXVALUE_fan1 = "6000" -EVENT_fan1= "WARNHI,WARNLO,CRITHI,CRITLO" - -WARNLO_fan2= "10" -WARNHI_fan2= "8000" -CRITHI_fan2 = "10000" -CRITLO_fan2 = "0" -MINVALUE_fan2 = "100" -MAXVALUE_fan2 = "6000" -EVENT_fan2= "WARNHI,WARNLO,CRITHI,CRITLO" - diff --git a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend deleted file mode 100644 index b0631e627..000000000 --- a/meta-amd/meta-ethanolx/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ /dev/null @@ -1,20 +0,0 @@ -FILESEXTRAPATHS_prepend_ethanolx := "${THISDIR}/${PN}:" -EXTRA_OEMESON_append_ethanolx = " -Dnegative-errno-on-fail=true" - - -CHIPS = " \ - bus@1e78a000/i2c-bus@300/lm75a@48 \ - bus@1e78a000/i2c-bus@300/lm75a@49 \ - bus@1e78a000/i2c-bus@300/lm75a@4a \ - bus@1e78a000/i2c-bus@300/lm75a@4b \ - bus@1e78a000/i2c-bus@300/lm75a@4c \ - bus@1e78a000/i2c-bus@300/lm75a@4d \ - bus@1e78a000/i2c-bus@300/lm75a@4e \ - bus@1e78a000/i2c-bus@300/lm75a@4f \ - pwm-tacho-controller@1e786000 \ - " -ITEMSFMT = "ahb/apb/{0}.conf" -ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}" - -ENVS = "obmc/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_ethanolx = " ${@compose_list(d, 'ENVS', 'ITEMS')}" diff --git a/meta-amd/recipes-amd/amd-fpga/amd-fpga.bb b/meta-amd/recipes-amd/amd-fpga/amd-fpga.bb index 3fcaeaa91..32efddea2 100644 --- a/meta-amd/recipes-amd/amd-fpga/amd-fpga.bb +++ b/meta-amd/recipes-amd/amd-fpga/amd-fpga.bb @@ -10,7 +10,7 @@ SRCREV = "${AUTOREV}" SRC_URI = "file://fpgardu.sh" SRC_URI += "file://LICENSE" -S = "${WORKDIR}/" +S = "${WORKDIR}" do_install () { install -d ${D}${bindir} |