diff options
Diffstat (limited to 'meta-rcs/meta-talos/recipes-phosphor')
18 files changed, 658 insertions, 6 deletions
diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml index 1778bf2a1..7d6d8b403 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan-monitor-config-native/monitor.yaml @@ -2,7 +2,7 @@ fans: - inventory: /system/chassis/motherboard/fan0 functional_delay: 5 allowed_out_of_range_time: 30 - deviation: -500 + deviation: -300 num_sensors_nonfunc_for_fan_nonfunc: 1 sensors: - name: fan0 @@ -11,7 +11,7 @@ fans: - inventory: /system/chassis/motherboard/fan1 functional_delay: 5 allowed_out_of_range_time: 30 - deviation: -500 + deviation: -300 num_sensors_nonfunc_for_fan_nonfunc: 1 sensors: - name: fan1 @@ -20,7 +20,7 @@ fans: - inventory: /system/chassis/motherboard/fan2 functional_delay: 5 allowed_out_of_range_time: 30 - deviation: -500 + deviation: -300 num_sensors_nonfunc_for_fan_nonfunc: 1 sensors: - name: fan2 @@ -29,7 +29,7 @@ fans: - inventory: /system/chassis/motherboard/fan3 functional_delay: 5 allowed_out_of_range_time: 30 - deviation: -500 + deviation: -300 num_sensors_nonfunc_for_fan_nonfunc: 1 sensors: - name: fan3 @@ -38,7 +38,7 @@ fans: - inventory: /system/chassis/motherboard/fan4 functional_delay: 5 allowed_out_of_range_time: 30 - deviation: -500 + deviation: -300 num_sensors_nonfunc_for_fan_nonfunc: 1 sensors: - name: fan4 @@ -47,7 +47,7 @@ fans: - inventory: /system/chassis/motherboard/fan5 functional_delay: 5 allowed_out_of_range_time: 30 - deviation: -500 + deviation: -300 num_sensors_nonfunc_for_fan_nonfunc: 1 sensors: - name: fan5 diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/label-fan-tachs-in-inventory.patch b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/label-fan-tachs-in-inventory.patch new file mode 100644 index 000000000..383310246 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan/label-fan-tachs-in-inventory.patch @@ -0,0 +1,13 @@ +diff --git a/monitor/tach_sensor.cpp b/monitor/tach_sensor.cpp +index 5494450..6832ffe 100644 +--- a/monitor/tach_sensor.cpp ++++ b/monitor/tach_sensor.cpp +@@ -81,7 +81,7 @@ TachSensor::TachSensor(Mode mode, + _bus(bus), + _fan(fan), + _name(FAN_SENSOR_PATH + id), +- _invName(path(fan.getName()) / id), ++ _invName(path(fan.getName()) / (id + "tach")), + _hasTarget(hasTarget), + _funcDelay(funcDelay), + _interface(interface), diff --git a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend index 36751c29a..0035eee8d 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend +++ b/meta-rcs/meta-talos/recipes-phosphor/fans/phosphor-fan_%.bbappend @@ -5,6 +5,8 @@ FAN_PACKAGES += " \ phosphor-cooling-type \ " +SRC_URI += "file://label-fan-tachs-in-inventory.patch" + PACKAGECONFIG += "cooling-type" RDEPENDS_phosphor-cooling-type += "libevdev" diff --git a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json index 56170bf48..ea20c7ccb 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json +++ b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-config/dcmi_sensors.json @@ -3,6 +3,8 @@ {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/ambient", "record_id": 254} ], "baseboard": [ + {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_vdd_temp", "record_id": 250} + {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_vdd_temp", "record_id": 251} {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/pcie", "record_id": 253} {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/cpu_1_ambient", "record_id": 252} ], diff --git a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml index 2c897df8f..f6a6be20f 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml +++ b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/hwmon_sensors.hardcoded.yaml @@ -1405,6 +1405,50 @@ 0xFF:
type: int64_t
+0xa1:
+ entityID: 0x03
+ entityInstance: 49
+ sensorType: 0x01
+ path: /xyz/openbmc_project/sensors/temperature/p0_vdd_temp
+ sensorReadingType: 0x01
+ multiplierM: 1
+ offsetB: -127
+ bExp: 0
+ rExp: 0
+ unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
+ scale: -3
+ serviceInterface: org.freedesktop.DBus.Properties
+ readingType: readingData
+ sensorNamePattern: nameLeaf
+ interfaces:
+ xyz.openbmc_project.Sensor.Value:
+ Value:
+ Offsets:
+ 0xFF:
+ type: int64_t
+
+0xa2:
+ entityID: 0x03
+ entityInstance: 50
+ sensorType: 0x01
+ path: /xyz/openbmc_project/sensors/temperature/p1_vdd_temp
+ sensorReadingType: 0x01
+ multiplierM: 1
+ offsetB: -127
+ bExp: 0
+ rExp: 0
+ unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC
+ scale: -3
+ serviceInterface: org.freedesktop.DBus.Properties
+ readingType: readingData
+ sensorNamePattern: nameLeaf
+ interfaces:
+ xyz.openbmc_project.Sensor.Value:
+ Value:
+ Offsets:
+ 0xFF:
+ type: int64_t
+
0xe7:
entityID: 0x0A
entityInstance: 2
diff --git a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/talos-ipmid-whitelist.conf b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/talos-ipmid-whitelist.conf new file mode 100644 index 000000000..961214df0 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host/talos-ipmid-whitelist.conf @@ -0,0 +1,48 @@ +#<NetFn>:<Command +0x00:0x00 //<Chassis>:<Chassis Capabiliti> +0x00:0x01 //<Chassis>:<Get Chassis Status> +0x00:0x02 //<Chassis>:<Chassis Control> +0x00:0x05 //<Chassis>:<Set Chassis Capabilities> +0x00:0x06 //<Chassis>:<Set Power Restore Policy> +0x00:0x08 //<Chassis>:<Set System Boot Options> +0x00:0x09 //<Chassis>:<Get System Boot Options> +0x00:0x0F //<Chassis>:<Get POH Counter Command> +0x04:0x02 //<Sensor/Event>:<Platform event> +0x04:0x2D //<Sensor/Event>:<Get Sensor Reading> +0x04:0x2F //<Sensor/Event>:<Get Sensor Type> +0x04:0x30 //<Sensor/Event>:<Set Sensor Reading and Event Status> +0x06:0x01 //<App>:<Get Device ID> +0x06:0x04 //<App>:<Get Self Test Results> +0x06:0x06 //<App>:<Set ACPI Power State> +0x06:0x07 //<App>:<Get ACPI Power State> +0x06:0x08 //<App>:<Get Device GUID> +0x06:0x22 //<App>:<Reset Watchdog Timer> +0x06:0x24 //<App>:<Set Watchdog Timer> +0x06:0x25 //<App>:<Get Watchdog Timer> +0x06:0x2E //<App>:<Set BMC Global Enables> +0x06:0x2F //<App>:<Get BMC Global Enables> +0x06:0x31 //<App>:<Get Message Flags> +0x06:0x35 //<App>:<Read Event Message Buffer> +0x06:0x36 //<App>:<Get BT Interface Capabilities> +0x06:0x37 //<App>:<Get System GUID> +0x06:0x42 //<App>:<Get Channel Info Command> +0x06:0x4E //<App>:<Get Channel Payload Support> +0x06:0x54 //<App>:<Get Channel Cipher Suites> +0x0A:0x10 //<Storage>:<Get FRU Inventory Area Info> +0x0A:0x11 //<Storage>:<Read FRU Data> +0x0A:0x20 //<Storage>:<Get SDR Repository Info> +0x0A:0x22 //<Storage>:<Reserve SDR Repository> +0x0A:0x23 //<Storage>:<Get SDR> +0x0A:0x40 //<Storage>:<Get SEL Info> +0x0A:0x42 //<Storage>:<Reserve SEL> +0x0A:0x44 //<Storage>:<Add SEL Entry> +0x0A:0x48 //<Storage>:<Get SEL Time> +0x0A:0x49 //<Storage>:<Set SEL Time> +0x0C:0x02 //<Transport>:<Get LAN Configuration Parameters> +0x2C:0x00 //<Group Extension>:<Group Extension Command> +0x2C:0x01 //<Group Extension>:<Get DCMI Capabilities> +0x2C:0x02 //<Group Extension>:<Get Power Reading> +0x2C:0x03 //<Group Extension>:<Get Power Limit> +0x2C:0x06 //<Group Extension>:<Get Asset Tag> +0x2C:0x07 //<Group Extension>:<Get Sensor Info> +0x2C:0x10 //<Group Extension>:<Get Temperature Readings> diff --git a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index e1798ad4b..788adb8a2 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-rcs/meta-talos/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -8,3 +8,9 @@ SRC_URI_append = " \ EXTRA_OECONF_append = " \ CHANNEL_YAML_GEN=${WORKDIR}/channel.yaml \ " + +# Replace the default whitelist on Talos II systems +SRC_URI_append = " file://talos-ipmid-whitelist.conf" + +WHITELIST_CONF_remove = " ${S}/host-ipmid-whitelist.conf" +WHITELIST_CONF_append = " ${WORKDIR}/talos-ipmid-whitelist.conf" diff --git a/meta-rcs/meta-talos/recipes-phosphor/network/network/ncsi-netlink.service b/meta-rcs/meta-talos/recipes-phosphor/network/network/ncsi-netlink.service new file mode 100644 index 000000000..44b34195e --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/network/network/ncsi-netlink.service @@ -0,0 +1,13 @@ +[Unit] +Description=Stop the ethernet link failover +Wants=xyz.openbmc_project.Network.service +After=xyz.openbmc_project.Network.service + +[Service] +Restart=no +ExecStart=/usr/bin/env ncsi-netlink --set -x 2 -p 0 -c 0 +SyslogIdentifier=ncsi-netlink +Type=oneshot + +[Install] +WantedBy=multi-user.target diff --git a/meta-rcs/meta-talos/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-rcs/meta-talos/recipes-phosphor/network/phosphor-network_%.bbappend new file mode 100644 index 000000000..5137f4e00 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/network/phosphor-network_%.bbappend @@ -0,0 +1,8 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/network:" +SRC_URI += "file://ncsi-netlink.service" +SYSTEMD_SERVICE_${PN} += "ncsi-netlink.service" + +do_install_append() { + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir} +} diff --git a/meta-rcs/meta-talos/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-rcs/meta-talos/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 74866b373..154931330 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-rcs/meta-talos/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1 +1,2 @@ RDEPENDS_${PN}-inventory += " openpower-occ-control phosphor-cooling-type" +RDEPENDS_${PN}-extras += " binary-block-editor procps obmc-ikvm bmcweb phosphor-webui" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf index 204de8b8b..8b0f3cbc7 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf +++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/max31785@52.conf @@ -12,5 +12,33 @@ ENABLE_fan4 = "1" ENABLE_fan5 = "1" ENABLE_fan6 = "1" +WARNLO_fan1 = "500" +WARNLO_fan2 = "500" +WARNLO_fan3 = "500" +WARNLO_fan4 = "500" +WARNLO_fan5 = "500" +WARNLO_fan6 = "500" + +CRITLO_fan1 = "300" +CRITLO_fan2 = "300" +CRITLO_fan3 = "300" +CRITLO_fan4 = "300" +CRITLO_fan5 = "300" +CRITLO_fan6 = "300" + +WARNHI_fan1 = "20000" +WARNHI_fan2 = "20000" +WARNHI_fan3 = "20000" +WARNHI_fan4 = "20000" +WARNHI_fan5 = "20000" +WARNHI_fan6 = "20000" + +CRITHI_fan1 = "30000" +CRITHI_fan2 = "30000" +CRITHI_fan3 = "30000" +CRITHI_fan4 = "30000" +CRITHI_fan5 = "30000" +CRITHI_fan6 = "30000" + # Legacy mode TARGET_MODE = "RPM" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf index 506687fcd..0f2a4dc71 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf +++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@440/w83773g@4c.conf @@ -1,3 +1,19 @@ LABEL_temp1 = "pcie" LABEL_temp2 = "cpu_1_ambient" LABEL_temp3 = "ambient" + +WARNLO_temp1 = "0" +WARNLO_temp2 = "0" +WARNLO_temp3 = "0" + +CRITLO_temp1 = "-40000" +CRITLO_temp2 = "-40000" +CRITLO_temp3 = "-40000" + +WARNHI_temp1 = "45000" +WARNHI_temp2 = "65000" +WARNHI_temp3 = "35000" + +CRITHI_temp1 = "65000" +CRITHI_temp2 = "85000" +CRITHI_temp3 = "55000"
\ No newline at end of file diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf index 7752d2bbb..24c349c08 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf @@ -86,6 +86,7 @@ LABEL_temp111 = "p0_core20_temp" LABEL_temp112 = "p0_core21_temp" LABEL_temp113 = "p0_core22_temp" LABEL_temp114 = "p0_core23_temp" +LABEL_temp255 = "p0_vdd_temp" LABEL_temp27 = "dimm0_temp" LABEL_temp28 = "dimm1_temp" LABEL_temp29 = "dimm2_temp" @@ -121,3 +122,147 @@ LABEL_freq114 = "p0_core23_freq" LABEL_power2 = "p0_power" LABEL_power3 = "p0_vdd_power" LABEL_power4 = "p0_vdn_power" +WARNLO_temp27 = "0" +WARNLO_temp28 = "0" +WARNLO_temp29 = "0" +WARNLO_temp30 = "0" +WARNLO_temp31 = "0" +WARNLO_temp32 = "0" +WARNLO_temp33 = "0" +WARNLO_temp34 = "0" +WARNLO_temp91 = "0" +WARNLO_temp92 = "0" +WARNLO_temp93 = "0" +WARNLO_temp94 = "0" +WARNLO_temp95 = "0" +WARNLO_temp96 = "0" +WARNLO_temp97 = "0" +WARNLO_temp98 = "0" +WARNLO_temp99 = "0" +WARNLO_temp100 = "0" +WARNLO_temp101 = "0" +WARNLO_temp102 = "0" +WARNLO_temp103 = "0" +WARNLO_temp104 = "0" +WARNLO_temp105 = "0" +WARNLO_temp106 = "0" +WARNLO_temp107 = "0" +WARNLO_temp108 = "0" +WARNLO_temp109 = "0" +WARNLO_temp110 = "0" +WARNLO_temp111 = "0" +WARNLO_temp112 = "0" +WARNLO_temp113 = "0" +WARNLO_temp114 = "0" +WARNLO_temp255 = "0" +WARNLO_power2 = "-1000000" +WARNLO_power3 = "-1000000" +WARNLO_power4 = "-1000000" +CRITLO_temp27 = "-40000" +CRITLO_temp28 = "-40000" +CRITLO_temp29 = "-40000" +CRITLO_temp30 = "-40000" +CRITLO_temp31 = "-40000" +CRITLO_temp32 = "-40000" +CRITLO_temp33 = "-40000" +CRITLO_temp34 = "-40000" +CRITLO_temp91 = "-40000" +CRITLO_temp92 = "-40000" +CRITLO_temp93 = "-40000" +CRITLO_temp94 = "-40000" +CRITLO_temp95 = "-40000" +CRITLO_temp96 = "-40000" +CRITLO_temp97 = "-40000" +CRITLO_temp98 = "-40000" +CRITLO_temp99 = "-40000" +CRITLO_temp100 = "-40000" +CRITLO_temp101 = "-40000" +CRITLO_temp102 = "-40000" +CRITLO_temp103 = "-40000" +CRITLO_temp104 = "-40000" +CRITLO_temp105 = "-40000" +CRITLO_temp106 = "-40000" +CRITLO_temp107 = "-40000" +CRITLO_temp108 = "-40000" +CRITLO_temp109 = "-40000" +CRITLO_temp110 = "-40000" +CRITLO_temp111 = "-40000" +CRITLO_temp112 = "-40000" +CRITLO_temp113 = "-40000" +CRITLO_temp114 = "-40000" +CRITLO_temp255 = "-40000" +CRITLO_power2 = "-1000000" +CRITLO_power3 = "-1000000" +CRITLO_power4 = "-1000000" +WARNHI_temp27 = "60000" +WARNHI_temp28 = "60000" +WARNHI_temp29 = "60000" +WARNHI_temp30 = "60000" +WARNHI_temp31 = "60000" +WARNHI_temp32 = "60000" +WARNHI_temp33 = "60000" +WARNHI_temp34 = "60000" +WARNHI_temp91 = "78000" +WARNHI_temp92 = "78000" +WARNHI_temp93 = "78000" +WARNHI_temp94 = "78000" +WARNHI_temp95 = "78000" +WARNHI_temp96 = "78000" +WARNHI_temp97 = "78000" +WARNHI_temp98 = "78000" +WARNHI_temp99 = "78000" +WARNHI_temp100 = "78000" +WARNHI_temp101 = "78000" +WARNHI_temp102 = "78000" +WARNHI_temp103 = "78000" +WARNHI_temp104 = "78000" +WARNHI_temp105 = "78000" +WARNHI_temp106 = "78000" +WARNHI_temp107 = "78000" +WARNHI_temp108 = "78000" +WARNHI_temp109 = "78000" +WARNHI_temp110 = "78000" +WARNHI_temp111 = "78000" +WARNHI_temp112 = "78000" +WARNHI_temp113 = "78000" +WARNHI_temp114 = "78000" +WARNHI_temp255 = "80000" +WARNHI_power2 = "190000000" +WARNHI_power3 = "180000000" +WARNHI_power4 = "40000000" +CRITHI_temp27 = "85000" +CRITHI_temp28 = "85000" +CRITHI_temp29 = "85000" +CRITHI_temp30 = "85000" +CRITHI_temp31 = "85000" +CRITHI_temp32 = "85000" +CRITHI_temp33 = "85000" +CRITHI_temp34 = "85000" +CRITHI_temp91 = "90000" +CRITHI_temp92 = "90000" +CRITHI_temp93 = "90000" +CRITHI_temp94 = "90000" +CRITHI_temp95 = "90000" +CRITHI_temp96 = "90000" +CRITHI_temp97 = "90000" +CRITHI_temp98 = "90000" +CRITHI_temp99 = "90000" +CRITHI_temp100 = "90000" +CRITHI_temp101 = "90000" +CRITHI_temp102 = "90000" +CRITHI_temp103 = "90000" +CRITHI_temp104 = "90000" +CRITHI_temp105 = "90000" +CRITHI_temp106 = "90000" +CRITHI_temp107 = "90000" +CRITHI_temp108 = "90000" +CRITHI_temp109 = "90000" +CRITHI_temp110 = "90000" +CRITHI_temp111 = "90000" +CRITHI_temp112 = "90000" +CRITHI_temp113 = "90000" +CRITHI_temp114 = "90000" +CRITHI_temp255 = "92000" +CRITHI_power2 = "250000000" +CRITHI_power3 = "240000000" +CRITHI_power4 = "60000000" diff --git a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf index d90820d8c..d41f6e978 100644 --- a/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf +++ b/meta-rcs/meta-talos/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf @@ -86,6 +86,7 @@ LABEL_temp135 = "p1_core20_temp" LABEL_temp136 = "p1_core21_temp" LABEL_temp137 = "p1_core22_temp" LABEL_temp138 = "p1_core23_temp" +LABEL_temp255 = "p1_vdd_temp" LABEL_temp35 = "dimm8_temp" LABEL_temp36 = "dimm9_temp" LABEL_temp37 = "dimm10_temp" @@ -121,3 +122,147 @@ LABEL_freq138 = "p1_core23_freq" LABEL_power2 = "p1_power" LABEL_power3 = "p1_vdd_power" LABEL_power4 = "p1_vdn_power" +WARNLO_temp35 = "0" +WARNLO_temp36 = "0" +WARNLO_temp37 = "0" +WARNLO_temp38 = "0" +WARNLO_temp39 = "0" +WARNLO_temp40 = "0" +WARNLO_temp41 = "0" +WARNLO_temp42 = "0" +WARNLO_temp115 = "0" +WARNLO_temp116 = "0" +WARNLO_temp117 = "0" +WARNLO_temp118 = "0" +WARNLO_temp119 = "0" +WARNLO_temp120 = "0" +WARNLO_temp121 = "0" +WARNLO_temp122 = "0" +WARNLO_temp123 = "0" +WARNLO_temp124 = "0" +WARNLO_temp125 = "0" +WARNLO_temp126 = "0" +WARNLO_temp127 = "0" +WARNLO_temp128 = "0" +WARNLO_temp129 = "0" +WARNLO_temp130 = "0" +WARNLO_temp131 = "0" +WARNLO_temp132 = "0" +WARNLO_temp133 = "0" +WARNLO_temp134 = "0" +WARNLO_temp135 = "0" +WARNLO_temp136 = "0" +WARNLO_temp137 = "0" +WARNLO_temp138 = "0" +WARNLO_temp255 = "0" +WARNLO_power2 = "-1000000" +WARNLO_power3 = "-1000000" +WARNLO_power4 = "-1000000" +CRITLO_temp35 = "-40000" +CRITLO_temp36 = "-40000" +CRITLO_temp37 = "-40000" +CRITLO_temp38 = "-40000" +CRITLO_temp39 = "-40000" +CRITLO_temp40 = "-40000" +CRITLO_temp41 = "-40000" +CRITLO_temp42 = "-40000" +CRITLO_temp115 = "-40000" +CRITLO_temp116 = "-40000" +CRITLO_temp117 = "-40000" +CRITLO_temp118 = "-40000" +CRITLO_temp119 = "-40000" +CRITLO_temp120 = "-40000" +CRITLO_temp121 = "-40000" +CRITLO_temp122 = "-40000" +CRITLO_temp123 = "-40000" +CRITLO_temp124 = "-40000" +CRITLO_temp125 = "-40000" +CRITLO_temp126 = "-40000" +CRITLO_temp127 = "-40000" +CRITLO_temp128 = "-40000" +CRITLO_temp129 = "-40000" +CRITLO_temp130 = "-40000" +CRITLO_temp131 = "-40000" +CRITLO_temp132 = "-40000" +CRITLO_temp133 = "-40000" +CRITLO_temp134 = "-40000" +CRITLO_temp135 = "-40000" +CRITLO_temp136 = "-40000" +CRITLO_temp137 = "-40000" +CRITLO_temp138 = "-40000" +CRITLO_temp255 = "-40000" +CRITLO_power2 = "-1000000" +CRITLO_power3 = "-1000000" +CRITLO_power4 = "-1000000" +WARNHI_temp35 = "60000" +WARNHI_temp36 = "60000" +WARNHI_temp37 = "60000" +WARNHI_temp38 = "60000" +WARNHI_temp39 = "60000" +WARNHI_temp40 = "60000" +WARNHI_temp41 = "60000" +WARNHI_temp42 = "60000" +WARNHI_temp115 = "78000" +WARNHI_temp116 = "78000" +WARNHI_temp117 = "78000" +WARNHI_temp118 = "78000" +WARNHI_temp119 = "78000" +WARNHI_temp120 = "78000" +WARNHI_temp121 = "78000" +WARNHI_temp122 = "78000" +WARNHI_temp123 = "78000" +WARNHI_temp124 = "78000" +WARNHI_temp125 = "78000" +WARNHI_temp126 = "78000" +WARNHI_temp127 = "78000" +WARNHI_temp128 = "78000" +WARNHI_temp129 = "78000" +WARNHI_temp130 = "78000" +WARNHI_temp131 = "78000" +WARNHI_temp132 = "78000" +WARNHI_temp133 = "78000" +WARNHI_temp134 = "78000" +WARNHI_temp135 = "78000" +WARNHI_temp136 = "78000" +WARNHI_temp137 = "78000" +WARNHI_temp138 = "78000" +WARNHI_temp255 = "80000" +WARNHI_power2 = "190000000" +WARNHI_power3 = "180000000" +WARNHI_power4 = "40000000" +CRITHI_temp35 = "85000" +CRITHI_temp36 = "85000" +CRITHI_temp37 = "85000" +CRITHI_temp38 = "85000" +CRITHI_temp39 = "85000" +CRITHI_temp40 = "85000" +CRITHI_temp41 = "85000" +CRITHI_temp42 = "85000" +CRITHI_temp115 = "90000" +CRITHI_temp116 = "90000" +CRITHI_temp117 = "90000" +CRITHI_temp118 = "90000" +CRITHI_temp119 = "90000" +CRITHI_temp120 = "90000" +CRITHI_temp121 = "90000" +CRITHI_temp122 = "90000" +CRITHI_temp123 = "90000" +CRITHI_temp124 = "90000" +CRITHI_temp125 = "90000" +CRITHI_temp126 = "90000" +CRITHI_temp127 = "90000" +CRITHI_temp128 = "90000" +CRITHI_temp129 = "90000" +CRITHI_temp130 = "90000" +CRITHI_temp131 = "90000" +CRITHI_temp132 = "90000" +CRITHI_temp133 = "90000" +CRITHI_temp134 = "90000" +CRITHI_temp135 = "90000" +CRITHI_temp136 = "90000" +CRITHI_temp137 = "90000" +CRITHI_temp138 = "90000" +CRITHI_temp255 = "92000" +CRITHI_power2 = "250000000" +CRITHI_power3 = "240000000" +CRITHI_power4 = "60000000" diff --git a/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/cpu-power-reporting.patch b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/cpu-power-reporting.patch new file mode 100644 index 000000000..7a45a46cb --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/cpu-power-reporting.patch @@ -0,0 +1,150 @@ +diff --git a/app/common/services/api-utils.js b/app/common/services/api-utils.js +index 7643a4e..df0e7cf 100644 +--- a/app/common/services/api-utils.js ++++ b/app/common/services/api-utils.js +@@ -1488,22 +1488,42 @@ window.angular && (function(angular) { + }); + return $q.all(promises); + }, +- getPowerConsumption: function() { ++ getCPUPowerConsumption: function() { + return $http({ + method: 'GET', + url: DataService.getHost() + +- '/xyz/openbmc_project/sensors/power/total_power', ++ '/xyz/openbmc_project/sensors/power/p0_power', + withCredentials: true + }) + .then( + function(response) { + var json = JSON.stringify(response.data); + var content = JSON.parse(json); ++ var first_cpu_data = content.data; + +- return getScaledValue( +- content.data.Value, content.data.Scale) + +- ' ' + +- Constants.POWER_CONSUMPTION_TEXT[content.data.Unit]; ++ return $http({ ++ method: 'GET', ++ url: DataService.getHost() + ++ '/xyz/openbmc_project/sensors/power/p1_power', ++ withCredentials: true ++ }) ++ .then( ++ function(response) { ++ var json = JSON.stringify(response.data); ++ var content = JSON.parse(json); ++ var second_cpu_value = content.data.Value; ++ ++ return getScaledValue( ++ first_cpu_data.Value + second_cpu_value, first_cpu_data.Scale) + ++ ' ' + ++ Constants.POWER_CONSUMPTION_TEXT[first_cpu_data.Unit]; ++ }, ++ function(error) { ++ return getScaledValue( ++ first_cpu_data.Value, first_cpu_data.Scale) + ++ ' ' + ++ Constants.POWER_CONSUMPTION_TEXT[first_cpu_data.Unit]; ++ }); + }, + function(error) { + if ('Not Found' == error.statusText) { +diff --git a/app/overview/controllers/system-overview-controller.html b/app/overview/controllers/system-overview-controller.html +index 629e0ab..03644c6 100644 +--- a/app/overview/controllers/system-overview-controller.html ++++ b/app/overview/controllers/system-overview-controller.html +@@ -83,8 +83,8 @@ + <ul class="overview__metadata-wrapper"> + <li class="overview__metadata-block"> + <dl> +- <dt class="content-label">Power Consumption</dt> +- <dd class="courier-bold">{{power_consumption}}</dd> ++ <dt class="content-label">CPU Power Consumption</dt> ++ <dd class="courier-bold">{{cpu_power_consumption}}</dd> + </dl> + </li> + <li class="overview__metadata-block"> +diff --git a/app/overview/controllers/system-overview-controller.js b/app/overview/controllers/system-overview-controller.js +index 0b7d2f0..b466b6a 100644 +--- a/app/overview/controllers/system-overview-controller.js ++++ b/app/overview/controllers/system-overview-controller.js +@@ -19,7 +19,7 @@ window.angular && (function(angular) { + $scope.bmc_firmware = ''; + $scope.bmc_time = ''; + $scope.server_firmware = ''; +- $scope.power_consumption = ''; ++ $scope.cpu_power_consumption = ''; + $scope.power_cap = ''; + $scope.bmc_ip_addresses = []; + $scope.loading = false; +@@ -77,9 +77,9 @@ window.angular && (function(angular) { + console.log(JSON.stringify(error)); + }); + +- var getPowerConsumptionPromise = APIUtils.getPowerConsumption().then( ++ var getCPUPowerConsumptionPromise = APIUtils.getCPUPowerConsumption().then( + function(data) { +- $scope.power_consumption = data; ++ $scope.cpu_power_consumption = data; + }, + function(error) { + console.log(JSON.stringify(error)); +@@ -114,7 +114,7 @@ window.angular && (function(angular) { + getLEDStatePromise, + getBMCTimePromise, + getServerInfoPromise, +- getPowerConsumptionPromise, ++ getCPUPowerConsumptionPromise, + getPowerCapPromise, + getNetworkInfoPromise, + ]; +diff --git a/app/server-control/controllers/power-usage-controller.html b/app/server-control/controllers/power-usage-controller.html +index 62ca3da..273cf9b 100644 +--- a/app/server-control/controllers/power-usage-controller.html ++++ b/app/server-control/controllers/power-usage-controller.html +@@ -11,8 +11,8 @@ + <fieldset> + <ul class="power-usage__metadata-wrapper"> + <li class="power-usage__metadata-block"> +- <p class="content-label">Power Consumption</p> +- <p class="courier-bold">{{power_consumption}}</p> ++ <p class="content-label">CPU Power Consumption</p> ++ <p class="courier-bold">{{cpu_power_consumption}}</p> + </li> + <li class="power-usage__metadata-block"> + <div class="toggle inline"> +diff --git a/app/server-control/controllers/power-usage-controller.js b/app/server-control/controllers/power-usage-controller.js +index 9398259..bb2bf0d 100644 +--- a/app/server-control/controllers/power-usage-controller.js ++++ b/app/server-control/controllers/power-usage-controller.js +@@ -12,7 +12,7 @@ window.angular && (function(angular) { + angular.module('app.serverControl').controller('powerUsageController', [ + '$scope', '$window', 'APIUtils', '$route', '$q', 'toastService', + function($scope, $window, APIUtils, $route, $q, toastService) { +- $scope.power_consumption = ''; ++ $scope.cpu_power_consumption = ''; + $scope.power_cap = {}; + $scope.loading = false; + loadPowerData(); +@@ -28,16 +28,16 @@ window.angular && (function(angular) { + console.log(JSON.stringify(error)); + }); + +- var getPowerConsumptionPromise = APIUtils.getPowerConsumption().then( ++ var getCPUPowerConsumptionPromise = APIUtils.getCPUPowerConsumption().then( + function(data) { +- $scope.power_consumption = data; ++ $scope.cpu_power_consumption = data; + }, + function(error) { + console.log(JSON.stringify(error)); + }); + + var promises = [ +- getPowerConsumptionPromise, ++ getCPUPowerConsumptionPromise, + getPowerCapPromise, + ]; + diff --git a/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/login-page-name.patch b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/login-page-name.patch new file mode 100644 index 000000000..79ef25255 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/login-page-name.patch @@ -0,0 +1,13 @@ +diff --git a/app/login/controllers/login-controller.html b/app/login/controllers/login-controller.html +index b89c2c4..fd03283 100644 +--- a/app/login/controllers/login-controller.html ++++ b/app/login/controllers/login-controller.html +@@ -2,7 +2,7 @@ + <div class="row"> + <div class="columns large-6"> + <img src="../../assets/images/logo.svg" class="login__logo" alt="OpenBMC logo"/> +- <h1 class="login__desc">OpenBMC</h1> ++ <h3 class="login__desc">Talos™ II</h3> + </div> + <div class="columns large-6"> + <form id="login__form" name="login__form" action="" ng-class="{'submitted' : submitted}"> diff --git a/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/tachometer-display.patch b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/tachometer-display.patch new file mode 100644 index 000000000..f25c799b7 --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui/tachometer-display.patch @@ -0,0 +1,13 @@ +diff --git a/app/common/services/api-utils.js b/app/common/services/api-utils.js +index 4298884..e1881ff 100644 +--- a/app/common/services/api-utils.js ++++ b/app/common/services/api-utils.js +@@ -1472,7 +1472,7 @@ window.angular && (function(angular) { + } + + function titlelize(title) { +- title = title.replace(/([A-Z0-9]+)/g, ' $1').replace(/^\s+/, ''); ++ title = title.replace(/tach/g, ' Tachometer').replace(/([A-Z0-9]+)/g, ' $1').replace(/^\s+/, ''); + for (var i = 0; i < Constants.HARDWARE.uppercase_titles.length; + i++) { + if (title.toLowerCase().indexOf( diff --git a/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui_git.bbappend b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui_git.bbappend new file mode 100644 index 000000000..5fac6e13c --- /dev/null +++ b/meta-rcs/meta-talos/recipes-phosphor/webui/phosphor-webui_git.bbappend @@ -0,0 +1,5 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/phosphor-webui:" +SRC_URI += "file://login-page-name.patch \ + file://cpu-power-reporting.patch \ + file://tachometer-display.patch \ + " |
