From 88f28bbaaaa2a324a77efbc92970e9bd6dfb3e82 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Thu, 3 Oct 2019 18:41:53 -0400 Subject: ibm: rainier: remove witherpsoon, ac-server overrides Rainier mistakenly has witherspoon and ibm-ac-server machine overrides applied. Rainier is neither a witherspoon nor an ac-server (accelerated compute); remove so overrides approrpriate to those system types are not applied during a Rainier build. (From meta-ibm rev: c8e0f7ce18f89b09265ed4d2019f8a15999624a7) Change-Id: I3e931d032832bff0191eca2f4431e4bff1de2406 Signed-off-by: Brad Bishop --- meta-ibm/meta-witherspoon/conf/machine/rainier.conf | 1 - 1 file changed, 1 deletion(-) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf index 81d808a7b..03f2623ef 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf @@ -1,7 +1,6 @@ KERNEL_DEVICETREE = "aspeed-bmc-ibm-rainier.dtb" UBOOT_MACHINE = "evb-ast2600_defconfig" -MACHINEOVERRIDES =. "ibm-ac-server:witherspoon:" require conf/machine/include/ast2600.inc require conf/machine/include/obmc-bsp-common.inc require conf/machine/include/openpower.inc -- cgit v1.2.3 From fdde8df474b9ca43ac4bcde164d1dd989cda9d51 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 4 Oct 2019 14:47:52 -0500 Subject: rainier: systemd and journal defaults Use the defaults from witherspoon for now. With more space available in the rainier rootfs, we may tweak these in the future. (From meta-ibm rev: 6e733b66f460ffc03d27c81139ed318bc8c8583e) Change-Id: I66691a06854ab44173fa519e5f95fedbcdb2b6fa Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- .../recipes-core/systemd/systemd_%.bbappend | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend index a40f61873..500c91df5 100644 --- a/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-core/systemd/systemd_%.bbappend @@ -3,12 +3,25 @@ SRC_URI_append_ibm-ac-server = " file://journald-storage-policy.conf" SRC_URI_append_ibm-ac-server = " file://systemd-journald-override.conf" SRC_URI_append_ibm-ac-server = " file://journald-size-policy.conf" +SRC_URI_append_rainier = " file://journald-storage-policy.conf" +SRC_URI_append_rainier = " file://systemd-journald-override.conf" +SRC_URI_append_rainier = " file://journald-size-policy.conf" + FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf" FILES_${PN}_append_ibm-ac-server = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf" FILES_${PN}_append_ibm-ac-server = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf" +FILES_${PN}_append_rainier = " ${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf" +FILES_${PN}_append_rainier = " ${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf" +FILES_${PN}_append_rainier = " ${systemd_unitdir}/journald.conf.d/journald-size-policy.conf" + do_install_append_ibm-ac-server() { install -m 644 -D ${WORKDIR}/journald-storage-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf install -m 644 -D ${WORKDIR}/journald-size-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf } +do_install_append_rainier() { + install -m 644 -D ${WORKDIR}/journald-storage-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-storage-policy.conf + install -m 644 -D ${WORKDIR}/systemd-journald-override.conf ${D}${systemd_system_unitdir}/systemd-journald.service.d/systemd-journald-override.conf + install -m 644 -D ${WORKDIR}/journald-size-policy.conf ${D}${systemd_unitdir}/journald.conf.d/journald-size-policy.conf +} -- cgit v1.2.3 From 2db66078686509472bcbf63d395525dd507b4f25 Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Fri, 4 Oct 2019 14:47:42 -0500 Subject: meta-ibm: Fix OCC hwmon paths for the 5.3 kernel The 5.3 kernel adds an 'fsi-master' directory in front of the fsi0 and fsi1 directories in the OCC device tree paths. Update the OCC hwmon file paths accordingly as those are based on that path. (From meta-ibm rev: 696d1d3438499f974390c2c9c77fe4879509d9d1) Signed-off-by: Matt Spinler Change-Id: I62b00664f2ebc18ed291d23faaf310fd15ce3e90 Signed-off-by: Brad Bishop --- .../00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf | 291 ++++++++++++++ .../01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf | 280 +++++++++++++ .../00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf | 291 -------------- .../01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf | 280 ------------- .../00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf | 436 +++++++++++++++++++++ .../01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf | 366 +++++++++++++++++ .../00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf | 436 --------------------- .../01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf | 366 ----------------- .../00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf | 338 ++++++++++++++++ .../01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf | 268 +++++++++++++ .../00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf | 338 ---------------- .../01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf | 268 ------------- .../sensors/phosphor-hwmon_%.bbappend | 4 +- 13 files changed, 1981 insertions(+), 1981 deletions(-) create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/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 create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/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 create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf delete mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/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 (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf new file mode 100644 index 000000000..5b347c10c --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf @@ -0,0 +1,291 @@ +MODE_temp1 = "label" +MODE_temp2 = "label" +MODE_temp3 = "label" +MODE_temp4 = "label" +MODE_temp5 = "label" +MODE_temp6 = "label" +MODE_temp7 = "label" +MODE_temp8 = "label" +MODE_temp9 = "label" +MODE_temp10 = "label" +MODE_temp11 = "label" +MODE_temp12 = "label" +MODE_temp13 = "label" +MODE_temp14 = "label" +MODE_temp15 = "label" +MODE_temp16 = "label" +MODE_temp17 = "label" +MODE_temp18 = "label" +MODE_temp19 = "label" +MODE_temp20 = "label" +MODE_temp21 = "label" +MODE_temp22 = "label" +MODE_temp23 = "label" +MODE_temp24 = "label" +MODE_temp25 = "label" +MODE_temp26 = "label" +MODE_temp27 = "label" +MODE_temp28 = "label" +MODE_temp29 = "label" +MODE_temp30 = "label" +MODE_temp31 = "label" +MODE_temp32 = "label" +MODE_temp33 = "label" +MODE_temp34 = "label" +MODE_temp35 = "label" +MODE_temp36 = "label" +MODE_temp37 = "label" +MODE_temp38 = "label" +MODE_temp39 = "label" +MODE_temp40 = "label" +LABEL_temp17 = "p0_core0_temp" +WARNHI_temp17 = "85000" +WARNLO_temp17 = "0" +CRITHI_temp17 = "90000" +CRITLO_temp17 = "0" + +LABEL_temp20 = "p0_core1_temp" +WARNHI_temp20 = "85000" +WARNLO_temp20 = "0" +CRITHI_temp20 = "90000" +CRITLO_temp20 = "0" + +LABEL_temp23 = "p0_core2_temp" +WARNHI_temp23 = "85000" +WARNLO_temp23 = "0" +CRITHI_temp23 = "90000" +CRITLO_temp23 = "0" + +LABEL_temp26 = "p0_core3_temp" +WARNHI_temp26 = "85000" +WARNLO_temp26 = "0" +CRITHI_temp26 = "90000" +CRITLO_temp26 = "0" + +LABEL_temp29 = "p0_core4_temp" +WARNHI_temp29 = "85000" +WARNLO_temp29 = "0" +CRITHI_temp29 = "90000" +CRITLO_temp29 = "0" + +LABEL_temp32 = "p0_core5_temp" +WARNHI_temp32 = "85000" +WARNLO_temp32 = "0" +CRITHI_temp32 = "90000" +CRITLO_temp32 = "0" + +LABEL_temp35 = "p0_core6_temp" +WARNHI_temp35 = "85000" +WARNLO_temp35 = "0" +CRITHI_temp35 = "90000" +CRITLO_temp35 = "0" + +LABEL_temp38 = "p0_core7_temp" +WARNHI_temp38 = "85000" +WARNLO_temp38 = "0" +CRITHI_temp38 = "90000" +CRITLO_temp38 = "0" + +LABEL_temp41 = "p0_core8_temp" +WARNHI_temp41 = "85000" +WARNLO_temp41 = "0" +CRITHI_temp41 = "90000" +CRITLO_temp41 = "0" + +LABEL_temp44 = "p0_core9_temp" +WARNHI_temp44 = "85000" +WARNLO_temp44 = "0" +CRITHI_temp44 = "90000" +CRITLO_temp44 = "0" + +LABEL_temp47 = "p0_core10_temp" +WARNHI_temp47 = "85000" +WARNLO_temp47 = "0" +CRITHI_temp47 = "90000" +CRITLO_temp47 = "0" + +LABEL_temp50 = "p0_core11_temp" +WARNHI_temp50 = "85000" +WARNLO_temp50 = "0" +CRITHI_temp50 = "90000" +CRITLO_temp50 = "0" + +LABEL_temp53 = "p0_core12_temp" +WARNHI_temp53 = "85000" +WARNLO_temp53 = "0" +CRITHI_temp53 = "90000" +CRITLO_temp53 = "0" + +LABEL_temp56 = "p0_core13_temp" +WARNHI_temp56 = "85000" +WARNLO_temp56 = "0" +CRITHI_temp56 = "90000" +CRITLO_temp56 = "0" + +LABEL_temp59 = "p0_core14_temp" +WARNHI_temp59 = "85000" +WARNLO_temp59 = "0" +CRITHI_temp59 = "90000" +CRITLO_temp59 = "0" + +LABEL_temp62 = "p0_core15_temp" +WARNHI_temp62 = "85000" +WARNLO_temp62 = "0" +CRITHI_temp62 = "90000" +CRITLO_temp62 = "0" + +LABEL_temp65 = "p0_core16_temp" +WARNHI_temp65 = "85000" +WARNLO_temp65 = "0" +CRITHI_temp65 = "90000" +CRITLO_temp65 = "0" + +LABEL_temp68 = "p0_core17_temp" +WARNHI_temp68 = "85000" +WARNLO_temp68 = "0" +CRITHI_temp68 = "90000" +CRITLO_temp68 = "0" + +LABEL_temp71 = "p0_core18_temp" +WARNHI_temp71 = "85000" +WARNLO_temp71 = "0" +CRITHI_temp71 = "90000" +CRITLO_temp71 = "0" + +LABEL_temp74 = "p0_core19_temp" +WARNHI_temp74 = "85000" +WARNLO_temp74 = "0" +CRITHI_temp74 = "90000" +CRITLO_temp74 = "0" + +LABEL_temp77 = "p0_core20_temp" +WARNHI_temp77 = "85000" +WARNLO_temp77 = "0" +CRITHI_temp77 = "90000" +CRITLO_temp77 = "0" + +LABEL_temp80 = "p0_core21_temp" +WARNHI_temp80 = "85000" +WARNLO_temp80 = "0" +CRITHI_temp80 = "90000" +CRITLO_temp80 = "0" + +LABEL_temp83 = "p0_core22_temp" +WARNHI_temp83 = "85000" +WARNLO_temp83 = "0" +CRITHI_temp83 = "90000" +CRITLO_temp83 = "0" + +LABEL_temp86 = "p0_core23_temp" +WARNHI_temp86 = "85000" +WARNLO_temp86 = "0" +CRITHI_temp86 = "90000" +CRITLO_temp86 = "0" + +LABEL_temp165 = "dimm0_temp" +WARNHI_temp165 = "85000" +WARNLO_temp165 = "0" +CRITHI_temp165 = "95000" +CRITLO_temp165 = "0" + +LABEL_temp167 = "dimm1_temp" +WARNHI_temp167 = "85000" +WARNLO_temp167 = "0" +CRITHI_temp167 = "95000" +CRITLO_temp167 = "0" + +LABEL_temp169 = "dimm2_temp" +WARNHI_temp169 = "85000" +WARNLO_temp169 = "0" +CRITHI_temp169 = "95000" +CRITLO_temp169 = "0" + +LABEL_temp171 = "dimm3_temp" +WARNHI_temp171 = "85000" +WARNLO_temp171 = "0" +CRITHI_temp171 = "95000" +CRITLO_temp171 = "0" + +LABEL_temp173 = "dimm4_temp" +WARNHI_temp173 = "85000" +WARNLO_temp173 = "0" +CRITHI_temp173 = "95000" +CRITLO_temp173 = "0" + +LABEL_temp175 = "dimm5_temp" +WARNHI_temp175 = "85000" +WARNLO_temp175 = "0" +CRITHI_temp175 = "95000" +CRITLO_temp175 = "0" + +LABEL_temp177 = "dimm6_temp" +WARNHI_temp177 = "85000" +WARNLO_temp177 = "0" +CRITHI_temp177 = "95000" +CRITLO_temp177 = "0" + +LABEL_temp179 = "dimm7_temp" +WARNHI_temp179 = "85000" +WARNLO_temp179 = "0" +CRITHI_temp179 = "95000" +CRITLO_temp179 = "0" + +LABEL_temp197 = "dimm16_temp" +WARNHI_temp197 = "85000" +WARNLO_temp197 = "0" +CRITHI_temp197 = "95000" +CRITLO_temp197 = "0" + +LABEL_temp199 = "dimm17_temp" +WARNHI_temp199 = "85000" +WARNLO_temp199 = "0" +CRITHI_temp199 = "95000" +CRITLO_temp199 = "0" + +LABEL_temp201 = "dimm18_temp" +WARNHI_temp201 = "85000" +WARNLO_temp201 = "0" +CRITHI_temp201 = "95000" +CRITLO_temp201 = "0" + +LABEL_temp203 = "dimm19_temp" +WARNHI_temp203 = "85000" +WARNLO_temp203 = "0" +CRITHI_temp203 = "95000" +CRITLO_temp203 = "0" + +LABEL_temp205 = "dimm20_temp" +WARNHI_temp205 = "85000" +WARNLO_temp205 = "0" +CRITHI_temp205 = "95000" +CRITLO_temp205 = "0" + +LABEL_temp207 = "dimm21_temp" +WARNHI_temp207 = "85000" +WARNLO_temp207 = "0" +CRITHI_temp207 = "95000" +CRITLO_temp207 = "0" + +LABEL_temp209 = "dimm22_temp" +WARNHI_temp209 = "85000" +WARNLO_temp209 = "0" +CRITHI_temp209 = "95000" +CRITLO_temp209 = "0" + +LABEL_temp211 = "dimm23_temp" +WARNHI_temp211 = "85000" +WARNLO_temp211 = "0" +CRITHI_temp211 = "95000" +CRITLO_temp211 = "0" + +LABEL_power2 = "io_b_power" +LABEL_power3 = "io_a_power" +LABEL_power4 = "p1_mem_power" +LABEL_power5 = "p1_vdd_power" +LABEL_power6 = "p0_mem_power" +LABEL_power7 = "p0_vdd_power" +LABEL_power8 = "fans_power" +LABEL_power9 = "storage_b_power" +LABEL_power10 = "storage_a_power" +LABEL_power11 = "gpu0_power" +LABEL_power14 = "total_power" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf new file mode 100644 index 000000000..ba53cd95d --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf @@ -0,0 +1,280 @@ +MODE_temp1 = "label" +MODE_temp2 = "label" +MODE_temp3 = "label" +MODE_temp4 = "label" +MODE_temp5 = "label" +MODE_temp6 = "label" +MODE_temp7 = "label" +MODE_temp8 = "label" +MODE_temp9 = "label" +MODE_temp10 = "label" +MODE_temp11 = "label" +MODE_temp12 = "label" +MODE_temp13 = "label" +MODE_temp14 = "label" +MODE_temp15 = "label" +MODE_temp16 = "label" +MODE_temp17 = "label" +MODE_temp18 = "label" +MODE_temp19 = "label" +MODE_temp20 = "label" +MODE_temp21 = "label" +MODE_temp22 = "label" +MODE_temp23 = "label" +MODE_temp24 = "label" +MODE_temp25 = "label" +MODE_temp26 = "label" +MODE_temp27 = "label" +MODE_temp28 = "label" +MODE_temp29 = "label" +MODE_temp30 = "label" +MODE_temp31 = "label" +MODE_temp32 = "label" +MODE_temp33 = "label" +MODE_temp34 = "label" +MODE_temp35 = "label" +MODE_temp36 = "label" +MODE_temp37 = "label" +MODE_temp38 = "label" +MODE_temp39 = "label" +MODE_temp40 = "label" +LABEL_temp91 = "p1_core0_temp" +WARNHI_temp91 = "85000" +WARNLO_temp91 = "0" +CRITHI_temp91 = "90000" +CRITLO_temp91 = "0" + +LABEL_temp94 = "p1_core1_temp" +WARNHI_temp94 = "85000" +WARNLO_temp94 = "0" +CRITHI_temp94 = "90000" +CRITLO_temp94 = "0" + +LABEL_temp97 = "p1_core2_temp" +WARNHI_temp97 = "85000" +WARNLO_temp97 = "0" +CRITHI_temp97 = "90000" +CRITLO_temp97 = "0" + +LABEL_temp100 = "p1_core3_temp" +WARNHI_temp100 = "85000" +WARNLO_temp100 = "0" +CRITHI_temp100 = "90000" +CRITLO_temp100 = "0" + +LABEL_temp103 = "p1_core4_temp" +WARNHI_temp103 = "85000" +WARNLO_temp103 = "0" +CRITHI_temp103 = "90000" +CRITLO_temp103 = "0" + +LABEL_temp106 = "p1_core5_temp" +WARNHI_temp106 = "85000" +WARNLO_temp106 = "0" +CRITHI_temp106 = "90000" +CRITLO_temp106 = "0" + +LABEL_temp109 = "p1_core6_temp" +WARNHI_temp109 = "85000" +WARNLO_temp109 = "0" +CRITHI_temp109 = "90000" +CRITLO_temp109 = "0" + +LABEL_temp112 = "p1_core7_temp" +WARNHI_temp112 = "85000" +WARNLO_temp112 = "0" +CRITHI_temp112 = "90000" +CRITLO_temp112 = "0" + +LABEL_temp115 = "p1_core8_temp" +WARNHI_temp115 = "85000" +WARNLO_temp115 = "0" +CRITHI_temp115 = "90000" +CRITLO_temp115 = "0" + +LABEL_temp118 = "p1_core9_temp" +WARNHI_temp118 = "85000" +WARNLO_temp118 = "0" +CRITHI_temp118 = "90000" +CRITLO_temp118 = "0" + +LABEL_temp121 = "p1_core10_temp" +WARNHI_temp121 = "85000" +WARNLO_temp121 = "0" +CRITHI_temp121 = "90000" +CRITLO_temp121 = "0" + +LABEL_temp124 = "p1_core11_temp" +WARNHI_temp124 = "85000" +WARNLO_temp124 = "0" +CRITHI_temp124 = "90000" +CRITLO_temp124 = "0" + +LABEL_temp127 = "p1_core12_temp" +WARNHI_temp127 = "85000" +WARNLO_temp127 = "0" +CRITHI_temp127 = "90000" +CRITLO_temp127 = "0" + +LABEL_temp130 = "p1_core13_temp" +WARNHI_temp130 = "85000" +WARNLO_temp130 = "0" +CRITHI_temp130 = "90000" +CRITLO_temp130 = "0" + +LABEL_temp133 = "p1_core14_temp" +WARNHI_temp133 = "85000" +WARNLO_temp133 = "0" +CRITHI_temp133 = "90000" +CRITLO_temp133 = "0" + +LABEL_temp136 = "p1_core15_temp" +WARNHI_temp136 = "85000" +WARNLO_temp136 = "0" +CRITHI_temp136 = "90000" +CRITLO_temp136 = "0" + +LABEL_temp139 = "p1_core16_temp" +WARNHI_temp139 = "85000" +WARNLO_temp139 = "0" +CRITHI_temp139 = "90000" +CRITLO_temp139 = "0" + +LABEL_temp142 = "p1_core17_temp" +WARNHI_temp142 = "85000" +WARNLO_temp142 = "0" +CRITHI_temp142 = "90000" +CRITLO_temp142 = "0" + +LABEL_temp145 = "p1_core18_temp" +WARNHI_temp145 = "85000" +WARNLO_temp145 = "0" +CRITHI_temp145 = "90000" +CRITLO_temp145 = "0" + +LABEL_temp148 = "p1_core19_temp" +WARNHI_temp148 = "85000" +WARNLO_temp148 = "0" +CRITHI_temp148 = "90000" +CRITLO_temp148 = "0" + +LABEL_temp151 = "p1_core20_temp" +WARNHI_temp151 = "85000" +WARNLO_temp151 = "0" +CRITHI_temp151 = "90000" +CRITLO_temp151 = "0" + +LABEL_temp154 = "p1_core21_temp" +WARNHI_temp154 = "85000" +WARNLO_temp154 = "0" +CRITHI_temp154 = "90000" +CRITLO_temp154 = "0" + +LABEL_temp157 = "p1_core22_temp" +WARNHI_temp157 = "85000" +WARNLO_temp157 = "0" +CRITHI_temp157 = "90000" +CRITLO_temp157 = "0" + +LABEL_temp160 = "p1_core23_temp" +WARNHI_temp160 = "85000" +WARNLO_temp160 = "0" +CRITHI_temp160 = "90000" +CRITLO_temp160 = "0" + +LABEL_temp181 = "dimm8_temp" +WARNHI_temp181 = "85000" +WARNLO_temp181 = "0" +CRITHI_temp181 = "95000" +CRITLO_temp181 = "0" + +LABEL_temp183 = "dimm9_temp" +WARNHI_temp183 = "85000" +WARNLO_temp183 = "0" +CRITHI_temp183 = "95000" +CRITLO_temp183 = "0" + +LABEL_temp185 = "dimm10_temp" +WARNHI_temp185 = "85000" +WARNLO_temp185 = "0" +CRITHI_temp185 = "95000" +CRITLO_temp185 = "0" + +LABEL_temp187 = "dimm11_temp" +WARNHI_temp187 = "85000" +WARNLO_temp187 = "0" +CRITHI_temp187 = "95000" +CRITLO_temp187 = "0" + +LABEL_temp189 = "dimm12_temp" +WARNHI_temp189 = "85000" +WARNLO_temp189 = "0" +CRITHI_temp189 = "95000" +CRITLO_temp189 = "0" + +LABEL_temp191 = "dimm13_temp" +WARNHI_temp191 = "85000" +WARNLO_temp191 = "0" +CRITHI_temp191 = "95000" +CRITLO_temp191 = "0" + +LABEL_temp193 = "dimm14_temp" +WARNHI_temp193 = "85000" +WARNLO_temp193 = "0" +CRITHI_temp193 = "95000" +CRITLO_temp193 = "0" + +LABEL_temp195 = "dimm15_temp" +WARNHI_temp195 = "85000" +WARNLO_temp195 = "0" +CRITHI_temp195 = "95000" +CRITLO_temp195 = "0" + +LABEL_temp213 = "dimm24_temp" +WARNHI_temp213 = "85000" +WARNLO_temp213 = "0" +CRITHI_temp213 = "95000" +CRITLO_temp213 = "0" + +LABEL_temp215 = "dimm25_temp" +WARNHI_temp215 = "85000" +WARNLO_temp215 = "0" +CRITHI_temp215 = "95000" +CRITLO_temp215 = "0" + +LABEL_temp217 = "dimm26_temp" +WARNHI_temp217 = "85000" +WARNLO_temp217 = "0" +CRITHI_temp217 = "95000" +CRITLO_temp217 = "0" + +LABEL_temp219 = "dimm27_temp" +WARNHI_temp219 = "85000" +WARNLO_temp219 = "0" +CRITHI_temp219 = "95000" +CRITLO_temp219 = "0" + +LABEL_temp221 = "dimm28_temp" +WARNHI_temp221 = "85000" +WARNLO_temp221 = "0" +CRITHI_temp221 = "95000" +CRITLO_temp221 = "0" + +LABEL_temp223 = "dimm29_temp" +WARNHI_temp223 = "85000" +WARNLO_temp223 = "0" +CRITHI_temp223 = "95000" +CRITLO_temp223 = "0" + +LABEL_temp225 = "dimm30_temp" +WARNHI_temp225 = "85000" +WARNLO_temp225 = "0" +CRITHI_temp225 = "95000" +CRITLO_temp225 = "0" + +LABEL_temp227 = "dimm31_temp" +WARNHI_temp227 = "85000" +WARNLO_temp227 = "0" +CRITHI_temp227 = "95000" +CRITLO_temp227 = "0" + diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf deleted file mode 100644 index 5b347c10c..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ /dev/null @@ -1,291 +0,0 @@ -MODE_temp1 = "label" -MODE_temp2 = "label" -MODE_temp3 = "label" -MODE_temp4 = "label" -MODE_temp5 = "label" -MODE_temp6 = "label" -MODE_temp7 = "label" -MODE_temp8 = "label" -MODE_temp9 = "label" -MODE_temp10 = "label" -MODE_temp11 = "label" -MODE_temp12 = "label" -MODE_temp13 = "label" -MODE_temp14 = "label" -MODE_temp15 = "label" -MODE_temp16 = "label" -MODE_temp17 = "label" -MODE_temp18 = "label" -MODE_temp19 = "label" -MODE_temp20 = "label" -MODE_temp21 = "label" -MODE_temp22 = "label" -MODE_temp23 = "label" -MODE_temp24 = "label" -MODE_temp25 = "label" -MODE_temp26 = "label" -MODE_temp27 = "label" -MODE_temp28 = "label" -MODE_temp29 = "label" -MODE_temp30 = "label" -MODE_temp31 = "label" -MODE_temp32 = "label" -MODE_temp33 = "label" -MODE_temp34 = "label" -MODE_temp35 = "label" -MODE_temp36 = "label" -MODE_temp37 = "label" -MODE_temp38 = "label" -MODE_temp39 = "label" -MODE_temp40 = "label" -LABEL_temp17 = "p0_core0_temp" -WARNHI_temp17 = "85000" -WARNLO_temp17 = "0" -CRITHI_temp17 = "90000" -CRITLO_temp17 = "0" - -LABEL_temp20 = "p0_core1_temp" -WARNHI_temp20 = "85000" -WARNLO_temp20 = "0" -CRITHI_temp20 = "90000" -CRITLO_temp20 = "0" - -LABEL_temp23 = "p0_core2_temp" -WARNHI_temp23 = "85000" -WARNLO_temp23 = "0" -CRITHI_temp23 = "90000" -CRITLO_temp23 = "0" - -LABEL_temp26 = "p0_core3_temp" -WARNHI_temp26 = "85000" -WARNLO_temp26 = "0" -CRITHI_temp26 = "90000" -CRITLO_temp26 = "0" - -LABEL_temp29 = "p0_core4_temp" -WARNHI_temp29 = "85000" -WARNLO_temp29 = "0" -CRITHI_temp29 = "90000" -CRITLO_temp29 = "0" - -LABEL_temp32 = "p0_core5_temp" -WARNHI_temp32 = "85000" -WARNLO_temp32 = "0" -CRITHI_temp32 = "90000" -CRITLO_temp32 = "0" - -LABEL_temp35 = "p0_core6_temp" -WARNHI_temp35 = "85000" -WARNLO_temp35 = "0" -CRITHI_temp35 = "90000" -CRITLO_temp35 = "0" - -LABEL_temp38 = "p0_core7_temp" -WARNHI_temp38 = "85000" -WARNLO_temp38 = "0" -CRITHI_temp38 = "90000" -CRITLO_temp38 = "0" - -LABEL_temp41 = "p0_core8_temp" -WARNHI_temp41 = "85000" -WARNLO_temp41 = "0" -CRITHI_temp41 = "90000" -CRITLO_temp41 = "0" - -LABEL_temp44 = "p0_core9_temp" -WARNHI_temp44 = "85000" -WARNLO_temp44 = "0" -CRITHI_temp44 = "90000" -CRITLO_temp44 = "0" - -LABEL_temp47 = "p0_core10_temp" -WARNHI_temp47 = "85000" -WARNLO_temp47 = "0" -CRITHI_temp47 = "90000" -CRITLO_temp47 = "0" - -LABEL_temp50 = "p0_core11_temp" -WARNHI_temp50 = "85000" -WARNLO_temp50 = "0" -CRITHI_temp50 = "90000" -CRITLO_temp50 = "0" - -LABEL_temp53 = "p0_core12_temp" -WARNHI_temp53 = "85000" -WARNLO_temp53 = "0" -CRITHI_temp53 = "90000" -CRITLO_temp53 = "0" - -LABEL_temp56 = "p0_core13_temp" -WARNHI_temp56 = "85000" -WARNLO_temp56 = "0" -CRITHI_temp56 = "90000" -CRITLO_temp56 = "0" - -LABEL_temp59 = "p0_core14_temp" -WARNHI_temp59 = "85000" -WARNLO_temp59 = "0" -CRITHI_temp59 = "90000" -CRITLO_temp59 = "0" - -LABEL_temp62 = "p0_core15_temp" -WARNHI_temp62 = "85000" -WARNLO_temp62 = "0" -CRITHI_temp62 = "90000" -CRITLO_temp62 = "0" - -LABEL_temp65 = "p0_core16_temp" -WARNHI_temp65 = "85000" -WARNLO_temp65 = "0" -CRITHI_temp65 = "90000" -CRITLO_temp65 = "0" - -LABEL_temp68 = "p0_core17_temp" -WARNHI_temp68 = "85000" -WARNLO_temp68 = "0" -CRITHI_temp68 = "90000" -CRITLO_temp68 = "0" - -LABEL_temp71 = "p0_core18_temp" -WARNHI_temp71 = "85000" -WARNLO_temp71 = "0" -CRITHI_temp71 = "90000" -CRITLO_temp71 = "0" - -LABEL_temp74 = "p0_core19_temp" -WARNHI_temp74 = "85000" -WARNLO_temp74 = "0" -CRITHI_temp74 = "90000" -CRITLO_temp74 = "0" - -LABEL_temp77 = "p0_core20_temp" -WARNHI_temp77 = "85000" -WARNLO_temp77 = "0" -CRITHI_temp77 = "90000" -CRITLO_temp77 = "0" - -LABEL_temp80 = "p0_core21_temp" -WARNHI_temp80 = "85000" -WARNLO_temp80 = "0" -CRITHI_temp80 = "90000" -CRITLO_temp80 = "0" - -LABEL_temp83 = "p0_core22_temp" -WARNHI_temp83 = "85000" -WARNLO_temp83 = "0" -CRITHI_temp83 = "90000" -CRITLO_temp83 = "0" - -LABEL_temp86 = "p0_core23_temp" -WARNHI_temp86 = "85000" -WARNLO_temp86 = "0" -CRITHI_temp86 = "90000" -CRITLO_temp86 = "0" - -LABEL_temp165 = "dimm0_temp" -WARNHI_temp165 = "85000" -WARNLO_temp165 = "0" -CRITHI_temp165 = "95000" -CRITLO_temp165 = "0" - -LABEL_temp167 = "dimm1_temp" -WARNHI_temp167 = "85000" -WARNLO_temp167 = "0" -CRITHI_temp167 = "95000" -CRITLO_temp167 = "0" - -LABEL_temp169 = "dimm2_temp" -WARNHI_temp169 = "85000" -WARNLO_temp169 = "0" -CRITHI_temp169 = "95000" -CRITLO_temp169 = "0" - -LABEL_temp171 = "dimm3_temp" -WARNHI_temp171 = "85000" -WARNLO_temp171 = "0" -CRITHI_temp171 = "95000" -CRITLO_temp171 = "0" - -LABEL_temp173 = "dimm4_temp" -WARNHI_temp173 = "85000" -WARNLO_temp173 = "0" -CRITHI_temp173 = "95000" -CRITLO_temp173 = "0" - -LABEL_temp175 = "dimm5_temp" -WARNHI_temp175 = "85000" -WARNLO_temp175 = "0" -CRITHI_temp175 = "95000" -CRITLO_temp175 = "0" - -LABEL_temp177 = "dimm6_temp" -WARNHI_temp177 = "85000" -WARNLO_temp177 = "0" -CRITHI_temp177 = "95000" -CRITLO_temp177 = "0" - -LABEL_temp179 = "dimm7_temp" -WARNHI_temp179 = "85000" -WARNLO_temp179 = "0" -CRITHI_temp179 = "95000" -CRITLO_temp179 = "0" - -LABEL_temp197 = "dimm16_temp" -WARNHI_temp197 = "85000" -WARNLO_temp197 = "0" -CRITHI_temp197 = "95000" -CRITLO_temp197 = "0" - -LABEL_temp199 = "dimm17_temp" -WARNHI_temp199 = "85000" -WARNLO_temp199 = "0" -CRITHI_temp199 = "95000" -CRITLO_temp199 = "0" - -LABEL_temp201 = "dimm18_temp" -WARNHI_temp201 = "85000" -WARNLO_temp201 = "0" -CRITHI_temp201 = "95000" -CRITLO_temp201 = "0" - -LABEL_temp203 = "dimm19_temp" -WARNHI_temp203 = "85000" -WARNLO_temp203 = "0" -CRITHI_temp203 = "95000" -CRITLO_temp203 = "0" - -LABEL_temp205 = "dimm20_temp" -WARNHI_temp205 = "85000" -WARNLO_temp205 = "0" -CRITHI_temp205 = "95000" -CRITLO_temp205 = "0" - -LABEL_temp207 = "dimm21_temp" -WARNHI_temp207 = "85000" -WARNLO_temp207 = "0" -CRITHI_temp207 = "95000" -CRITLO_temp207 = "0" - -LABEL_temp209 = "dimm22_temp" -WARNHI_temp209 = "85000" -WARNLO_temp209 = "0" -CRITHI_temp209 = "95000" -CRITLO_temp209 = "0" - -LABEL_temp211 = "dimm23_temp" -WARNHI_temp211 = "85000" -WARNLO_temp211 = "0" -CRITHI_temp211 = "95000" -CRITLO_temp211 = "0" - -LABEL_power2 = "io_b_power" -LABEL_power3 = "io_a_power" -LABEL_power4 = "p1_mem_power" -LABEL_power5 = "p1_vdd_power" -LABEL_power6 = "p0_mem_power" -LABEL_power7 = "p0_vdd_power" -LABEL_power8 = "fans_power" -LABEL_power9 = "storage_b_power" -LABEL_power10 = "storage_a_power" -LABEL_power11 = "gpu0_power" -LABEL_power14 = "total_power" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/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-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/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 deleted file mode 100644 index ba53cd95d..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/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 +++ /dev/null @@ -1,280 +0,0 @@ -MODE_temp1 = "label" -MODE_temp2 = "label" -MODE_temp3 = "label" -MODE_temp4 = "label" -MODE_temp5 = "label" -MODE_temp6 = "label" -MODE_temp7 = "label" -MODE_temp8 = "label" -MODE_temp9 = "label" -MODE_temp10 = "label" -MODE_temp11 = "label" -MODE_temp12 = "label" -MODE_temp13 = "label" -MODE_temp14 = "label" -MODE_temp15 = "label" -MODE_temp16 = "label" -MODE_temp17 = "label" -MODE_temp18 = "label" -MODE_temp19 = "label" -MODE_temp20 = "label" -MODE_temp21 = "label" -MODE_temp22 = "label" -MODE_temp23 = "label" -MODE_temp24 = "label" -MODE_temp25 = "label" -MODE_temp26 = "label" -MODE_temp27 = "label" -MODE_temp28 = "label" -MODE_temp29 = "label" -MODE_temp30 = "label" -MODE_temp31 = "label" -MODE_temp32 = "label" -MODE_temp33 = "label" -MODE_temp34 = "label" -MODE_temp35 = "label" -MODE_temp36 = "label" -MODE_temp37 = "label" -MODE_temp38 = "label" -MODE_temp39 = "label" -MODE_temp40 = "label" -LABEL_temp91 = "p1_core0_temp" -WARNHI_temp91 = "85000" -WARNLO_temp91 = "0" -CRITHI_temp91 = "90000" -CRITLO_temp91 = "0" - -LABEL_temp94 = "p1_core1_temp" -WARNHI_temp94 = "85000" -WARNLO_temp94 = "0" -CRITHI_temp94 = "90000" -CRITLO_temp94 = "0" - -LABEL_temp97 = "p1_core2_temp" -WARNHI_temp97 = "85000" -WARNLO_temp97 = "0" -CRITHI_temp97 = "90000" -CRITLO_temp97 = "0" - -LABEL_temp100 = "p1_core3_temp" -WARNHI_temp100 = "85000" -WARNLO_temp100 = "0" -CRITHI_temp100 = "90000" -CRITLO_temp100 = "0" - -LABEL_temp103 = "p1_core4_temp" -WARNHI_temp103 = "85000" -WARNLO_temp103 = "0" -CRITHI_temp103 = "90000" -CRITLO_temp103 = "0" - -LABEL_temp106 = "p1_core5_temp" -WARNHI_temp106 = "85000" -WARNLO_temp106 = "0" -CRITHI_temp106 = "90000" -CRITLO_temp106 = "0" - -LABEL_temp109 = "p1_core6_temp" -WARNHI_temp109 = "85000" -WARNLO_temp109 = "0" -CRITHI_temp109 = "90000" -CRITLO_temp109 = "0" - -LABEL_temp112 = "p1_core7_temp" -WARNHI_temp112 = "85000" -WARNLO_temp112 = "0" -CRITHI_temp112 = "90000" -CRITLO_temp112 = "0" - -LABEL_temp115 = "p1_core8_temp" -WARNHI_temp115 = "85000" -WARNLO_temp115 = "0" -CRITHI_temp115 = "90000" -CRITLO_temp115 = "0" - -LABEL_temp118 = "p1_core9_temp" -WARNHI_temp118 = "85000" -WARNLO_temp118 = "0" -CRITHI_temp118 = "90000" -CRITLO_temp118 = "0" - -LABEL_temp121 = "p1_core10_temp" -WARNHI_temp121 = "85000" -WARNLO_temp121 = "0" -CRITHI_temp121 = "90000" -CRITLO_temp121 = "0" - -LABEL_temp124 = "p1_core11_temp" -WARNHI_temp124 = "85000" -WARNLO_temp124 = "0" -CRITHI_temp124 = "90000" -CRITLO_temp124 = "0" - -LABEL_temp127 = "p1_core12_temp" -WARNHI_temp127 = "85000" -WARNLO_temp127 = "0" -CRITHI_temp127 = "90000" -CRITLO_temp127 = "0" - -LABEL_temp130 = "p1_core13_temp" -WARNHI_temp130 = "85000" -WARNLO_temp130 = "0" -CRITHI_temp130 = "90000" -CRITLO_temp130 = "0" - -LABEL_temp133 = "p1_core14_temp" -WARNHI_temp133 = "85000" -WARNLO_temp133 = "0" -CRITHI_temp133 = "90000" -CRITLO_temp133 = "0" - -LABEL_temp136 = "p1_core15_temp" -WARNHI_temp136 = "85000" -WARNLO_temp136 = "0" -CRITHI_temp136 = "90000" -CRITLO_temp136 = "0" - -LABEL_temp139 = "p1_core16_temp" -WARNHI_temp139 = "85000" -WARNLO_temp139 = "0" -CRITHI_temp139 = "90000" -CRITLO_temp139 = "0" - -LABEL_temp142 = "p1_core17_temp" -WARNHI_temp142 = "85000" -WARNLO_temp142 = "0" -CRITHI_temp142 = "90000" -CRITLO_temp142 = "0" - -LABEL_temp145 = "p1_core18_temp" -WARNHI_temp145 = "85000" -WARNLO_temp145 = "0" -CRITHI_temp145 = "90000" -CRITLO_temp145 = "0" - -LABEL_temp148 = "p1_core19_temp" -WARNHI_temp148 = "85000" -WARNLO_temp148 = "0" -CRITHI_temp148 = "90000" -CRITLO_temp148 = "0" - -LABEL_temp151 = "p1_core20_temp" -WARNHI_temp151 = "85000" -WARNLO_temp151 = "0" -CRITHI_temp151 = "90000" -CRITLO_temp151 = "0" - -LABEL_temp154 = "p1_core21_temp" -WARNHI_temp154 = "85000" -WARNLO_temp154 = "0" -CRITHI_temp154 = "90000" -CRITLO_temp154 = "0" - -LABEL_temp157 = "p1_core22_temp" -WARNHI_temp157 = "85000" -WARNLO_temp157 = "0" -CRITHI_temp157 = "90000" -CRITLO_temp157 = "0" - -LABEL_temp160 = "p1_core23_temp" -WARNHI_temp160 = "85000" -WARNLO_temp160 = "0" -CRITHI_temp160 = "90000" -CRITLO_temp160 = "0" - -LABEL_temp181 = "dimm8_temp" -WARNHI_temp181 = "85000" -WARNLO_temp181 = "0" -CRITHI_temp181 = "95000" -CRITLO_temp181 = "0" - -LABEL_temp183 = "dimm9_temp" -WARNHI_temp183 = "85000" -WARNLO_temp183 = "0" -CRITHI_temp183 = "95000" -CRITLO_temp183 = "0" - -LABEL_temp185 = "dimm10_temp" -WARNHI_temp185 = "85000" -WARNLO_temp185 = "0" -CRITHI_temp185 = "95000" -CRITLO_temp185 = "0" - -LABEL_temp187 = "dimm11_temp" -WARNHI_temp187 = "85000" -WARNLO_temp187 = "0" -CRITHI_temp187 = "95000" -CRITLO_temp187 = "0" - -LABEL_temp189 = "dimm12_temp" -WARNHI_temp189 = "85000" -WARNLO_temp189 = "0" -CRITHI_temp189 = "95000" -CRITLO_temp189 = "0" - -LABEL_temp191 = "dimm13_temp" -WARNHI_temp191 = "85000" -WARNLO_temp191 = "0" -CRITHI_temp191 = "95000" -CRITLO_temp191 = "0" - -LABEL_temp193 = "dimm14_temp" -WARNHI_temp193 = "85000" -WARNLO_temp193 = "0" -CRITHI_temp193 = "95000" -CRITLO_temp193 = "0" - -LABEL_temp195 = "dimm15_temp" -WARNHI_temp195 = "85000" -WARNLO_temp195 = "0" -CRITHI_temp195 = "95000" -CRITLO_temp195 = "0" - -LABEL_temp213 = "dimm24_temp" -WARNHI_temp213 = "85000" -WARNLO_temp213 = "0" -CRITHI_temp213 = "95000" -CRITLO_temp213 = "0" - -LABEL_temp215 = "dimm25_temp" -WARNHI_temp215 = "85000" -WARNLO_temp215 = "0" -CRITHI_temp215 = "95000" -CRITLO_temp215 = "0" - -LABEL_temp217 = "dimm26_temp" -WARNHI_temp217 = "85000" -WARNLO_temp217 = "0" -CRITHI_temp217 = "95000" -CRITLO_temp217 = "0" - -LABEL_temp219 = "dimm27_temp" -WARNHI_temp219 = "85000" -WARNLO_temp219 = "0" -CRITHI_temp219 = "95000" -CRITLO_temp219 = "0" - -LABEL_temp221 = "dimm28_temp" -WARNHI_temp221 = "85000" -WARNLO_temp221 = "0" -CRITHI_temp221 = "95000" -CRITLO_temp221 = "0" - -LABEL_temp223 = "dimm29_temp" -WARNHI_temp223 = "85000" -WARNLO_temp223 = "0" -CRITHI_temp223 = "95000" -CRITLO_temp223 = "0" - -LABEL_temp225 = "dimm30_temp" -WARNHI_temp225 = "85000" -WARNLO_temp225 = "0" -CRITHI_temp225 = "95000" -CRITLO_temp225 = "0" - -LABEL_temp227 = "dimm31_temp" -WARNHI_temp227 = "85000" -WARNLO_temp227 = "0" -CRITHI_temp227 = "95000" -CRITLO_temp227 = "0" - diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf new file mode 100644 index 000000000..5582e9dbf --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf @@ -0,0 +1,436 @@ +MODE_temp1 = "label" +MODE_temp2 = "label" +MODE_temp3 = "label" +MODE_temp4 = "label" +MODE_temp5 = "label" +MODE_temp6 = "label" +MODE_temp7 = "label" +MODE_temp8 = "label" +MODE_temp9 = "label" +MODE_temp10 = "label" +MODE_temp11 = "label" +MODE_temp12 = "label" +MODE_temp13 = "label" +MODE_temp14 = "label" +MODE_temp15 = "label" +MODE_temp16 = "label" +MODE_temp17 = "label" +MODE_temp18 = "label" +MODE_temp19 = "label" +MODE_temp20 = "label" +MODE_temp21 = "label" +MODE_temp22 = "label" +MODE_temp23 = "label" +MODE_temp24 = "label" +MODE_temp25 = "label" +MODE_temp26 = "label" +MODE_temp27 = "label" +MODE_temp28 = "label" +MODE_temp29 = "label" +MODE_temp30 = "label" +MODE_temp31 = "label" +MODE_temp32 = "label" +MODE_temp33 = "label" +MODE_temp34 = "label" +MODE_temp35 = "label" +MODE_temp36 = "label" +MODE_temp37 = "label" +MODE_temp38 = "label" +MODE_temp39 = "label" +MODE_temp40 = "label" +MODE_temp41 = "label" +MODE_temp42 = "label" +MODE_temp43 = "label" +MODE_temp44 = "label" +MODE_temp45 = "label" +MODE_temp46 = "label" +MODE_temp47 = "label" +MODE_temp48 = "label" +MODE_temp49 = "label" +MODE_temp50 = "label" +MODE_temp51 = "label" +MODE_temp52 = "label" + +MODE_power1 = "label" +MODE_power2 = "label" +MODE_power3 = "label" +MODE_power4 = "label" +MODE_power5 = "label" +MODE_power6 = "label" +MODE_power7 = "label" +MODE_power8 = "label" +MODE_power9 = "label" +MODE_power10 = "label" +MODE_power11 = "label" +MODE_power12 = "label" +MODE_power13 = "label" +MODE_power14 = "label" +MODE_power15 = "label" + +REMOVERCS = "11" + +LABEL_temp17 = "p0_core0_temp" +WARNHI_temp17 = "78000" +WARNLO_temp17 = "0" +CRITHI_temp17 = "83000" +CRITLO_temp17 = "0" + +LABEL_temp20 = "p0_core1_temp" +WARNHI_temp20 = "78000" +WARNLO_temp20 = "0" +CRITHI_temp20 = "83000" +CRITLO_temp20 = "0" + +LABEL_temp23 = "p0_core2_temp" +WARNHI_temp23 = "78000" +WARNLO_temp23 = "0" +CRITHI_temp23 = "83000" +CRITLO_temp23 = "0" + +LABEL_temp26 = "p0_core3_temp" +WARNHI_temp26 = "78000" +WARNLO_temp26 = "0" +CRITHI_temp26 = "83000" +CRITLO_temp26 = "0" + +LABEL_temp29 = "p0_core4_temp" +WARNHI_temp29 = "78000" +WARNLO_temp29 = "0" +CRITHI_temp29 = "83000" +CRITLO_temp29 = "0" + +LABEL_temp32 = "p0_core5_temp" +WARNHI_temp32 = "78000" +WARNLO_temp32 = "0" +CRITHI_temp32 = "83000" +CRITLO_temp32 = "0" + +LABEL_temp35 = "p0_core6_temp" +WARNHI_temp35 = "78000" +WARNLO_temp35 = "0" +CRITHI_temp35 = "83000" +CRITLO_temp35 = "0" + +LABEL_temp38 = "p0_core7_temp" +WARNHI_temp38 = "78000" +WARNLO_temp38 = "0" +CRITHI_temp38 = "83000" +CRITLO_temp38 = "0" + +LABEL_temp41 = "p0_core8_temp" +WARNHI_temp41 = "78000" +WARNLO_temp41 = "0" +CRITHI_temp41 = "83000" +CRITLO_temp41 = "0" + +LABEL_temp44 = "p0_core9_temp" +WARNHI_temp44 = "78000" +WARNLO_temp44 = "0" +CRITHI_temp44 = "83000" +CRITLO_temp44 = "0" + +LABEL_temp47 = "p0_core10_temp" +WARNHI_temp47 = "78000" +WARNLO_temp47 = "0" +CRITHI_temp47 = "83000" +CRITLO_temp47 = "0" + +LABEL_temp50 = "p0_core11_temp" +WARNHI_temp50 = "78000" +WARNLO_temp50 = "0" +CRITHI_temp50 = "83000" +CRITLO_temp50 = "0" + +LABEL_temp53 = "p0_core12_temp" +WARNHI_temp53 = "78000" +WARNLO_temp53 = "0" +CRITHI_temp53 = "83000" +CRITLO_temp53 = "0" + +LABEL_temp56 = "p0_core13_temp" +WARNHI_temp56 = "78000" +WARNLO_temp56 = "0" +CRITHI_temp56 = "83000" +CRITLO_temp56 = "0" + +LABEL_temp59 = "p0_core14_temp" +WARNHI_temp59 = "78000" +WARNLO_temp59 = "0" +CRITHI_temp59 = "83000" +CRITLO_temp59 = "0" + +LABEL_temp62 = "p0_core15_temp" +WARNHI_temp62 = "78000" +WARNLO_temp62 = "0" +CRITHI_temp62 = "83000" +CRITLO_temp62 = "0" + +LABEL_temp65 = "p0_core16_temp" +WARNHI_temp65 = "78000" +WARNLO_temp65 = "0" +CRITHI_temp65 = "83000" +CRITLO_temp65 = "0" + +LABEL_temp68 = "p0_core17_temp" +WARNHI_temp68 = "78000" +WARNLO_temp68 = "0" +CRITHI_temp68 = "83000" +CRITLO_temp68 = "0" + +LABEL_temp71 = "p0_core18_temp" +WARNHI_temp71 = "78000" +WARNLO_temp71 = "0" +CRITHI_temp71 = "83000" +CRITLO_temp71 = "0" + +LABEL_temp74 = "p0_core19_temp" +WARNHI_temp74 = "78000" +WARNLO_temp74 = "0" +CRITHI_temp74 = "83000" +CRITLO_temp74 = "0" + +LABEL_temp77 = "p0_core20_temp" +WARNHI_temp77 = "78000" +WARNLO_temp77 = "0" +CRITHI_temp77 = "83000" +CRITLO_temp77 = "0" + +LABEL_temp80 = "p0_core21_temp" +WARNHI_temp80 = "78000" +WARNLO_temp80 = "0" +CRITHI_temp80 = "83000" +CRITLO_temp80 = "0" + +LABEL_temp83 = "p0_core22_temp" +WARNHI_temp83 = "78000" +WARNLO_temp83 = "0" +CRITHI_temp83 = "83000" +CRITLO_temp83 = "0" + +LABEL_temp86 = "p0_core23_temp" +WARNHI_temp86 = "78000" +WARNLO_temp86 = "0" +CRITHI_temp86 = "83000" +CRITLO_temp86 = "0" + +LABEL_temp165 = "dimm0_temp0" +WARNHI_temp165 = "78000" +WARNLO_temp165 = "0" +CRITHI_temp165 = "83000" +CRITLO_temp165 = "0" + +LABEL_temp166 = "dimm0_temp1" +WARNHI_temp166 = "78000" +WARNLO_temp166 = "0" +CRITHI_temp166 = "83000" +CRITLO_temp166 = "0" + +LABEL_temp168 = "dimm1_temp0" +WARNHI_temp168 = "78000" +WARNLO_temp168 = "0" +CRITHI_temp168 = "83000" +CRITLO_temp168 = "0" + +LABEL_temp169 = "dimm1_temp1" +WARNHI_temp169 = "78000" +WARNLO_temp169 = "0" +CRITHI_temp169 = "83000" +CRITLO_temp169 = "0" + +LABEL_temp171 = "dimm2_temp0" +WARNHI_temp171 = "78000" +WARNLO_temp171 = "0" +CRITHI_temp171 = "83000" +CRITLO_temp171 = "0" + +LABEL_temp172 = "dimm2_temp1" +WARNHI_temp172 = "78000" +WARNLO_temp172 = "0" +CRITHI_temp172 = "83000" +CRITLO_temp172 = "0" + +LABEL_temp174 = "dimm3_temp0" +WARNHI_temp174 = "78000" +WARNLO_temp174 = "0" +CRITHI_temp174 = "83000" +CRITLO_temp174 = "0" + +LABEL_temp175 = "dimm3_temp1" +WARNHI_temp175 = "78000" +WARNLO_temp175 = "0" +CRITHI_temp175 = "83000" +CRITLO_temp175 = "0" + +LABEL_temp177 = "dimm4_temp0" +WARNHI_temp177 = "78000" +WARNLO_temp177 = "0" +CRITHI_temp177 = "83000" +CRITLO_temp177 = "0" + +LABEL_temp178 = "dimm4_temp1" +WARNHI_temp178 = "78000" +WARNLO_temp178 = "0" +CRITHI_temp178 = "83000" +CRITLO_temp178 = "0" + +LABEL_temp180 = "dimm5_temp0" +WARNHI_temp180 = "78000" +WARNLO_temp180 = "0" +CRITHI_temp180 = "83000" +CRITLO_temp180 = "0" + +LABEL_temp181 = "dimm5_temp1" +WARNHI_temp181 = "78000" +WARNLO_temp181 = "0" +CRITHI_temp181 = "83000" +CRITLO_temp181 = "0" + +LABEL_temp183 = "dimm6_temp0" +WARNHI_temp183 = "78000" +WARNLO_temp183 = "0" +CRITHI_temp183 = "83000" +CRITLO_temp183 = "0" + +LABEL_temp184 = "dimm6_temp1" +WARNHI_temp184 = "78000" +WARNLO_temp184 = "0" +CRITHI_temp184 = "83000" +CRITLO_temp184 = "0" + +LABEL_temp186 = "dimm7_temp0" +WARNHI_temp186 = "78000" +WARNLO_temp186 = "0" +CRITHI_temp186 = "83000" +CRITLO_temp186 = "0" + +LABEL_temp187 = "dimm7_temp1" +WARNHI_temp187 = "78000" +WARNLO_temp187 = "0" +CRITHI_temp187 = "83000" +CRITLO_temp187 = "0" + +LABEL_temp189 = "dimm8_temp0" +WARNHI_temp189 = "78000" +WARNLO_temp189 = "0" +CRITHI_temp189 = "83000" +CRITLO_temp189 = "0" + +LABEL_temp190 = "dimm8_temp1" +WARNHI_temp190 = "78000" +WARNLO_temp190 = "0" +CRITHI_temp190 = "83000" +CRITLO_temp190 = "0" + +LABEL_temp192 = "dimm9_temp0" +WARNHI_temp192 = "78000" +WARNLO_temp192 = "0" +CRITHI_temp192 = "83000" +CRITLO_temp192 = "0" + +LABEL_temp193 = "dimm9_temp1" +WARNHI_temp193 = "78000" +WARNLO_temp193 = "0" +CRITHI_temp193 = "83000" +CRITLO_temp193 = "0" + +LABEL_temp195 = "dimm10_temp0" +WARNHI_temp195 = "78000" +WARNLO_temp195 = "0" +CRITHI_temp195 = "83000" +CRITLO_temp195 = "0" + +LABEL_temp196 = "dimm10_temp1" +WARNHI_temp196 = "78000" +WARNLO_temp196 = "0" +CRITHI_temp196 = "83000" +CRITLO_temp196 = "0" + +LABEL_temp198 = "dimm11_temp0" +WARNHI_temp198 = "78000" +WARNLO_temp198 = "0" +CRITHI_temp198 = "83000" +CRITLO_temp198 = "0" + +LABEL_temp199 = "dimm11_temp1" +WARNHI_temp199 = "78000" +WARNLO_temp199 = "0" +CRITHI_temp199 = "83000" +CRITLO_temp199 = "0" + +LABEL_temp237 = "gpu0_core_temp" +WARNHI_temp237 = "76000" +WARNLO_temp237 = "0" +CRITHI_temp237 = "81000" +CRITLO_temp237 = "0" + +LABEL_temp238 = "gpu0_mem_temp" +WARNHI_temp238 = "78000" +WARNLO_temp238 = "0" +CRITHI_temp238 = "83000" +CRITLO_temp238 = "0" + +LABEL_temp240 = "gpu1_core_temp" +WARNHI_temp240 = "76000" +WARNLO_temp240 = "0" +CRITHI_temp240 = "81000" +CRITLO_temp240 = "0" + +LABEL_temp241 = "gpu1_mem_temp" +WARNHI_temp241 = "78000" +WARNLO_temp241 = "0" +CRITHI_temp241 = "83000" +CRITLO_temp241 = "0" + +LABEL_power0_22_0 = "total_power" +WARNHI_power0_22_0 = "3050000000" +WARNLO_power0_22_0 = "0" +CRITHI_power0_22_0 = "3100000000" +CRITLO_power0_22_0 = "0" + +LABEL_power0_5_2 = "p0_power" +WARNHI_power0_5_2 = "250000000" +WARNLO_power0_5_2 = "0" +CRITHI_power0_5_2 = "300000000" +CRITLO_power0_5_2 = "0" + +LABEL_power0_6_3 = "p1_power" +WARNHI_power0_6_3 = "250000000" +WARNLO_power0_6_3 = "0" +CRITHI_power0_6_3 = "300000000" +CRITLO_power0_6_3 = "0" + +LABEL_power0_9_4 = "p0_io_power" +WARNHI_power0_9_4 = "80000000" +WARNLO_power0_9_4 = "0" +CRITHI_power0_9_4 = "100000000" +CRITLO_power0_9_4 = "0" + +LABEL_power0_10_5 = "p1_io_power" +WARNHI_power0_10_5 = "80000000" +WARNLO_power0_10_5 = "0" +CRITHI_power0_10_5 = "100000000" +CRITLO_power0_10_5 = "0" + +LABEL_power0_1_6 = "p0_mem_power" +WARNHI_power0_1_6 = "250000000" +WARNLO_power0_1_6 = "0" +CRITHI_power0_1_6 = "300000000" +CRITLO_power0_1_6 = "0" + +LABEL_power0_2_7 = "p1_mem_power" +WARNHI_power0_2_7 = "250000000" +WARNLO_power0_2_7 = "0" +CRITHI_power0_2_7 = "300000000" +CRITLO_power0_2_7 = "0" + +LABEL_power0_18_14 = "fan_disk_power" +WARNHI_power0_18_14 = "375000000" +WARNLO_power0_18_14 = "0" +CRITHI_power0_18_14 = "400000000" +CRITLO_power0_18_14 = "0" + +LABEL_power0_13_15 = "io_power" +WARNHI_power0_13_15 = "128000000" +WARNLO_power0_13_15 = "0" +CRITHI_power0_13_15 = "150000000" +CRITLO_power0_13_15 = "0" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf new file mode 100644 index 000000000..1cc4afb71 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf @@ -0,0 +1,366 @@ +MODE_temp1 = "label" +MODE_temp2 = "label" +MODE_temp3 = "label" +MODE_temp4 = "label" +MODE_temp5 = "label" +MODE_temp6 = "label" +MODE_temp7 = "label" +MODE_temp8 = "label" +MODE_temp9 = "label" +MODE_temp10 = "label" +MODE_temp11 = "label" +MODE_temp12 = "label" +MODE_temp13 = "label" +MODE_temp14 = "label" +MODE_temp15 = "label" +MODE_temp16 = "label" +MODE_temp17 = "label" +MODE_temp18 = "label" +MODE_temp19 = "label" +MODE_temp20 = "label" +MODE_temp21 = "label" +MODE_temp22 = "label" +MODE_temp23 = "label" +MODE_temp24 = "label" +MODE_temp25 = "label" +MODE_temp26 = "label" +MODE_temp27 = "label" +MODE_temp28 = "label" +MODE_temp29 = "label" +MODE_temp30 = "label" +MODE_temp31 = "label" +MODE_temp32 = "label" +MODE_temp33 = "label" +MODE_temp34 = "label" +MODE_temp35 = "label" +MODE_temp36 = "label" +MODE_temp37 = "label" +MODE_temp38 = "label" +MODE_temp39 = "label" +MODE_temp40 = "label" +MODE_temp41 = "label" +MODE_temp42 = "label" +MODE_temp43 = "label" +MODE_temp44 = "label" +MODE_temp45 = "label" +MODE_temp46 = "label" +MODE_temp47 = "label" +MODE_temp48 = "label" +MODE_temp49 = "label" +MODE_temp50 = "label" +MODE_temp51 = "label" +MODE_temp52 = "label" + +REMOVERCS = "11" + +LABEL_temp91 = "p1_core0_temp" +WARNHI_temp91 = "78000" +WARNLO_temp91 = "0" +CRITHI_temp91 = "83000" +CRITLO_temp91 = "0" + +LABEL_temp94 = "p1_core1_temp" +WARNHI_temp94 = "78000" +WARNLO_temp94 = "0" +CRITHI_temp94 = "83000" +CRITLO_temp94 = "0" + +LABEL_temp97 = "p1_core2_temp" +WARNHI_temp97 = "78000" +WARNLO_temp97 = "0" +CRITHI_temp97 = "83000" +CRITLO_temp97 = "0" + +LABEL_temp100 = "p1_core3_temp" +WARNHI_temp100 = "78000" +WARNLO_temp100 = "0" +CRITHI_temp100 = "83000" +CRITLO_temp100 = "0" + +LABEL_temp103 = "p1_core4_temp" +WARNHI_temp103 = "78000" +WARNLO_temp103 = "0" +CRITHI_temp103 = "83000" +CRITLO_temp103 = "0" + +LABEL_temp106 = "p1_core5_temp" +WARNHI_temp106 = "78000" +WARNLO_temp106 = "0" +CRITHI_temp106 = "83000" +CRITLO_temp106 = "0" + +LABEL_temp109 = "p1_core6_temp" +WARNHI_temp109 = "78000" +WARNLO_temp109 = "0" +CRITHI_temp109 = "83000" +CRITLO_temp109 = "0" + +LABEL_temp112 = "p1_core7_temp" +WARNHI_temp112 = "78000" +WARNLO_temp112 = "0" +CRITHI_temp112 = "83000" +CRITLO_temp112 = "0" + +LABEL_temp115 = "p1_core8_temp" +WARNHI_temp115 = "78000" +WARNLO_temp115 = "0" +CRITHI_temp115 = "83000" +CRITLO_temp115 = "0" + +LABEL_temp118 = "p1_core9_temp" +WARNHI_temp118 = "78000" +WARNLO_temp118 = "0" +CRITHI_temp118 = "83000" +CRITLO_temp118 = "0" + +LABEL_temp121 = "p1_core10_temp" +WARNHI_temp121 = "78000" +WARNLO_temp121 = "0" +CRITHI_temp121 = "83000" +CRITLO_temp121 = "0" + +LABEL_temp124 = "p1_core11_temp" +WARNHI_temp124 = "78000" +WARNLO_temp124 = "0" +CRITHI_temp124 = "83000" +CRITLO_temp124 = "0" + +LABEL_temp127 = "p1_core12_temp" +WARNHI_temp127 = "78000" +WARNLO_temp127 = "0" +CRITHI_temp127 = "83000" +CRITLO_temp127 = "0" + +LABEL_temp130 = "p1_core13_temp" +WARNHI_temp130 = "78000" +WARNLO_temp130 = "0" +CRITHI_temp130 = "83000" +CRITLO_temp130 = "0" + +LABEL_temp133 = "p1_core14_temp" +WARNHI_temp133 = "78000" +WARNLO_temp133 = "0" +CRITHI_temp133 = "83000" +CRITLO_temp133 = "0" + +LABEL_temp136 = "p1_core15_temp" +WARNHI_temp136 = "78000" +WARNLO_temp136 = "0" +CRITHI_temp136 = "83000" +CRITLO_temp136 = "0" + +LABEL_temp139 = "p1_core16_temp" +WARNHI_temp139 = "78000" +WARNLO_temp139 = "0" +CRITHI_temp139 = "83000" +CRITLO_temp139 = "0" + +LABEL_temp142 = "p1_core17_temp" +WARNHI_temp142 = "78000" +WARNLO_temp142 = "0" +CRITHI_temp142 = "83000" +CRITLO_temp142 = "0" + +LABEL_temp145 = "p1_core18_temp" +WARNHI_temp145 = "78000" +WARNLO_temp145 = "0" +CRITHI_temp145 = "83000" +CRITLO_temp145 = "0" + +LABEL_temp148 = "p1_core19_temp" +WARNHI_temp148 = "78000" +WARNLO_temp148 = "0" +CRITHI_temp148 = "83000" +CRITLO_temp148 = "0" + +LABEL_temp151 = "p1_core20_temp" +WARNHI_temp151 = "78000" +WARNLO_temp151 = "0" +CRITHI_temp151 = "83000" +CRITLO_temp151 = "0" + +LABEL_temp154 = "p1_core21_temp" +WARNHI_temp154 = "78000" +WARNLO_temp154 = "0" +CRITHI_temp154 = "83000" +CRITLO_temp154 = "0" + +LABEL_temp157 = "p1_core22_temp" +WARNHI_temp157 = "78000" +WARNLO_temp157 = "0" +CRITHI_temp157 = "83000" +CRITLO_temp157 = "0" + +LABEL_temp160 = "p1_core23_temp" +WARNHI_temp160 = "78000" +WARNLO_temp160 = "0" +CRITHI_temp160 = "83000" +CRITLO_temp160 = "0" + +LABEL_temp201 = "dimm12_temp0" +WARNHI_temp201 = "78000" +WARNLO_temp201 = "0" +CRITHI_temp201 = "83000" +CRITLO_temp201 = "0" + +LABEL_temp202 = "dimm12_temp1" +WARNHI_temp202 = "78000" +WARNLO_temp202 = "0" +CRITHI_temp202 = "83000" +CRITLO_temp202 = "0" + +LABEL_temp204 = "dimm13_temp0" +WARNHI_temp204 = "78000" +WARNLO_temp204 = "0" +CRITHI_temp204 = "83000" +CRITLO_temp204 = "0" + +LABEL_temp205 = "dimm13_temp1" +WARNHI_temp205 = "78000" +WARNLO_temp205 = "0" +CRITHI_temp205 = "83000" +CRITLO_temp205 = "0" + +LABEL_temp207 = "dimm14_temp0" +WARNHI_temp207 = "78000" +WARNLO_temp207 = "0" +CRITHI_temp207 = "83000" +CRITLO_temp207 = "0" + +LABEL_temp208 = "dimm14_temp1" +WARNHI_temp208 = "78000" +WARNLO_temp208 = "0" +CRITHI_temp208 = "83000" +CRITLO_temp208 = "0" + +LABEL_temp210 = "dimm15_temp0" +WARNHI_temp210 = "78000" +WARNLO_temp210 = "0" +CRITHI_temp210 = "83000" +CRITLO_temp210 = "0" + +LABEL_temp211 = "dimm15_temp1" +WARNHI_temp211 = "78000" +WARNLO_temp211 = "0" +CRITHI_temp211 = "83000" +CRITLO_temp211 = "0" + +LABEL_temp213 = "dimm16_temp0" +WARNHI_temp213 = "78000" +WARNLO_temp213 = "0" +CRITHI_temp213 = "83000" +CRITLO_temp213 = "0" + +LABEL_temp214 = "dimm16_temp1" +WARNHI_temp214 = "78000" +WARNLO_temp214 = "0" +CRITHI_temp214 = "83000" +CRITLO_temp214 = "0" + +LABEL_temp216 = "dimm17_temp0" +WARNHI_temp216 = "78000" +WARNLO_temp216 = "0" +CRITHI_temp216 = "83000" +CRITLO_temp216 = "0" + +LABEL_temp217 = "dimm17_temp1" +WARNHI_temp217 = "78000" +WARNLO_temp217 = "0" +CRITHI_temp217 = "83000" +CRITLO_temp217 = "0" + +LABEL_temp219 = "dimm18_temp0" +WARNHI_temp219 = "78000" +WARNLO_temp219 = "0" +CRITHI_temp219 = "83000" +CRITLO_temp219 = "0" + +LABEL_temp220 = "dimm18_temp1" +WARNHI_temp220 = "78000" +WARNLO_temp220 = "0" +CRITHI_temp220 = "83000" +CRITLO_temp220 = "0" + +LABEL_temp222 = "dimm19_temp0" +WARNHI_temp222 = "78000" +WARNLO_temp222 = "0" +CRITHI_temp222 = "83000" +CRITLO_temp222 = "0" + +LABEL_temp223 = "dimm19_temp1" +WARNHI_temp223 = "78000" +WARNLO_temp223 = "0" +CRITHI_temp223 = "83000" +CRITLO_temp223 = "0" + +LABEL_temp225 = "dimm20_temp0" +WARNHI_temp225 = "78000" +WARNLO_temp225 = "0" +CRITHI_temp225 = "83000" +CRITLO_temp225 = "0" + +LABEL_temp226 = "dimm20_temp1" +WARNHI_temp226 = "78000" +WARNLO_temp226 = "0" +CRITHI_temp226 = "83000" +CRITLO_temp226 = "0" + +LABEL_temp228 = "dimm21_temp0" +WARNHI_temp228 = "78000" +WARNLO_temp228 = "0" +CRITHI_temp228 = "83000" +CRITLO_temp228 = "0" + +LABEL_temp229 = "dimm21_temp1" +WARNHI_temp229 = "78000" +WARNLO_temp229 = "0" +CRITHI_temp229 = "83000" +CRITLO_temp229 = "0" + +LABEL_temp231 = "dimm22_temp0" +WARNHI_temp231 = "78000" +WARNLO_temp231 = "0" +CRITHI_temp231 = "83000" +CRITLO_temp231 = "0" + +LABEL_temp232 = "dimm22_temp1" +WARNHI_temp232 = "78000" +WARNLO_temp232 = "0" +CRITHI_temp232 = "83000" +CRITLO_temp232 = "0" + +LABEL_temp234 = "dimm23_temp0" +WARNHI_temp234 = "78000" +WARNLO_temp234 = "0" +CRITHI_temp234 = "83000" +CRITLO_temp234 = "0" + +LABEL_temp235 = "dimm23_temp1" +WARNHI_temp235 = "78000" +WARNLO_temp235 = "0" +CRITHI_temp235 = "83000" +CRITLO_temp235 = "0" + +LABEL_temp243 = "gpu2_core_temp" +WARNHI_temp243 = "76000" +WARNLO_temp243 = "0" +CRITHI_temp243 = "81000" +CRITLO_temp243 = "0" + +LABEL_temp244 = "gpu2_mem_temp" +WARNHI_temp244 = "78000" +WARNLO_temp244 = "0" +CRITHI_temp244 = "83000" +CRITLO_temp244 = "0" + +LABEL_temp246 = "gpu3_core_temp" +WARNHI_temp246 = "76000" +WARNLO_temp246 = "0" +CRITHI_temp246 = "81000" +CRITLO_temp246 = "0" + +LABEL_temp247 = "gpu3_mem_temp" +WARNHI_temp247 = "78000" +WARNLO_temp247 = "0" +CRITHI_temp247 = "83000" +CRITLO_temp247 = "0" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf deleted file mode 100644 index 5582e9dbf..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ /dev/null @@ -1,436 +0,0 @@ -MODE_temp1 = "label" -MODE_temp2 = "label" -MODE_temp3 = "label" -MODE_temp4 = "label" -MODE_temp5 = "label" -MODE_temp6 = "label" -MODE_temp7 = "label" -MODE_temp8 = "label" -MODE_temp9 = "label" -MODE_temp10 = "label" -MODE_temp11 = "label" -MODE_temp12 = "label" -MODE_temp13 = "label" -MODE_temp14 = "label" -MODE_temp15 = "label" -MODE_temp16 = "label" -MODE_temp17 = "label" -MODE_temp18 = "label" -MODE_temp19 = "label" -MODE_temp20 = "label" -MODE_temp21 = "label" -MODE_temp22 = "label" -MODE_temp23 = "label" -MODE_temp24 = "label" -MODE_temp25 = "label" -MODE_temp26 = "label" -MODE_temp27 = "label" -MODE_temp28 = "label" -MODE_temp29 = "label" -MODE_temp30 = "label" -MODE_temp31 = "label" -MODE_temp32 = "label" -MODE_temp33 = "label" -MODE_temp34 = "label" -MODE_temp35 = "label" -MODE_temp36 = "label" -MODE_temp37 = "label" -MODE_temp38 = "label" -MODE_temp39 = "label" -MODE_temp40 = "label" -MODE_temp41 = "label" -MODE_temp42 = "label" -MODE_temp43 = "label" -MODE_temp44 = "label" -MODE_temp45 = "label" -MODE_temp46 = "label" -MODE_temp47 = "label" -MODE_temp48 = "label" -MODE_temp49 = "label" -MODE_temp50 = "label" -MODE_temp51 = "label" -MODE_temp52 = "label" - -MODE_power1 = "label" -MODE_power2 = "label" -MODE_power3 = "label" -MODE_power4 = "label" -MODE_power5 = "label" -MODE_power6 = "label" -MODE_power7 = "label" -MODE_power8 = "label" -MODE_power9 = "label" -MODE_power10 = "label" -MODE_power11 = "label" -MODE_power12 = "label" -MODE_power13 = "label" -MODE_power14 = "label" -MODE_power15 = "label" - -REMOVERCS = "11" - -LABEL_temp17 = "p0_core0_temp" -WARNHI_temp17 = "78000" -WARNLO_temp17 = "0" -CRITHI_temp17 = "83000" -CRITLO_temp17 = "0" - -LABEL_temp20 = "p0_core1_temp" -WARNHI_temp20 = "78000" -WARNLO_temp20 = "0" -CRITHI_temp20 = "83000" -CRITLO_temp20 = "0" - -LABEL_temp23 = "p0_core2_temp" -WARNHI_temp23 = "78000" -WARNLO_temp23 = "0" -CRITHI_temp23 = "83000" -CRITLO_temp23 = "0" - -LABEL_temp26 = "p0_core3_temp" -WARNHI_temp26 = "78000" -WARNLO_temp26 = "0" -CRITHI_temp26 = "83000" -CRITLO_temp26 = "0" - -LABEL_temp29 = "p0_core4_temp" -WARNHI_temp29 = "78000" -WARNLO_temp29 = "0" -CRITHI_temp29 = "83000" -CRITLO_temp29 = "0" - -LABEL_temp32 = "p0_core5_temp" -WARNHI_temp32 = "78000" -WARNLO_temp32 = "0" -CRITHI_temp32 = "83000" -CRITLO_temp32 = "0" - -LABEL_temp35 = "p0_core6_temp" -WARNHI_temp35 = "78000" -WARNLO_temp35 = "0" -CRITHI_temp35 = "83000" -CRITLO_temp35 = "0" - -LABEL_temp38 = "p0_core7_temp" -WARNHI_temp38 = "78000" -WARNLO_temp38 = "0" -CRITHI_temp38 = "83000" -CRITLO_temp38 = "0" - -LABEL_temp41 = "p0_core8_temp" -WARNHI_temp41 = "78000" -WARNLO_temp41 = "0" -CRITHI_temp41 = "83000" -CRITLO_temp41 = "0" - -LABEL_temp44 = "p0_core9_temp" -WARNHI_temp44 = "78000" -WARNLO_temp44 = "0" -CRITHI_temp44 = "83000" -CRITLO_temp44 = "0" - -LABEL_temp47 = "p0_core10_temp" -WARNHI_temp47 = "78000" -WARNLO_temp47 = "0" -CRITHI_temp47 = "83000" -CRITLO_temp47 = "0" - -LABEL_temp50 = "p0_core11_temp" -WARNHI_temp50 = "78000" -WARNLO_temp50 = "0" -CRITHI_temp50 = "83000" -CRITLO_temp50 = "0" - -LABEL_temp53 = "p0_core12_temp" -WARNHI_temp53 = "78000" -WARNLO_temp53 = "0" -CRITHI_temp53 = "83000" -CRITLO_temp53 = "0" - -LABEL_temp56 = "p0_core13_temp" -WARNHI_temp56 = "78000" -WARNLO_temp56 = "0" -CRITHI_temp56 = "83000" -CRITLO_temp56 = "0" - -LABEL_temp59 = "p0_core14_temp" -WARNHI_temp59 = "78000" -WARNLO_temp59 = "0" -CRITHI_temp59 = "83000" -CRITLO_temp59 = "0" - -LABEL_temp62 = "p0_core15_temp" -WARNHI_temp62 = "78000" -WARNLO_temp62 = "0" -CRITHI_temp62 = "83000" -CRITLO_temp62 = "0" - -LABEL_temp65 = "p0_core16_temp" -WARNHI_temp65 = "78000" -WARNLO_temp65 = "0" -CRITHI_temp65 = "83000" -CRITLO_temp65 = "0" - -LABEL_temp68 = "p0_core17_temp" -WARNHI_temp68 = "78000" -WARNLO_temp68 = "0" -CRITHI_temp68 = "83000" -CRITLO_temp68 = "0" - -LABEL_temp71 = "p0_core18_temp" -WARNHI_temp71 = "78000" -WARNLO_temp71 = "0" -CRITHI_temp71 = "83000" -CRITLO_temp71 = "0" - -LABEL_temp74 = "p0_core19_temp" -WARNHI_temp74 = "78000" -WARNLO_temp74 = "0" -CRITHI_temp74 = "83000" -CRITLO_temp74 = "0" - -LABEL_temp77 = "p0_core20_temp" -WARNHI_temp77 = "78000" -WARNLO_temp77 = "0" -CRITHI_temp77 = "83000" -CRITLO_temp77 = "0" - -LABEL_temp80 = "p0_core21_temp" -WARNHI_temp80 = "78000" -WARNLO_temp80 = "0" -CRITHI_temp80 = "83000" -CRITLO_temp80 = "0" - -LABEL_temp83 = "p0_core22_temp" -WARNHI_temp83 = "78000" -WARNLO_temp83 = "0" -CRITHI_temp83 = "83000" -CRITLO_temp83 = "0" - -LABEL_temp86 = "p0_core23_temp" -WARNHI_temp86 = "78000" -WARNLO_temp86 = "0" -CRITHI_temp86 = "83000" -CRITLO_temp86 = "0" - -LABEL_temp165 = "dimm0_temp0" -WARNHI_temp165 = "78000" -WARNLO_temp165 = "0" -CRITHI_temp165 = "83000" -CRITLO_temp165 = "0" - -LABEL_temp166 = "dimm0_temp1" -WARNHI_temp166 = "78000" -WARNLO_temp166 = "0" -CRITHI_temp166 = "83000" -CRITLO_temp166 = "0" - -LABEL_temp168 = "dimm1_temp0" -WARNHI_temp168 = "78000" -WARNLO_temp168 = "0" -CRITHI_temp168 = "83000" -CRITLO_temp168 = "0" - -LABEL_temp169 = "dimm1_temp1" -WARNHI_temp169 = "78000" -WARNLO_temp169 = "0" -CRITHI_temp169 = "83000" -CRITLO_temp169 = "0" - -LABEL_temp171 = "dimm2_temp0" -WARNHI_temp171 = "78000" -WARNLO_temp171 = "0" -CRITHI_temp171 = "83000" -CRITLO_temp171 = "0" - -LABEL_temp172 = "dimm2_temp1" -WARNHI_temp172 = "78000" -WARNLO_temp172 = "0" -CRITHI_temp172 = "83000" -CRITLO_temp172 = "0" - -LABEL_temp174 = "dimm3_temp0" -WARNHI_temp174 = "78000" -WARNLO_temp174 = "0" -CRITHI_temp174 = "83000" -CRITLO_temp174 = "0" - -LABEL_temp175 = "dimm3_temp1" -WARNHI_temp175 = "78000" -WARNLO_temp175 = "0" -CRITHI_temp175 = "83000" -CRITLO_temp175 = "0" - -LABEL_temp177 = "dimm4_temp0" -WARNHI_temp177 = "78000" -WARNLO_temp177 = "0" -CRITHI_temp177 = "83000" -CRITLO_temp177 = "0" - -LABEL_temp178 = "dimm4_temp1" -WARNHI_temp178 = "78000" -WARNLO_temp178 = "0" -CRITHI_temp178 = "83000" -CRITLO_temp178 = "0" - -LABEL_temp180 = "dimm5_temp0" -WARNHI_temp180 = "78000" -WARNLO_temp180 = "0" -CRITHI_temp180 = "83000" -CRITLO_temp180 = "0" - -LABEL_temp181 = "dimm5_temp1" -WARNHI_temp181 = "78000" -WARNLO_temp181 = "0" -CRITHI_temp181 = "83000" -CRITLO_temp181 = "0" - -LABEL_temp183 = "dimm6_temp0" -WARNHI_temp183 = "78000" -WARNLO_temp183 = "0" -CRITHI_temp183 = "83000" -CRITLO_temp183 = "0" - -LABEL_temp184 = "dimm6_temp1" -WARNHI_temp184 = "78000" -WARNLO_temp184 = "0" -CRITHI_temp184 = "83000" -CRITLO_temp184 = "0" - -LABEL_temp186 = "dimm7_temp0" -WARNHI_temp186 = "78000" -WARNLO_temp186 = "0" -CRITHI_temp186 = "83000" -CRITLO_temp186 = "0" - -LABEL_temp187 = "dimm7_temp1" -WARNHI_temp187 = "78000" -WARNLO_temp187 = "0" -CRITHI_temp187 = "83000" -CRITLO_temp187 = "0" - -LABEL_temp189 = "dimm8_temp0" -WARNHI_temp189 = "78000" -WARNLO_temp189 = "0" -CRITHI_temp189 = "83000" -CRITLO_temp189 = "0" - -LABEL_temp190 = "dimm8_temp1" -WARNHI_temp190 = "78000" -WARNLO_temp190 = "0" -CRITHI_temp190 = "83000" -CRITLO_temp190 = "0" - -LABEL_temp192 = "dimm9_temp0" -WARNHI_temp192 = "78000" -WARNLO_temp192 = "0" -CRITHI_temp192 = "83000" -CRITLO_temp192 = "0" - -LABEL_temp193 = "dimm9_temp1" -WARNHI_temp193 = "78000" -WARNLO_temp193 = "0" -CRITHI_temp193 = "83000" -CRITLO_temp193 = "0" - -LABEL_temp195 = "dimm10_temp0" -WARNHI_temp195 = "78000" -WARNLO_temp195 = "0" -CRITHI_temp195 = "83000" -CRITLO_temp195 = "0" - -LABEL_temp196 = "dimm10_temp1" -WARNHI_temp196 = "78000" -WARNLO_temp196 = "0" -CRITHI_temp196 = "83000" -CRITLO_temp196 = "0" - -LABEL_temp198 = "dimm11_temp0" -WARNHI_temp198 = "78000" -WARNLO_temp198 = "0" -CRITHI_temp198 = "83000" -CRITLO_temp198 = "0" - -LABEL_temp199 = "dimm11_temp1" -WARNHI_temp199 = "78000" -WARNLO_temp199 = "0" -CRITHI_temp199 = "83000" -CRITLO_temp199 = "0" - -LABEL_temp237 = "gpu0_core_temp" -WARNHI_temp237 = "76000" -WARNLO_temp237 = "0" -CRITHI_temp237 = "81000" -CRITLO_temp237 = "0" - -LABEL_temp238 = "gpu0_mem_temp" -WARNHI_temp238 = "78000" -WARNLO_temp238 = "0" -CRITHI_temp238 = "83000" -CRITLO_temp238 = "0" - -LABEL_temp240 = "gpu1_core_temp" -WARNHI_temp240 = "76000" -WARNLO_temp240 = "0" -CRITHI_temp240 = "81000" -CRITLO_temp240 = "0" - -LABEL_temp241 = "gpu1_mem_temp" -WARNHI_temp241 = "78000" -WARNLO_temp241 = "0" -CRITHI_temp241 = "83000" -CRITLO_temp241 = "0" - -LABEL_power0_22_0 = "total_power" -WARNHI_power0_22_0 = "3050000000" -WARNLO_power0_22_0 = "0" -CRITHI_power0_22_0 = "3100000000" -CRITLO_power0_22_0 = "0" - -LABEL_power0_5_2 = "p0_power" -WARNHI_power0_5_2 = "250000000" -WARNLO_power0_5_2 = "0" -CRITHI_power0_5_2 = "300000000" -CRITLO_power0_5_2 = "0" - -LABEL_power0_6_3 = "p1_power" -WARNHI_power0_6_3 = "250000000" -WARNLO_power0_6_3 = "0" -CRITHI_power0_6_3 = "300000000" -CRITLO_power0_6_3 = "0" - -LABEL_power0_9_4 = "p0_io_power" -WARNHI_power0_9_4 = "80000000" -WARNLO_power0_9_4 = "0" -CRITHI_power0_9_4 = "100000000" -CRITLO_power0_9_4 = "0" - -LABEL_power0_10_5 = "p1_io_power" -WARNHI_power0_10_5 = "80000000" -WARNLO_power0_10_5 = "0" -CRITHI_power0_10_5 = "100000000" -CRITLO_power0_10_5 = "0" - -LABEL_power0_1_6 = "p0_mem_power" -WARNHI_power0_1_6 = "250000000" -WARNLO_power0_1_6 = "0" -CRITHI_power0_1_6 = "300000000" -CRITLO_power0_1_6 = "0" - -LABEL_power0_2_7 = "p1_mem_power" -WARNHI_power0_2_7 = "250000000" -WARNLO_power0_2_7 = "0" -CRITHI_power0_2_7 = "300000000" -CRITLO_power0_2_7 = "0" - -LABEL_power0_18_14 = "fan_disk_power" -WARNHI_power0_18_14 = "375000000" -WARNLO_power0_18_14 = "0" -CRITHI_power0_18_14 = "400000000" -CRITLO_power0_18_14 = "0" - -LABEL_power0_13_15 = "io_power" -WARNHI_power0_13_15 = "128000000" -WARNLO_power0_13_15 = "0" -CRITHI_power0_13_15 = "150000000" -CRITLO_power0_13_15 = "0" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/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-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/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 deleted file mode 100644 index 1cc4afb71..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/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 +++ /dev/null @@ -1,366 +0,0 @@ -MODE_temp1 = "label" -MODE_temp2 = "label" -MODE_temp3 = "label" -MODE_temp4 = "label" -MODE_temp5 = "label" -MODE_temp6 = "label" -MODE_temp7 = "label" -MODE_temp8 = "label" -MODE_temp9 = "label" -MODE_temp10 = "label" -MODE_temp11 = "label" -MODE_temp12 = "label" -MODE_temp13 = "label" -MODE_temp14 = "label" -MODE_temp15 = "label" -MODE_temp16 = "label" -MODE_temp17 = "label" -MODE_temp18 = "label" -MODE_temp19 = "label" -MODE_temp20 = "label" -MODE_temp21 = "label" -MODE_temp22 = "label" -MODE_temp23 = "label" -MODE_temp24 = "label" -MODE_temp25 = "label" -MODE_temp26 = "label" -MODE_temp27 = "label" -MODE_temp28 = "label" -MODE_temp29 = "label" -MODE_temp30 = "label" -MODE_temp31 = "label" -MODE_temp32 = "label" -MODE_temp33 = "label" -MODE_temp34 = "label" -MODE_temp35 = "label" -MODE_temp36 = "label" -MODE_temp37 = "label" -MODE_temp38 = "label" -MODE_temp39 = "label" -MODE_temp40 = "label" -MODE_temp41 = "label" -MODE_temp42 = "label" -MODE_temp43 = "label" -MODE_temp44 = "label" -MODE_temp45 = "label" -MODE_temp46 = "label" -MODE_temp47 = "label" -MODE_temp48 = "label" -MODE_temp49 = "label" -MODE_temp50 = "label" -MODE_temp51 = "label" -MODE_temp52 = "label" - -REMOVERCS = "11" - -LABEL_temp91 = "p1_core0_temp" -WARNHI_temp91 = "78000" -WARNLO_temp91 = "0" -CRITHI_temp91 = "83000" -CRITLO_temp91 = "0" - -LABEL_temp94 = "p1_core1_temp" -WARNHI_temp94 = "78000" -WARNLO_temp94 = "0" -CRITHI_temp94 = "83000" -CRITLO_temp94 = "0" - -LABEL_temp97 = "p1_core2_temp" -WARNHI_temp97 = "78000" -WARNLO_temp97 = "0" -CRITHI_temp97 = "83000" -CRITLO_temp97 = "0" - -LABEL_temp100 = "p1_core3_temp" -WARNHI_temp100 = "78000" -WARNLO_temp100 = "0" -CRITHI_temp100 = "83000" -CRITLO_temp100 = "0" - -LABEL_temp103 = "p1_core4_temp" -WARNHI_temp103 = "78000" -WARNLO_temp103 = "0" -CRITHI_temp103 = "83000" -CRITLO_temp103 = "0" - -LABEL_temp106 = "p1_core5_temp" -WARNHI_temp106 = "78000" -WARNLO_temp106 = "0" -CRITHI_temp106 = "83000" -CRITLO_temp106 = "0" - -LABEL_temp109 = "p1_core6_temp" -WARNHI_temp109 = "78000" -WARNLO_temp109 = "0" -CRITHI_temp109 = "83000" -CRITLO_temp109 = "0" - -LABEL_temp112 = "p1_core7_temp" -WARNHI_temp112 = "78000" -WARNLO_temp112 = "0" -CRITHI_temp112 = "83000" -CRITLO_temp112 = "0" - -LABEL_temp115 = "p1_core8_temp" -WARNHI_temp115 = "78000" -WARNLO_temp115 = "0" -CRITHI_temp115 = "83000" -CRITLO_temp115 = "0" - -LABEL_temp118 = "p1_core9_temp" -WARNHI_temp118 = "78000" -WARNLO_temp118 = "0" -CRITHI_temp118 = "83000" -CRITLO_temp118 = "0" - -LABEL_temp121 = "p1_core10_temp" -WARNHI_temp121 = "78000" -WARNLO_temp121 = "0" -CRITHI_temp121 = "83000" -CRITLO_temp121 = "0" - -LABEL_temp124 = "p1_core11_temp" -WARNHI_temp124 = "78000" -WARNLO_temp124 = "0" -CRITHI_temp124 = "83000" -CRITLO_temp124 = "0" - -LABEL_temp127 = "p1_core12_temp" -WARNHI_temp127 = "78000" -WARNLO_temp127 = "0" -CRITHI_temp127 = "83000" -CRITLO_temp127 = "0" - -LABEL_temp130 = "p1_core13_temp" -WARNHI_temp130 = "78000" -WARNLO_temp130 = "0" -CRITHI_temp130 = "83000" -CRITLO_temp130 = "0" - -LABEL_temp133 = "p1_core14_temp" -WARNHI_temp133 = "78000" -WARNLO_temp133 = "0" -CRITHI_temp133 = "83000" -CRITLO_temp133 = "0" - -LABEL_temp136 = "p1_core15_temp" -WARNHI_temp136 = "78000" -WARNLO_temp136 = "0" -CRITHI_temp136 = "83000" -CRITLO_temp136 = "0" - -LABEL_temp139 = "p1_core16_temp" -WARNHI_temp139 = "78000" -WARNLO_temp139 = "0" -CRITHI_temp139 = "83000" -CRITLO_temp139 = "0" - -LABEL_temp142 = "p1_core17_temp" -WARNHI_temp142 = "78000" -WARNLO_temp142 = "0" -CRITHI_temp142 = "83000" -CRITLO_temp142 = "0" - -LABEL_temp145 = "p1_core18_temp" -WARNHI_temp145 = "78000" -WARNLO_temp145 = "0" -CRITHI_temp145 = "83000" -CRITLO_temp145 = "0" - -LABEL_temp148 = "p1_core19_temp" -WARNHI_temp148 = "78000" -WARNLO_temp148 = "0" -CRITHI_temp148 = "83000" -CRITLO_temp148 = "0" - -LABEL_temp151 = "p1_core20_temp" -WARNHI_temp151 = "78000" -WARNLO_temp151 = "0" -CRITHI_temp151 = "83000" -CRITLO_temp151 = "0" - -LABEL_temp154 = "p1_core21_temp" -WARNHI_temp154 = "78000" -WARNLO_temp154 = "0" -CRITHI_temp154 = "83000" -CRITLO_temp154 = "0" - -LABEL_temp157 = "p1_core22_temp" -WARNHI_temp157 = "78000" -WARNLO_temp157 = "0" -CRITHI_temp157 = "83000" -CRITLO_temp157 = "0" - -LABEL_temp160 = "p1_core23_temp" -WARNHI_temp160 = "78000" -WARNLO_temp160 = "0" -CRITHI_temp160 = "83000" -CRITLO_temp160 = "0" - -LABEL_temp201 = "dimm12_temp0" -WARNHI_temp201 = "78000" -WARNLO_temp201 = "0" -CRITHI_temp201 = "83000" -CRITLO_temp201 = "0" - -LABEL_temp202 = "dimm12_temp1" -WARNHI_temp202 = "78000" -WARNLO_temp202 = "0" -CRITHI_temp202 = "83000" -CRITLO_temp202 = "0" - -LABEL_temp204 = "dimm13_temp0" -WARNHI_temp204 = "78000" -WARNLO_temp204 = "0" -CRITHI_temp204 = "83000" -CRITLO_temp204 = "0" - -LABEL_temp205 = "dimm13_temp1" -WARNHI_temp205 = "78000" -WARNLO_temp205 = "0" -CRITHI_temp205 = "83000" -CRITLO_temp205 = "0" - -LABEL_temp207 = "dimm14_temp0" -WARNHI_temp207 = "78000" -WARNLO_temp207 = "0" -CRITHI_temp207 = "83000" -CRITLO_temp207 = "0" - -LABEL_temp208 = "dimm14_temp1" -WARNHI_temp208 = "78000" -WARNLO_temp208 = "0" -CRITHI_temp208 = "83000" -CRITLO_temp208 = "0" - -LABEL_temp210 = "dimm15_temp0" -WARNHI_temp210 = "78000" -WARNLO_temp210 = "0" -CRITHI_temp210 = "83000" -CRITLO_temp210 = "0" - -LABEL_temp211 = "dimm15_temp1" -WARNHI_temp211 = "78000" -WARNLO_temp211 = "0" -CRITHI_temp211 = "83000" -CRITLO_temp211 = "0" - -LABEL_temp213 = "dimm16_temp0" -WARNHI_temp213 = "78000" -WARNLO_temp213 = "0" -CRITHI_temp213 = "83000" -CRITLO_temp213 = "0" - -LABEL_temp214 = "dimm16_temp1" -WARNHI_temp214 = "78000" -WARNLO_temp214 = "0" -CRITHI_temp214 = "83000" -CRITLO_temp214 = "0" - -LABEL_temp216 = "dimm17_temp0" -WARNHI_temp216 = "78000" -WARNLO_temp216 = "0" -CRITHI_temp216 = "83000" -CRITLO_temp216 = "0" - -LABEL_temp217 = "dimm17_temp1" -WARNHI_temp217 = "78000" -WARNLO_temp217 = "0" -CRITHI_temp217 = "83000" -CRITLO_temp217 = "0" - -LABEL_temp219 = "dimm18_temp0" -WARNHI_temp219 = "78000" -WARNLO_temp219 = "0" -CRITHI_temp219 = "83000" -CRITLO_temp219 = "0" - -LABEL_temp220 = "dimm18_temp1" -WARNHI_temp220 = "78000" -WARNLO_temp220 = "0" -CRITHI_temp220 = "83000" -CRITLO_temp220 = "0" - -LABEL_temp222 = "dimm19_temp0" -WARNHI_temp222 = "78000" -WARNLO_temp222 = "0" -CRITHI_temp222 = "83000" -CRITLO_temp222 = "0" - -LABEL_temp223 = "dimm19_temp1" -WARNHI_temp223 = "78000" -WARNLO_temp223 = "0" -CRITHI_temp223 = "83000" -CRITLO_temp223 = "0" - -LABEL_temp225 = "dimm20_temp0" -WARNHI_temp225 = "78000" -WARNLO_temp225 = "0" -CRITHI_temp225 = "83000" -CRITLO_temp225 = "0" - -LABEL_temp226 = "dimm20_temp1" -WARNHI_temp226 = "78000" -WARNLO_temp226 = "0" -CRITHI_temp226 = "83000" -CRITLO_temp226 = "0" - -LABEL_temp228 = "dimm21_temp0" -WARNHI_temp228 = "78000" -WARNLO_temp228 = "0" -CRITHI_temp228 = "83000" -CRITLO_temp228 = "0" - -LABEL_temp229 = "dimm21_temp1" -WARNHI_temp229 = "78000" -WARNLO_temp229 = "0" -CRITHI_temp229 = "83000" -CRITLO_temp229 = "0" - -LABEL_temp231 = "dimm22_temp0" -WARNHI_temp231 = "78000" -WARNLO_temp231 = "0" -CRITHI_temp231 = "83000" -CRITLO_temp231 = "0" - -LABEL_temp232 = "dimm22_temp1" -WARNHI_temp232 = "78000" -WARNLO_temp232 = "0" -CRITHI_temp232 = "83000" -CRITLO_temp232 = "0" - -LABEL_temp234 = "dimm23_temp0" -WARNHI_temp234 = "78000" -WARNLO_temp234 = "0" -CRITHI_temp234 = "83000" -CRITLO_temp234 = "0" - -LABEL_temp235 = "dimm23_temp1" -WARNHI_temp235 = "78000" -WARNLO_temp235 = "0" -CRITHI_temp235 = "83000" -CRITLO_temp235 = "0" - -LABEL_temp243 = "gpu2_core_temp" -WARNHI_temp243 = "76000" -WARNLO_temp243 = "0" -CRITHI_temp243 = "81000" -CRITLO_temp243 = "0" - -LABEL_temp244 = "gpu2_mem_temp" -WARNHI_temp244 = "78000" -WARNLO_temp244 = "0" -CRITHI_temp244 = "83000" -CRITLO_temp244 = "0" - -LABEL_temp246 = "gpu3_core_temp" -WARNHI_temp246 = "76000" -WARNLO_temp246 = "0" -CRITHI_temp246 = "81000" -CRITLO_temp246 = "0" - -LABEL_temp247 = "gpu3_mem_temp" -WARNHI_temp247 = "78000" -WARNLO_temp247 = "0" -CRITHI_temp247 = "83000" -CRITLO_temp247 = "0" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf new file mode 100644 index 000000000..c5fa56f65 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf @@ -0,0 +1,338 @@ +MODE_temp1 = "label" +MODE_temp2 = "label" +MODE_temp3 = "label" +MODE_temp4 = "label" +MODE_temp5 = "label" +MODE_temp6 = "label" +MODE_temp7 = "label" +MODE_temp8 = "label" +MODE_temp9 = "label" +MODE_temp10 = "label" +MODE_temp11 = "label" +MODE_temp12 = "label" +MODE_temp13 = "label" +MODE_temp14 = "label" +MODE_temp15 = "label" +MODE_temp16 = "label" +MODE_temp17 = "label" +MODE_temp18 = "label" +MODE_temp19 = "label" +MODE_temp20 = "label" +MODE_temp21 = "label" +MODE_temp22 = "label" +MODE_temp23 = "label" +MODE_temp24 = "label" +MODE_temp25 = "label" +MODE_temp26 = "label" +MODE_temp27 = "label" +MODE_temp28 = "label" +MODE_temp29 = "label" +MODE_temp30 = "label" +MODE_temp31 = "label" +MODE_temp32 = "label" +MODE_temp33 = "label" +MODE_temp34 = "label" +MODE_temp35 = "label" +MODE_temp36 = "label" +MODE_temp37 = "label" +MODE_temp38 = "label" + +MODE_power1 = "label" +MODE_power2 = "label" +MODE_power3 = "label" +MODE_power4 = "label" +MODE_power5 = "label" +MODE_power6 = "label" +MODE_power7 = "label" +MODE_power8 = "label" +MODE_power9 = "label" +MODE_power10 = "label" +MODE_power11 = "label" +MODE_power12 = "label" +MODE_power13 = "label" +MODE_power14 = "label" +MODE_power15 = "label" + +REMOVERCS = "11" + +LABEL_temp17 = "p0_core0_temp" +WARNHI_temp17 = "78000" +WARNLO_temp17 = "0" +CRITHI_temp17 = "83000" +CRITLO_temp17 = "0" + +LABEL_temp20 = "p0_core1_temp" +WARNHI_temp20 = "78000" +WARNLO_temp20 = "0" +CRITHI_temp20 = "83000" +CRITLO_temp20 = "0" + +LABEL_temp23 = "p0_core2_temp" +WARNHI_temp23 = "78000" +WARNLO_temp23 = "0" +CRITHI_temp23 = "83000" +CRITLO_temp23 = "0" + +LABEL_temp26 = "p0_core3_temp" +WARNHI_temp26 = "78000" +WARNLO_temp26 = "0" +CRITHI_temp26 = "83000" +CRITLO_temp26 = "0" + +LABEL_temp29 = "p0_core4_temp" +WARNHI_temp29 = "78000" +WARNLO_temp29 = "0" +CRITHI_temp29 = "83000" +CRITLO_temp29 = "0" + +LABEL_temp32 = "p0_core5_temp" +WARNHI_temp32 = "78000" +WARNLO_temp32 = "0" +CRITHI_temp32 = "83000" +CRITLO_temp32 = "0" + +LABEL_temp35 = "p0_core6_temp" +WARNHI_temp35 = "78000" +WARNLO_temp35 = "0" +CRITHI_temp35 = "83000" +CRITLO_temp35 = "0" + +LABEL_temp38 = "p0_core7_temp" +WARNHI_temp38 = "78000" +WARNLO_temp38 = "0" +CRITHI_temp38 = "83000" +CRITLO_temp38 = "0" + +LABEL_temp41 = "p0_core8_temp" +WARNHI_temp41 = "78000" +WARNLO_temp41 = "0" +CRITHI_temp41 = "83000" +CRITLO_temp41 = "0" + +LABEL_temp44 = "p0_core9_temp" +WARNHI_temp44 = "78000" +WARNLO_temp44 = "0" +CRITHI_temp44 = "83000" +CRITLO_temp44 = "0" + +LABEL_temp47 = "p0_core10_temp" +WARNHI_temp47 = "78000" +WARNLO_temp47 = "0" +CRITHI_temp47 = "83000" +CRITLO_temp47 = "0" + +LABEL_temp50 = "p0_core11_temp" +WARNHI_temp50 = "78000" +WARNLO_temp50 = "0" +CRITHI_temp50 = "83000" +CRITLO_temp50 = "0" + +LABEL_temp53 = "p0_core12_temp" +WARNHI_temp53 = "78000" +WARNLO_temp53 = "0" +CRITHI_temp53 = "83000" +CRITLO_temp53 = "0" + +LABEL_temp56 = "p0_core13_temp" +WARNHI_temp56 = "78000" +WARNLO_temp56 = "0" +CRITHI_temp56 = "83000" +CRITLO_temp56 = "0" + +LABEL_temp59 = "p0_core14_temp" +WARNHI_temp59 = "78000" +WARNLO_temp59 = "0" +CRITHI_temp59 = "83000" +CRITLO_temp59 = "0" + +LABEL_temp62 = "p0_core15_temp" +WARNHI_temp62 = "78000" +WARNLO_temp62 = "0" +CRITHI_temp62 = "83000" +CRITLO_temp62 = "0" + +LABEL_temp65 = "p0_core16_temp" +WARNHI_temp65 = "78000" +WARNLO_temp65 = "0" +CRITHI_temp65 = "83000" +CRITLO_temp65 = "0" + +LABEL_temp68 = "p0_core17_temp" +WARNHI_temp68 = "78000" +WARNLO_temp68 = "0" +CRITHI_temp68 = "83000" +CRITLO_temp68 = "0" + +LABEL_temp71 = "p0_core18_temp" +WARNHI_temp71 = "78000" +WARNLO_temp71 = "0" +CRITHI_temp71 = "83000" +CRITLO_temp71 = "0" + +LABEL_temp74 = "p0_core19_temp" +WARNHI_temp74 = "78000" +WARNLO_temp74 = "0" +CRITHI_temp74 = "83000" +CRITLO_temp74 = "0" + +LABEL_temp77 = "p0_core20_temp" +WARNHI_temp77 = "78000" +WARNLO_temp77 = "0" +CRITHI_temp77 = "83000" +CRITLO_temp77 = "0" + +LABEL_temp80 = "p0_core21_temp" +WARNHI_temp80 = "78000" +WARNLO_temp80 = "0" +CRITHI_temp80 = "83000" +CRITLO_temp80 = "0" + +LABEL_temp83 = "p0_core22_temp" +WARNHI_temp83 = "78000" +WARNLO_temp83 = "0" +CRITHI_temp83 = "83000" +CRITLO_temp83 = "0" + +LABEL_temp86 = "p0_core23_temp" +WARNHI_temp86 = "78000" +WARNLO_temp86 = "0" +CRITHI_temp86 = "83000" +CRITLO_temp86 = "0" + +LABEL_temp165 = "dimm0_temp" +WARNHI_temp165 = "78000" +WARNLO_temp165 = "0" +CRITHI_temp165 = "83000" +CRITLO_temp165 = "0" + +LABEL_temp167 = "dimm1_temp" +WARNHI_temp167 = "78000" +WARNLO_temp167 = "0" +CRITHI_temp167 = "83000" +CRITLO_temp167 = "0" + +LABEL_temp169 = "dimm2_temp" +WARNHI_temp169 = "78000" +WARNLO_temp169 = "0" +CRITHI_temp169 = "83000" +CRITLO_temp169 = "0" + +LABEL_temp171 = "dimm3_temp" +WARNHI_temp171 = "78000" +WARNLO_temp171 = "0" +CRITHI_temp171 = "83000" +CRITLO_temp171 = "0" + +LABEL_temp173 = "dimm4_temp" +WARNHI_temp173 = "78000" +WARNLO_temp173 = "0" +CRITHI_temp173 = "83000" +CRITLO_temp173 = "0" + +LABEL_temp175 = "dimm5_temp" +WARNHI_temp175 = "78000" +WARNLO_temp175 = "0" +CRITHI_temp175 = "83000" +CRITLO_temp175 = "0" + +LABEL_temp177 = "dimm6_temp" +WARNHI_temp177 = "78000" +WARNLO_temp177 = "0" +CRITHI_temp177 = "83000" +CRITLO_temp177 = "0" + +LABEL_temp179 = "dimm7_temp" +WARNHI_temp179 = "78000" +WARNLO_temp179 = "0" +CRITHI_temp179 = "83000" +CRITLO_temp179 = "0" + +LABEL_temp198 = "gpu0_core_temp" +WARNHI_temp198 = "76000" +WARNLO_temp198 = "0" +CRITHI_temp198 = "81000" +CRITLO_temp198 = "0" + +LABEL_temp199 = "gpu0_mem_temp" +WARNHI_temp199 = "78000" +WARNLO_temp199 = "0" +CRITHI_temp199 = "83000" +CRITLO_temp199 = "0" + +LABEL_temp201 = "gpu1_core_temp" +WARNHI_temp201 = "76000" +WARNLO_temp201 = "0" +CRITHI_temp201 = "81000" +CRITLO_temp201 = "0" + +LABEL_temp202 = "gpu1_mem_temp" +WARNHI_temp202 = "78000" +WARNLO_temp202 = "0" +CRITHI_temp202 = "83000" +CRITLO_temp202 = "0" + +LABEL_temp204 = "gpu2_core_temp" +WARNHI_temp204 = "76000" +WARNLO_temp204 = "0" +CRITHI_temp204 = "81000" +CRITLO_temp204 = "0" + +LABEL_temp205 = "gpu2_mem_temp" +WARNHI_temp205 = "78000" +WARNLO_temp205 = "0" +CRITHI_temp205 = "83000" +CRITLO_temp205 = "0" + +LABEL_power0_22_0 = "total_power" +WARNHI_power0_22_0 = "3050000000" +WARNLO_power0_22_0 = "0" +CRITHI_power0_22_0 = "3100000000" +CRITLO_power0_22_0 = "0" + +LABEL_power0_5_2 = "p0_power" +WARNHI_power0_5_2 = "250000000" +WARNLO_power0_5_2 = "0" +CRITHI_power0_5_2 = "300000000" +CRITLO_power0_5_2 = "0" + +LABEL_power0_6_3 = "p1_power" +WARNHI_power0_6_3 = "250000000" +WARNLO_power0_6_3 = "0" +CRITHI_power0_6_3 = "300000000" +CRITLO_power0_6_3 = "0" + +LABEL_power0_9_4 = "p0_io_power" +WARNHI_power0_9_4 = "80000000" +WARNLO_power0_9_4 = "0" +CRITHI_power0_9_4 = "100000000" +CRITLO_power0_9_4 = "0" + +LABEL_power0_10_5 = "p1_io_power" +WARNHI_power0_10_5 = "80000000" +WARNLO_power0_10_5 = "0" +CRITHI_power0_10_5 = "100000000" +CRITLO_power0_10_5 = "0" + +LABEL_power0_1_6 = "p0_mem_power" +WARNHI_power0_1_6 = "250000000" +WARNLO_power0_1_6 = "0" +CRITHI_power0_1_6 = "300000000" +CRITLO_power0_1_6 = "0" + +LABEL_power0_2_7 = "p1_mem_power" +WARNHI_power0_2_7 = "250000000" +WARNLO_power0_2_7 = "0" +CRITHI_power0_2_7 = "300000000" +CRITLO_power0_2_7 = "0" + +LABEL_power0_18_14 = "fan_disk_power" +WARNHI_power0_18_14 = "375000000" +WARNLO_power0_18_14 = "0" +CRITHI_power0_18_14 = "400000000" +CRITLO_power0_18_14 = "0" + +LABEL_power0_13_15 = "io_power" +WARNHI_power0_13_15 = "128000000" +WARNLO_power0_13_15 = "0" +CRITHI_power0_13_15 = "150000000" +CRITLO_power0_13_15 = "0" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf new file mode 100644 index 000000000..55b72fc2a --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf @@ -0,0 +1,268 @@ +MODE_temp1 = "label" +MODE_temp2 = "label" +MODE_temp3 = "label" +MODE_temp4 = "label" +MODE_temp5 = "label" +MODE_temp6 = "label" +MODE_temp7 = "label" +MODE_temp8 = "label" +MODE_temp9 = "label" +MODE_temp10 = "label" +MODE_temp11 = "label" +MODE_temp12 = "label" +MODE_temp13 = "label" +MODE_temp14 = "label" +MODE_temp15 = "label" +MODE_temp16 = "label" +MODE_temp17 = "label" +MODE_temp18 = "label" +MODE_temp19 = "label" +MODE_temp20 = "label" +MODE_temp21 = "label" +MODE_temp22 = "label" +MODE_temp23 = "label" +MODE_temp24 = "label" +MODE_temp25 = "label" +MODE_temp26 = "label" +MODE_temp27 = "label" +MODE_temp28 = "label" +MODE_temp29 = "label" +MODE_temp30 = "label" +MODE_temp31 = "label" +MODE_temp32 = "label" +MODE_temp33 = "label" +MODE_temp34 = "label" +MODE_temp35 = "label" +MODE_temp36 = "label" +MODE_temp37 = "label" +MODE_temp38 = "label" + +REMOVERCS = "11" + +LABEL_temp91 = "p1_core0_temp" +WARNHI_temp91 = "78000" +WARNLO_temp91 = "0" +CRITHI_temp91 = "83000" +CRITLO_temp91 = "0" + +LABEL_temp94 = "p1_core1_temp" +WARNHI_temp94 = "78000" +WARNLO_temp94 = "0" +CRITHI_temp94 = "83000" +CRITLO_temp94 = "0" + +LABEL_temp97 = "p1_core2_temp" +WARNHI_temp97 = "78000" +WARNLO_temp97 = "0" +CRITHI_temp97 = "83000" +CRITLO_temp97 = "0" + +LABEL_temp100 = "p1_core3_temp" +WARNHI_temp100 = "78000" +WARNLO_temp100 = "0" +CRITHI_temp100 = "83000" +CRITLO_temp100 = "0" + +LABEL_temp103 = "p1_core4_temp" +WARNHI_temp103 = "78000" +WARNLO_temp103 = "0" +CRITHI_temp103 = "83000" +CRITLO_temp103 = "0" + +LABEL_temp106 = "p1_core5_temp" +WARNHI_temp106 = "78000" +WARNLO_temp106 = "0" +CRITHI_temp106 = "83000" +CRITLO_temp106 = "0" + +LABEL_temp109 = "p1_core6_temp" +WARNHI_temp109 = "78000" +WARNLO_temp109 = "0" +CRITHI_temp109 = "83000" +CRITLO_temp109 = "0" + +LABEL_temp112 = "p1_core7_temp" +WARNHI_temp112 = "78000" +WARNLO_temp112 = "0" +CRITHI_temp112 = "83000" +CRITLO_temp112 = "0" + +LABEL_temp115 = "p1_core8_temp" +WARNHI_temp115 = "78000" +WARNLO_temp115 = "0" +CRITHI_temp115 = "83000" +CRITLO_temp115 = "0" + +LABEL_temp118 = "p1_core9_temp" +WARNHI_temp118 = "78000" +WARNLO_temp118 = "0" +CRITHI_temp118 = "83000" +CRITLO_temp118 = "0" + +LABEL_temp121 = "p1_core10_temp" +WARNHI_temp121 = "78000" +WARNLO_temp121 = "0" +CRITHI_temp121 = "83000" +CRITLO_temp121 = "0" + +LABEL_temp124 = "p1_core11_temp" +WARNHI_temp124 = "78000" +WARNLO_temp124 = "0" +CRITHI_temp124 = "83000" +CRITLO_temp124 = "0" + +LABEL_temp127 = "p1_core12_temp" +WARNHI_temp127 = "78000" +WARNLO_temp127 = "0" +CRITHI_temp127 = "83000" +CRITLO_temp127 = "0" + +LABEL_temp130 = "p1_core13_temp" +WARNHI_temp130 = "78000" +WARNLO_temp130 = "0" +CRITHI_temp130 = "83000" +CRITLO_temp130 = "0" + +LABEL_temp133 = "p1_core14_temp" +WARNHI_temp133 = "78000" +WARNLO_temp133 = "0" +CRITHI_temp133 = "83000" +CRITLO_temp133 = "0" + +LABEL_temp136 = "p1_core15_temp" +WARNHI_temp136 = "78000" +WARNLO_temp136 = "0" +CRITHI_temp136 = "83000" +CRITLO_temp136 = "0" + +LABEL_temp139 = "p1_core16_temp" +WARNHI_temp139 = "78000" +WARNLO_temp139 = "0" +CRITHI_temp139 = "83000" +CRITLO_temp139 = "0" + +LABEL_temp142 = "p1_core17_temp" +WARNHI_temp142 = "78000" +WARNLO_temp142 = "0" +CRITHI_temp142 = "83000" +CRITLO_temp142 = "0" + +LABEL_temp145 = "p1_core18_temp" +WARNHI_temp145 = "78000" +WARNLO_temp145 = "0" +CRITHI_temp145 = "83000" +CRITLO_temp145 = "0" + +LABEL_temp148 = "p1_core19_temp" +WARNHI_temp148 = "78000" +WARNLO_temp148 = "0" +CRITHI_temp148 = "83000" +CRITLO_temp148 = "0" + +LABEL_temp151 = "p1_core20_temp" +WARNHI_temp151 = "78000" +WARNLO_temp151 = "0" +CRITHI_temp151 = "83000" +CRITLO_temp151 = "0" + +LABEL_temp154 = "p1_core21_temp" +WARNHI_temp154 = "78000" +WARNLO_temp154 = "0" +CRITHI_temp154 = "83000" +CRITLO_temp154 = "0" + +LABEL_temp157 = "p1_core22_temp" +WARNHI_temp157 = "78000" +WARNLO_temp157 = "0" +CRITHI_temp157 = "83000" +CRITLO_temp157 = "0" + +LABEL_temp160 = "p1_core23_temp" +WARNHI_temp160 = "78000" +WARNLO_temp160 = "0" +CRITHI_temp160 = "83000" +CRITLO_temp160 = "0" + +LABEL_temp181 = "dimm8_temp" +WARNHI_temp181 = "78000" +WARNLO_temp181 = "0" +CRITHI_temp181 = "83000" +CRITLO_temp181 = "0" + +LABEL_temp183 = "dimm9_temp" +WARNHI_temp183 = "78000" +WARNLO_temp183 = "0" +CRITHI_temp183 = "83000" +CRITLO_temp183 = "0" + +LABEL_temp185 = "dimm10_temp" +WARNHI_temp185 = "78000" +WARNLO_temp185 = "0" +CRITHI_temp185 = "83000" +CRITLO_temp185 = "0" + +LABEL_temp187 = "dimm11_temp" +WARNHI_temp187 = "78000" +WARNLO_temp187 = "0" +CRITHI_temp187 = "83000" +CRITLO_temp187 = "0" + +LABEL_temp189 = "dimm12_temp" +WARNHI_temp189 = "78000" +WARNLO_temp189 = "0" +CRITHI_temp189 = "83000" +CRITLO_temp189 = "0" + +LABEL_temp191 = "dimm13_temp" +WARNHI_temp191 = "78000" +WARNLO_temp191 = "0" +CRITHI_temp191 = "83000" +CRITLO_temp191 = "0" + +LABEL_temp193 = "dimm14_temp" +WARNHI_temp193 = "78000" +WARNLO_temp193 = "0" +CRITHI_temp193 = "83000" +CRITLO_temp193 = "0" + +LABEL_temp195 = "dimm15_temp" +WARNHI_temp195 = "78000" +WARNLO_temp195 = "0" +CRITHI_temp195 = "83000" +CRITLO_temp195 = "0" + +LABEL_temp207 = "gpu3_core_temp" +WARNHI_temp207 = "76000" +WARNLO_temp207 = "0" +CRITHI_temp207 = "81000" +CRITLO_temp207 = "0" + +LABEL_temp208 = "gpu3_mem_temp" +WARNHI_temp208 = "78000" +WARNLO_temp208 = "0" +CRITHI_temp208 = "83000" +CRITLO_temp208 = "0" + +LABEL_temp210 = "gpu4_core_temp" +WARNHI_temp210 = "76000" +WARNLO_temp210 = "0" +CRITHI_temp210 = "81000" +CRITLO_temp210 = "0" + +LABEL_temp211 = "gpu4_mem_temp" +WARNHI_temp211 = "78000" +WARNLO_temp211 = "0" +CRITHI_temp211 = "83000" +CRITLO_temp211 = "0" + +LABEL_temp213 = "gpu5_core_temp" +WARNHI_temp213 = "76000" +WARNLO_temp213 = "0" +CRITHI_temp213 = "81000" +CRITLO_temp213 = "0" + +LABEL_temp214 = "gpu5_mem_temp" +WARNHI_temp214 = "78000" +WARNLO_temp214 = "0" +CRITHI_temp214 = "83000" +CRITLO_temp214 = "0" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf deleted file mode 100644 index c5fa56f65..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ /dev/null @@ -1,338 +0,0 @@ -MODE_temp1 = "label" -MODE_temp2 = "label" -MODE_temp3 = "label" -MODE_temp4 = "label" -MODE_temp5 = "label" -MODE_temp6 = "label" -MODE_temp7 = "label" -MODE_temp8 = "label" -MODE_temp9 = "label" -MODE_temp10 = "label" -MODE_temp11 = "label" -MODE_temp12 = "label" -MODE_temp13 = "label" -MODE_temp14 = "label" -MODE_temp15 = "label" -MODE_temp16 = "label" -MODE_temp17 = "label" -MODE_temp18 = "label" -MODE_temp19 = "label" -MODE_temp20 = "label" -MODE_temp21 = "label" -MODE_temp22 = "label" -MODE_temp23 = "label" -MODE_temp24 = "label" -MODE_temp25 = "label" -MODE_temp26 = "label" -MODE_temp27 = "label" -MODE_temp28 = "label" -MODE_temp29 = "label" -MODE_temp30 = "label" -MODE_temp31 = "label" -MODE_temp32 = "label" -MODE_temp33 = "label" -MODE_temp34 = "label" -MODE_temp35 = "label" -MODE_temp36 = "label" -MODE_temp37 = "label" -MODE_temp38 = "label" - -MODE_power1 = "label" -MODE_power2 = "label" -MODE_power3 = "label" -MODE_power4 = "label" -MODE_power5 = "label" -MODE_power6 = "label" -MODE_power7 = "label" -MODE_power8 = "label" -MODE_power9 = "label" -MODE_power10 = "label" -MODE_power11 = "label" -MODE_power12 = "label" -MODE_power13 = "label" -MODE_power14 = "label" -MODE_power15 = "label" - -REMOVERCS = "11" - -LABEL_temp17 = "p0_core0_temp" -WARNHI_temp17 = "78000" -WARNLO_temp17 = "0" -CRITHI_temp17 = "83000" -CRITLO_temp17 = "0" - -LABEL_temp20 = "p0_core1_temp" -WARNHI_temp20 = "78000" -WARNLO_temp20 = "0" -CRITHI_temp20 = "83000" -CRITLO_temp20 = "0" - -LABEL_temp23 = "p0_core2_temp" -WARNHI_temp23 = "78000" -WARNLO_temp23 = "0" -CRITHI_temp23 = "83000" -CRITLO_temp23 = "0" - -LABEL_temp26 = "p0_core3_temp" -WARNHI_temp26 = "78000" -WARNLO_temp26 = "0" -CRITHI_temp26 = "83000" -CRITLO_temp26 = "0" - -LABEL_temp29 = "p0_core4_temp" -WARNHI_temp29 = "78000" -WARNLO_temp29 = "0" -CRITHI_temp29 = "83000" -CRITLO_temp29 = "0" - -LABEL_temp32 = "p0_core5_temp" -WARNHI_temp32 = "78000" -WARNLO_temp32 = "0" -CRITHI_temp32 = "83000" -CRITLO_temp32 = "0" - -LABEL_temp35 = "p0_core6_temp" -WARNHI_temp35 = "78000" -WARNLO_temp35 = "0" -CRITHI_temp35 = "83000" -CRITLO_temp35 = "0" - -LABEL_temp38 = "p0_core7_temp" -WARNHI_temp38 = "78000" -WARNLO_temp38 = "0" -CRITHI_temp38 = "83000" -CRITLO_temp38 = "0" - -LABEL_temp41 = "p0_core8_temp" -WARNHI_temp41 = "78000" -WARNLO_temp41 = "0" -CRITHI_temp41 = "83000" -CRITLO_temp41 = "0" - -LABEL_temp44 = "p0_core9_temp" -WARNHI_temp44 = "78000" -WARNLO_temp44 = "0" -CRITHI_temp44 = "83000" -CRITLO_temp44 = "0" - -LABEL_temp47 = "p0_core10_temp" -WARNHI_temp47 = "78000" -WARNLO_temp47 = "0" -CRITHI_temp47 = "83000" -CRITLO_temp47 = "0" - -LABEL_temp50 = "p0_core11_temp" -WARNHI_temp50 = "78000" -WARNLO_temp50 = "0" -CRITHI_temp50 = "83000" -CRITLO_temp50 = "0" - -LABEL_temp53 = "p0_core12_temp" -WARNHI_temp53 = "78000" -WARNLO_temp53 = "0" -CRITHI_temp53 = "83000" -CRITLO_temp53 = "0" - -LABEL_temp56 = "p0_core13_temp" -WARNHI_temp56 = "78000" -WARNLO_temp56 = "0" -CRITHI_temp56 = "83000" -CRITLO_temp56 = "0" - -LABEL_temp59 = "p0_core14_temp" -WARNHI_temp59 = "78000" -WARNLO_temp59 = "0" -CRITHI_temp59 = "83000" -CRITLO_temp59 = "0" - -LABEL_temp62 = "p0_core15_temp" -WARNHI_temp62 = "78000" -WARNLO_temp62 = "0" -CRITHI_temp62 = "83000" -CRITLO_temp62 = "0" - -LABEL_temp65 = "p0_core16_temp" -WARNHI_temp65 = "78000" -WARNLO_temp65 = "0" -CRITHI_temp65 = "83000" -CRITLO_temp65 = "0" - -LABEL_temp68 = "p0_core17_temp" -WARNHI_temp68 = "78000" -WARNLO_temp68 = "0" -CRITHI_temp68 = "83000" -CRITLO_temp68 = "0" - -LABEL_temp71 = "p0_core18_temp" -WARNHI_temp71 = "78000" -WARNLO_temp71 = "0" -CRITHI_temp71 = "83000" -CRITLO_temp71 = "0" - -LABEL_temp74 = "p0_core19_temp" -WARNHI_temp74 = "78000" -WARNLO_temp74 = "0" -CRITHI_temp74 = "83000" -CRITLO_temp74 = "0" - -LABEL_temp77 = "p0_core20_temp" -WARNHI_temp77 = "78000" -WARNLO_temp77 = "0" -CRITHI_temp77 = "83000" -CRITLO_temp77 = "0" - -LABEL_temp80 = "p0_core21_temp" -WARNHI_temp80 = "78000" -WARNLO_temp80 = "0" -CRITHI_temp80 = "83000" -CRITLO_temp80 = "0" - -LABEL_temp83 = "p0_core22_temp" -WARNHI_temp83 = "78000" -WARNLO_temp83 = "0" -CRITHI_temp83 = "83000" -CRITLO_temp83 = "0" - -LABEL_temp86 = "p0_core23_temp" -WARNHI_temp86 = "78000" -WARNLO_temp86 = "0" -CRITHI_temp86 = "83000" -CRITLO_temp86 = "0" - -LABEL_temp165 = "dimm0_temp" -WARNHI_temp165 = "78000" -WARNLO_temp165 = "0" -CRITHI_temp165 = "83000" -CRITLO_temp165 = "0" - -LABEL_temp167 = "dimm1_temp" -WARNHI_temp167 = "78000" -WARNLO_temp167 = "0" -CRITHI_temp167 = "83000" -CRITLO_temp167 = "0" - -LABEL_temp169 = "dimm2_temp" -WARNHI_temp169 = "78000" -WARNLO_temp169 = "0" -CRITHI_temp169 = "83000" -CRITLO_temp169 = "0" - -LABEL_temp171 = "dimm3_temp" -WARNHI_temp171 = "78000" -WARNLO_temp171 = "0" -CRITHI_temp171 = "83000" -CRITLO_temp171 = "0" - -LABEL_temp173 = "dimm4_temp" -WARNHI_temp173 = "78000" -WARNLO_temp173 = "0" -CRITHI_temp173 = "83000" -CRITLO_temp173 = "0" - -LABEL_temp175 = "dimm5_temp" -WARNHI_temp175 = "78000" -WARNLO_temp175 = "0" -CRITHI_temp175 = "83000" -CRITLO_temp175 = "0" - -LABEL_temp177 = "dimm6_temp" -WARNHI_temp177 = "78000" -WARNLO_temp177 = "0" -CRITHI_temp177 = "83000" -CRITLO_temp177 = "0" - -LABEL_temp179 = "dimm7_temp" -WARNHI_temp179 = "78000" -WARNLO_temp179 = "0" -CRITHI_temp179 = "83000" -CRITLO_temp179 = "0" - -LABEL_temp198 = "gpu0_core_temp" -WARNHI_temp198 = "76000" -WARNLO_temp198 = "0" -CRITHI_temp198 = "81000" -CRITLO_temp198 = "0" - -LABEL_temp199 = "gpu0_mem_temp" -WARNHI_temp199 = "78000" -WARNLO_temp199 = "0" -CRITHI_temp199 = "83000" -CRITLO_temp199 = "0" - -LABEL_temp201 = "gpu1_core_temp" -WARNHI_temp201 = "76000" -WARNLO_temp201 = "0" -CRITHI_temp201 = "81000" -CRITLO_temp201 = "0" - -LABEL_temp202 = "gpu1_mem_temp" -WARNHI_temp202 = "78000" -WARNLO_temp202 = "0" -CRITHI_temp202 = "83000" -CRITLO_temp202 = "0" - -LABEL_temp204 = "gpu2_core_temp" -WARNHI_temp204 = "76000" -WARNLO_temp204 = "0" -CRITHI_temp204 = "81000" -CRITLO_temp204 = "0" - -LABEL_temp205 = "gpu2_mem_temp" -WARNHI_temp205 = "78000" -WARNLO_temp205 = "0" -CRITHI_temp205 = "83000" -CRITLO_temp205 = "0" - -LABEL_power0_22_0 = "total_power" -WARNHI_power0_22_0 = "3050000000" -WARNLO_power0_22_0 = "0" -CRITHI_power0_22_0 = "3100000000" -CRITLO_power0_22_0 = "0" - -LABEL_power0_5_2 = "p0_power" -WARNHI_power0_5_2 = "250000000" -WARNLO_power0_5_2 = "0" -CRITHI_power0_5_2 = "300000000" -CRITLO_power0_5_2 = "0" - -LABEL_power0_6_3 = "p1_power" -WARNHI_power0_6_3 = "250000000" -WARNLO_power0_6_3 = "0" -CRITHI_power0_6_3 = "300000000" -CRITLO_power0_6_3 = "0" - -LABEL_power0_9_4 = "p0_io_power" -WARNHI_power0_9_4 = "80000000" -WARNLO_power0_9_4 = "0" -CRITHI_power0_9_4 = "100000000" -CRITLO_power0_9_4 = "0" - -LABEL_power0_10_5 = "p1_io_power" -WARNHI_power0_10_5 = "80000000" -WARNLO_power0_10_5 = "0" -CRITHI_power0_10_5 = "100000000" -CRITLO_power0_10_5 = "0" - -LABEL_power0_1_6 = "p0_mem_power" -WARNHI_power0_1_6 = "250000000" -WARNLO_power0_1_6 = "0" -CRITHI_power0_1_6 = "300000000" -CRITLO_power0_1_6 = "0" - -LABEL_power0_2_7 = "p1_mem_power" -WARNHI_power0_2_7 = "250000000" -WARNLO_power0_2_7 = "0" -CRITHI_power0_2_7 = "300000000" -CRITLO_power0_2_7 = "0" - -LABEL_power0_18_14 = "fan_disk_power" -WARNHI_power0_18_14 = "375000000" -WARNLO_power0_18_14 = "0" -CRITHI_power0_18_14 = "400000000" -CRITLO_power0_18_14 = "0" - -LABEL_power0_13_15 = "io_power" -WARNHI_power0_13_15 = "128000000" -WARNLO_power0_13_15 = "0" -CRITHI_power0_13_15 = "150000000" -CRITLO_power0_13_15 = "0" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/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-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/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 deleted file mode 100644 index 55b72fc2a..000000000 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon/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 +++ /dev/null @@ -1,268 +0,0 @@ -MODE_temp1 = "label" -MODE_temp2 = "label" -MODE_temp3 = "label" -MODE_temp4 = "label" -MODE_temp5 = "label" -MODE_temp6 = "label" -MODE_temp7 = "label" -MODE_temp8 = "label" -MODE_temp9 = "label" -MODE_temp10 = "label" -MODE_temp11 = "label" -MODE_temp12 = "label" -MODE_temp13 = "label" -MODE_temp14 = "label" -MODE_temp15 = "label" -MODE_temp16 = "label" -MODE_temp17 = "label" -MODE_temp18 = "label" -MODE_temp19 = "label" -MODE_temp20 = "label" -MODE_temp21 = "label" -MODE_temp22 = "label" -MODE_temp23 = "label" -MODE_temp24 = "label" -MODE_temp25 = "label" -MODE_temp26 = "label" -MODE_temp27 = "label" -MODE_temp28 = "label" -MODE_temp29 = "label" -MODE_temp30 = "label" -MODE_temp31 = "label" -MODE_temp32 = "label" -MODE_temp33 = "label" -MODE_temp34 = "label" -MODE_temp35 = "label" -MODE_temp36 = "label" -MODE_temp37 = "label" -MODE_temp38 = "label" - -REMOVERCS = "11" - -LABEL_temp91 = "p1_core0_temp" -WARNHI_temp91 = "78000" -WARNLO_temp91 = "0" -CRITHI_temp91 = "83000" -CRITLO_temp91 = "0" - -LABEL_temp94 = "p1_core1_temp" -WARNHI_temp94 = "78000" -WARNLO_temp94 = "0" -CRITHI_temp94 = "83000" -CRITLO_temp94 = "0" - -LABEL_temp97 = "p1_core2_temp" -WARNHI_temp97 = "78000" -WARNLO_temp97 = "0" -CRITHI_temp97 = "83000" -CRITLO_temp97 = "0" - -LABEL_temp100 = "p1_core3_temp" -WARNHI_temp100 = "78000" -WARNLO_temp100 = "0" -CRITHI_temp100 = "83000" -CRITLO_temp100 = "0" - -LABEL_temp103 = "p1_core4_temp" -WARNHI_temp103 = "78000" -WARNLO_temp103 = "0" -CRITHI_temp103 = "83000" -CRITLO_temp103 = "0" - -LABEL_temp106 = "p1_core5_temp" -WARNHI_temp106 = "78000" -WARNLO_temp106 = "0" -CRITHI_temp106 = "83000" -CRITLO_temp106 = "0" - -LABEL_temp109 = "p1_core6_temp" -WARNHI_temp109 = "78000" -WARNLO_temp109 = "0" -CRITHI_temp109 = "83000" -CRITLO_temp109 = "0" - -LABEL_temp112 = "p1_core7_temp" -WARNHI_temp112 = "78000" -WARNLO_temp112 = "0" -CRITHI_temp112 = "83000" -CRITLO_temp112 = "0" - -LABEL_temp115 = "p1_core8_temp" -WARNHI_temp115 = "78000" -WARNLO_temp115 = "0" -CRITHI_temp115 = "83000" -CRITLO_temp115 = "0" - -LABEL_temp118 = "p1_core9_temp" -WARNHI_temp118 = "78000" -WARNLO_temp118 = "0" -CRITHI_temp118 = "83000" -CRITLO_temp118 = "0" - -LABEL_temp121 = "p1_core10_temp" -WARNHI_temp121 = "78000" -WARNLO_temp121 = "0" -CRITHI_temp121 = "83000" -CRITLO_temp121 = "0" - -LABEL_temp124 = "p1_core11_temp" -WARNHI_temp124 = "78000" -WARNLO_temp124 = "0" -CRITHI_temp124 = "83000" -CRITLO_temp124 = "0" - -LABEL_temp127 = "p1_core12_temp" -WARNHI_temp127 = "78000" -WARNLO_temp127 = "0" -CRITHI_temp127 = "83000" -CRITLO_temp127 = "0" - -LABEL_temp130 = "p1_core13_temp" -WARNHI_temp130 = "78000" -WARNLO_temp130 = "0" -CRITHI_temp130 = "83000" -CRITLO_temp130 = "0" - -LABEL_temp133 = "p1_core14_temp" -WARNHI_temp133 = "78000" -WARNLO_temp133 = "0" -CRITHI_temp133 = "83000" -CRITLO_temp133 = "0" - -LABEL_temp136 = "p1_core15_temp" -WARNHI_temp136 = "78000" -WARNLO_temp136 = "0" -CRITHI_temp136 = "83000" -CRITLO_temp136 = "0" - -LABEL_temp139 = "p1_core16_temp" -WARNHI_temp139 = "78000" -WARNLO_temp139 = "0" -CRITHI_temp139 = "83000" -CRITLO_temp139 = "0" - -LABEL_temp142 = "p1_core17_temp" -WARNHI_temp142 = "78000" -WARNLO_temp142 = "0" -CRITHI_temp142 = "83000" -CRITLO_temp142 = "0" - -LABEL_temp145 = "p1_core18_temp" -WARNHI_temp145 = "78000" -WARNLO_temp145 = "0" -CRITHI_temp145 = "83000" -CRITLO_temp145 = "0" - -LABEL_temp148 = "p1_core19_temp" -WARNHI_temp148 = "78000" -WARNLO_temp148 = "0" -CRITHI_temp148 = "83000" -CRITLO_temp148 = "0" - -LABEL_temp151 = "p1_core20_temp" -WARNHI_temp151 = "78000" -WARNLO_temp151 = "0" -CRITHI_temp151 = "83000" -CRITLO_temp151 = "0" - -LABEL_temp154 = "p1_core21_temp" -WARNHI_temp154 = "78000" -WARNLO_temp154 = "0" -CRITHI_temp154 = "83000" -CRITLO_temp154 = "0" - -LABEL_temp157 = "p1_core22_temp" -WARNHI_temp157 = "78000" -WARNLO_temp157 = "0" -CRITHI_temp157 = "83000" -CRITLO_temp157 = "0" - -LABEL_temp160 = "p1_core23_temp" -WARNHI_temp160 = "78000" -WARNLO_temp160 = "0" -CRITHI_temp160 = "83000" -CRITLO_temp160 = "0" - -LABEL_temp181 = "dimm8_temp" -WARNHI_temp181 = "78000" -WARNLO_temp181 = "0" -CRITHI_temp181 = "83000" -CRITLO_temp181 = "0" - -LABEL_temp183 = "dimm9_temp" -WARNHI_temp183 = "78000" -WARNLO_temp183 = "0" -CRITHI_temp183 = "83000" -CRITLO_temp183 = "0" - -LABEL_temp185 = "dimm10_temp" -WARNHI_temp185 = "78000" -WARNLO_temp185 = "0" -CRITHI_temp185 = "83000" -CRITLO_temp185 = "0" - -LABEL_temp187 = "dimm11_temp" -WARNHI_temp187 = "78000" -WARNLO_temp187 = "0" -CRITHI_temp187 = "83000" -CRITLO_temp187 = "0" - -LABEL_temp189 = "dimm12_temp" -WARNHI_temp189 = "78000" -WARNLO_temp189 = "0" -CRITHI_temp189 = "83000" -CRITLO_temp189 = "0" - -LABEL_temp191 = "dimm13_temp" -WARNHI_temp191 = "78000" -WARNLO_temp191 = "0" -CRITHI_temp191 = "83000" -CRITLO_temp191 = "0" - -LABEL_temp193 = "dimm14_temp" -WARNHI_temp193 = "78000" -WARNLO_temp193 = "0" -CRITHI_temp193 = "83000" -CRITLO_temp193 = "0" - -LABEL_temp195 = "dimm15_temp" -WARNHI_temp195 = "78000" -WARNLO_temp195 = "0" -CRITHI_temp195 = "83000" -CRITLO_temp195 = "0" - -LABEL_temp207 = "gpu3_core_temp" -WARNHI_temp207 = "76000" -WARNLO_temp207 = "0" -CRITHI_temp207 = "81000" -CRITLO_temp207 = "0" - -LABEL_temp208 = "gpu3_mem_temp" -WARNHI_temp208 = "78000" -WARNLO_temp208 = "0" -CRITHI_temp208 = "83000" -CRITLO_temp208 = "0" - -LABEL_temp210 = "gpu4_core_temp" -WARNHI_temp210 = "76000" -WARNLO_temp210 = "0" -CRITHI_temp210 = "81000" -CRITLO_temp210 = "0" - -LABEL_temp211 = "gpu4_mem_temp" -WARNHI_temp211 = "78000" -WARNLO_temp211 = "0" -CRITHI_temp211 = "83000" -CRITLO_temp211 = "0" - -LABEL_temp213 = "gpu5_core_temp" -WARNHI_temp213 = "76000" -WARNLO_temp213 = "0" -CRITHI_temp213 = "81000" -CRITLO_temp213 = "0" - -LABEL_temp214 = "gpu5_mem_temp" -WARNHI_temp214 = "78000" -WARNLO_temp214 = "0" -CRITHI_temp214 = "83000" -CRITLO_temp214 = "0" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 4d60a74c2..4af367af7 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -71,9 +71,9 @@ ITEMS_append_mihawk += " iio-hwmon-battery.conf" OCCS = " \ 00--00--00--06/sbefifo1-dev0/occ-hwmon.1 \ - 00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \ + 00--00--00--0a/fsi-master/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2 \ " -OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" +OCCSFMT = "devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/{0}.conf" OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" -- cgit v1.2.3 From dcc54a37efeda257142added5bd5e1c46893f555 Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Wed, 2 Oct 2019 16:46:32 -0500 Subject: ibm: tacoma: Fix I2C hwmon conf files paths The AST2600 device tree paths for the I2C buses are different than on the AST2500, so add a new set of hwmon conf files for the tacoma system that are the same as witherspoon but just in a different directory. Stopped doing CHIPS_append in the recipe since witherspoon-tacoma inherits from witherspoon it was getting all of witherspoon's conf files as well. (From meta-ibm rev: b9cd483488901d6d379360317caf537fa4529f90) Signed-off-by: Matt Spinler Change-Id: I29c61d541e58cd0113caf8584d2e5720b738d090 Signed-off-by: Brad Bishop --- .../apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf | 6 ++ .../apb/bus@1e78a000/i2c-bus@200/dps310@76.conf | 6 ++ .../bus@1e78a000/i2c-bus@200/max31785@52_air.conf | 17 ++++++ .../i2c-bus@200/max31785@52_water.conf | 13 +++++ .../bus@1e78a000/i2c-bus@200/power-supply@68.conf | 23 ++++++++ .../bus@1e78a000/i2c-bus@200/power-supply@69.conf | 23 ++++++++ .../apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf | 65 ++++++++++++++++++++++ .../apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf | 65 ++++++++++++++++++++++ .../apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf | 65 ++++++++++++++++++++++ .../apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf | 65 ++++++++++++++++++++++ .../apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf | 5 ++ .../sensors/phosphor-hwmon_%.bbappend | 31 ++++++++--- 12 files changed, 376 insertions(+), 8 deletions(-) create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf new file mode 100644 index 000000000..cdf8b4726 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/bmp280@77.conf @@ -0,0 +1,6 @@ +LABEL_temp1 = "ambient" +WARNHI_temp1 = "25000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "35000" +CRITLO_temp1 = "0" +OFFSET_temp1 = "-2000" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf new file mode 100644 index 000000000..cdf8b4726 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/dps310@76.conf @@ -0,0 +1,6 @@ +LABEL_temp1 = "ambient" +WARNHI_temp1 = "25000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "35000" +CRITLO_temp1 = "0" +OFFSET_temp1 = "-2000" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf new file mode 100644 index 000000000..d3df21599 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_air.conf @@ -0,0 +1,17 @@ +LABEL_fan1 = "fan0_0" + +LABEL_fan2 = "fan1_0" + +LABEL_fan3 = "fan2_0" + +LABEL_fan4 = "fan3_0" + +LABEL_fan5 = "fan0_1" + +LABEL_fan6 = "fan1_1" + +LABEL_fan7 = "fan2_1" + +LABEL_fan8 = "fan3_1" + +TARGET_MODE = "RPM" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf new file mode 100644 index 000000000..c96bfa76b --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/max31785@52_water.conf @@ -0,0 +1,13 @@ +LABEL_fan1 = "fan0_0" + +LABEL_fan3 = "fan2_0" + +LABEL_fan4 = "fan3_0" + +LABEL_fan5 = "fan0_1" + +LABEL_fan7 = "fan2_1" + +LABEL_fan8 = "fan3_1" + +TARGET_MODE = "RPM" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf new file mode 100644 index 000000000..e463b517c --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@68.conf @@ -0,0 +1,23 @@ +LABEL_in1="ps1_input_voltage" +WARNHI_in1="290000" +WARNLO_in1="200000" +CRITHI_in1="300000" +CRITLO_in1="180000" + +LABEL_in2="ps1_output_voltage" +WARNHI_in2="12700" +WARNLO_in2="0" +CRITHI_in2="13000" +CRITLO_in2="0" + +LABEL_curr1="ps1_output_current" +WARNHI_curr1="170000" +WARNLO_curr1="0" +CRITHI_curr1="180000" +CRITLO_curr1="0" + +LABEL_power1="ps1_input_power" +WARNHI_power1="2350000000" +WARNLO_power1="0" +CRITHI_power1="2500000000" +CRITLO_power1="0" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf new file mode 100644 index 000000000..2fadbdec0 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@200/power-supply@69.conf @@ -0,0 +1,23 @@ +LABEL_in1="ps0_input_voltage" +WARNHI_in1="290000" +WARNLO_in1="200000" +CRITHI_in1="300000" +CRITLO_in1="180000" + +LABEL_in2="ps0_output_voltage" +WARNHI_in2="12700" +WARNLO_in2="0" +CRITHI_in2="13000" +CRITLO_in2="0" + +LABEL_curr1="ps0_output_current" +WARNHI_curr1="170000" +WARNLO_curr1="0" +CRITHI_curr1="180000" +CRITLO_curr1="0" + +LABEL_power1="ps0_input_power" +WARNHI_power1="2350000000" +WARNLO_power1="0" +CRITHI_power1="2500000000" +CRITLO_power1="0" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf new file mode 100644 index 000000000..c5344aeb6 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@70.conf @@ -0,0 +1,65 @@ +#4-0070 +#VDD then VCS + +MODE_in1 = "label" +MODE_in2 = "label" +MODE_in3 = "label" +MODE_in4 = "label" + +MODE_curr1 = "label" +MODE_curr2 = "label" +MODE_curr3 = "label" +MODE_curr4 = "label" + +MODE_power1 = "label" +MODE_power2 = "label" +MODE_power3 = "label" +MODE_power4 = "label" + +LABEL_temp1 = "p0_vdd_temp" +WARNHI_temp1 = "80000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "85000" +CRITLO_temp1 = "0" + +LABEL_curriout1 = "p0_vdd_current" +WARNLO_curriout1 = "0" +CRITLO_curriout1 = "0" +WARNHI_curriout1 = "320000" +CRITHI_curriout1 = "360000" + +LABEL_invout1 = "p0_vdd_voltage" +WARNLO_invout1 = "0" +CRITLO_invout1 = "0" +WARNHI_invout1 = "1150" +CRITHI_invout1 = "1300" + +LABEL_powerpout1 = "p0_vdd_power" +WARNLO_powerpout1 = "0" +CRITLO_powerpout1 = "0" +WARNHI_powerpout1 = "270000000" +CRITHI_powerpout1 = "290000000" + +LABEL_temp2 = "p0_vcs_temp" +WARNHI_temp2 = "80000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "85000" +CRITLO_temp2 = "0" + +LABEL_curriout2 = "p0_vcs_current" +WARNLO_curriout2 = "0" +CRITLO_curriout2 = "0" +WARNHI_curriout2 = "20000" +CRITHI_curriout2 = "25000" + +LABEL_invout2 = "p0_vcs_voltage" +WARNLO_invout2 = "0" +CRITLO_invout2 = "0" +WARNHI_invout2 = "1150" +CRITHI_invout2 = "1300" + +LABEL_powerpout2 = "p0_vcs_power" +WARNLO_powerpout2 = "0" +CRITLO_powerpout2 = "0" +WARNHI_powerpout2 = "20000000" +CRITHI_powerpout2 = "25000000" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf new file mode 100644 index 000000000..23746aa11 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@280/ir35221@71.conf @@ -0,0 +1,65 @@ +#4-0071 +#VDN then VDDR + +MODE_in1 = "label" +MODE_in2 = "label" +MODE_in3 = "label" +MODE_in4 = "label" + +MODE_curr1 = "label" +MODE_curr2 = "label" +MODE_curr3 = "label" +MODE_curr4 = "label" + +MODE_power1 = "label" +MODE_power2 = "label" +MODE_power3 = "label" +MODE_power4 = "label" + +LABEL_temp1 = "p0_vdn_temp" +WARNHI_temp1 = "80000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "85000" +CRITLO_temp1 = "0" + +LABEL_curriout1 = "p0_vdn_current" +WARNLO_curriout1 = "0" +CRITLO_curriout1 = "0" +WARNHI_curriout1 = "80000" +CRITHI_curriout1 = "110000" + +LABEL_invout1 = "p0_vdn_voltage" +WARNLO_invout1 = "0" +CRITLO_invout1 = "0" +WARNHI_invout1 = "1100" +CRITHI_invout1 = "1300" + +LABEL_powerpout1 = "p0_vdn_power" +WARNLO_powerpout1 = "0" +CRITLO_powerpout1 = "0" +WARNHI_powerpout1 = "88000000" +CRITHI_powerpout1 = "121000000" + +LABEL_temp2 = "p0_vddr_temp" +WARNHI_temp2 = "80000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "85000" +CRITLO_temp2 = "0" + +LABEL_curriout2 = "p0_vddr_current" +WARNLO_curriout2 = "0" +CRITLO_curriout2 = "0" +WARNHI_curriout2 = "115000" +CRITHI_curriout2 = "130000" + +LABEL_invout2 = "p0_vddr_voltage" +WARNLO_invout2 = "0" +CRITLO_invout2 = "0" +WARNHI_invout2 = "1280" +CRITHI_invout2 = "1350" + +LABEL_powerpout2 = "p0_vddr_power" +WARNLO_powerpout2 = "0" +CRITLO_powerpout2 = "0" +WARNHI_powerpout2 = "139150000" +CRITHI_powerpout2 = "159900000" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf new file mode 100644 index 000000000..e7d8aaf23 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@70.conf @@ -0,0 +1,65 @@ +#5-0070 +#VDD then VCS + +MODE_in1 = "label" +MODE_in2 = "label" +MODE_in3 = "label" +MODE_in4 = "label" + +MODE_curr1 = "label" +MODE_curr2 = "label" +MODE_curr3 = "label" +MODE_curr4 = "label" + +MODE_power1 = "label" +MODE_power2 = "label" +MODE_power3 = "label" +MODE_power4 = "label" + +LABEL_temp1 = "p1_vdd_temp" +WARNHI_temp1 = "80000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "85000" +CRITLO_temp1 = "0" + +LABEL_curriout1 = "p1_vdd_current" +WARNLO_curriout1 = "0" +CRITLO_curriout1 = "0" +WARNHI_curriout1 = "320000" +CRITHI_curriout1 = "360000" + +LABEL_invout1 = "p1_vdd_voltage" +WARNLO_invout1 = "0" +CRITLO_invout1 = "0" +WARNHI_invout1 = "1150" +CRITHI_invout1 = "1300" + +LABEL_powerpout1 = "p1_vdd_power" +WARNLO_powerpout1 = "0" +CRITLO_powerpout1 = "0" +WARNHI_powerpout1 = "270000000" +CRITHI_powerpout1 = "290000000" + +LABEL_temp2 = "p1_vcs_temp" +WARNHI_temp2 = "80000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "85000" +CRITLO_temp2 = "0" + +LABEL_curriout2 = "p1_vcs_current" +WARNLO_curriout2 = "0" +CRITLO_curriout2 = "0" +WARNHI_curriout2 = "20000" +CRITHI_curriout2 = "25000" + +LABEL_invout2 = "p1_vcs_voltage" +WARNLO_invout2 = "0" +CRITLO_invout2 = "0" +WARNHI_invout2 = "1150" +CRITHI_invout2 = "1300" + +LABEL_powerpout2 = "p1_vcs_power" +WARNLO_powerpout2 = "0" +CRITLO_powerpout2 = "0" +WARNHI_powerpout2 = "20000000" +CRITHI_powerpout2 = "25000000" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf new file mode 100644 index 000000000..30ec05dbb --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/ir35221@71.conf @@ -0,0 +1,65 @@ +#5-0071 +#VDN then VDDR + +MODE_in1 = "label" +MODE_in2 = "label" +MODE_in3 = "label" +MODE_in4 = "label" + +MODE_curr1 = "label" +MODE_curr2 = "label" +MODE_curr3 = "label" +MODE_curr4 = "label" + +MODE_power1 = "label" +MODE_power2 = "label" +MODE_power3 = "label" +MODE_power4 = "label" + +LABEL_temp1 = "p1_vdn_temp" +WARNHI_temp1 = "80000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "85000" +CRITLO_temp1 = "0" + +LABEL_curriout1 = "p1_vdn_current" +WARNLO_curriout1 = "0" +CRITLO_curriout1 = "0" +WARNHI_curriout1 = "80000" +CRITHI_curriout1 = "110000" + +LABEL_invout1 = "p1_vdn_voltage" +WARNLO_invout1 = "0" +CRITLO_invout1 = "0" +WARNHI_invout1 = "1100" +CRITHI_invout1 = "1300" + +LABEL_powerpout1 = "p1_vdn_power" +WARNLO_powerpout1 = "0" +CRITLO_powerpout1 = "0" +WARNHI_powerpout1 = "88000000" +CRITHI_powerpout1 = "121000000" + +LABEL_temp2 = "p1_vddr_temp" +WARNHI_temp2 = "80000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "85000" +CRITLO_temp2 = "0" + +LABEL_curriout2 = "p1_vddr_current" +WARNLO_curriout2 = "0" +CRITLO_curriout2 = "0" +WARNHI_curriout2 = "115000" +CRITHI_curriout2 = "130000" + +LABEL_invout2 = "p1_vddr_voltage" +WARNLO_invout2 = "0" +CRITLO_invout2 = "0" +WARNHI_invout2 = "1280" +CRITHI_invout2 = "1350" + +LABEL_powerpout2 = "p1_vddr_power" +WARNLO_powerpout2 = "0" +CRITLO_powerpout2 = "0" +WARNHI_powerpout2 = "139150000" +CRITHI_powerpout2 = "159900000" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf new file mode 100644 index 000000000..3af092867 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/witherspoon-tacoma/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@500/tmp275@4a.conf @@ -0,0 +1,5 @@ +LABEL_temp1 = "pcie" +WARNHI_temp1 = "60000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "70000" +CRITLO_temp1 = "0" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 4af367af7..36029dd72 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -8,13 +8,11 @@ SRC_URI_append_ibm-ac-server = " \ file://start_max31785_hwmon.sh \ " -CHIPS = " \ - bus@1e78a000/i2c-bus@100/max31785@52_air \ - bus@1e78a000/i2c-bus@100/max31785@52_water \ - bus@1e78a000/i2c-bus@100/power-supply@68 \ - bus@1e78a000/i2c-bus@100/power-supply@69 \ - " -CHIPS_append_witherspoon = " \ +CHIPS_witherspoon = " \ + bus@1e78a000/i2c-bus@100/max31785@52_air \ + bus@1e78a000/i2c-bus@100/max31785@52_water \ + bus@1e78a000/i2c-bus@100/power-supply@68 \ + bus@1e78a000/i2c-bus@100/power-supply@69 \ bus@1e78a000/i2c-bus@100/bmp280@77 \ bus@1e78a000/i2c-bus@100/dps310@76 \ bus@1e78a000/i2c-bus@140/ir35221@70 \ @@ -23,7 +21,11 @@ CHIPS_append_witherspoon = " \ bus@1e78a000/i2c-bus@180/ir35221@71 \ bus@1e78a000/i2c-bus@380/tmp275@4a \ " -CHIPS_append_swift = " \ +CHIPS_swift = " \ + bus@1e78a000/i2c-bus@100/max31785@52_air \ + bus@1e78a000/i2c-bus@100/max31785@52_water \ + bus@1e78a000/i2c-bus@100/power-supply@68 \ + bus@1e78a000/i2c-bus@100/power-supply@69 \ bus@1e78a000/i2c-bus@440/tmp275@4a \ bus@1e78a000/i2c-bus@440/tmp275@48 \ bus@1e78a000/i2c-bus@300/tmp275@48 \ @@ -50,6 +52,19 @@ CHIPS_mihawk = " \ bus@1e78a000/i2c-bus@440/pca9545@70/i2c@3/tmp275@48 \ " +CHIPS_witherspoon-tacoma = " \ + bus@1e78a000/i2c-bus@200/max31785@52_air \ + bus@1e78a000/i2c-bus@200/max31785@52_water \ + bus@1e78a000/i2c-bus@200/power-supply@68 \ + bus@1e78a000/i2c-bus@200/power-supply@69 \ + bus@1e78a000/i2c-bus@200/bmp280@77 \ + bus@1e78a000/i2c-bus@200/dps310@76 \ + bus@1e78a000/i2c-bus@280/ir35221@70 \ + bus@1e78a000/i2c-bus@280/ir35221@71 \ + bus@1e78a000/i2c-bus@300/ir35221@70 \ + bus@1e78a000/i2c-bus@300/ir35221@71 \ + bus@1e78a000/i2c-bus@500/tmp275@4a \ + " ITEMSFMT = "ahb/apb/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}" ITEMS_append_mihawk += " iio-hwmon-vdd0.conf" -- cgit v1.2.3 From f42bf418f925a24e60f2f585e9dcf2be873231c3 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 4 Oct 2019 15:03:10 -0500 Subject: rainier: remove p9 vcs workaround (From meta-ibm rev: fa9055c86e62ee29dd219b665e671ddde256b302) Change-Id: I702c1f0515c5a390c7b27036667719b733d349e2 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend | 1 + 1 file changed, 1 insertion(+) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend index a698b06ad..423a9e4a1 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/host/p9-host-start.bbappend @@ -5,4 +5,5 @@ RDEPENDS_${PN}_remove_ibm-ac-server = "p9-vcs-workaround" RDEPENDS_${PN}_append_mihawk = " avsbus-control" RDEPENDS_${PN}_append_mihawk = " vrm-control" RDEPENDS_${PN}_remove_mihawk = "p9-vcs-workaround" +RDEPENDS_${PN}_remove_rainier = "p9-vcs-workaround" -- cgit v1.2.3 From 190ed000711353e8e1336d57d5bca331a3bbfe4b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 4 Oct 2019 15:22:23 -0500 Subject: rainier: linux config Just use witherspoon defaults for now (From meta-ibm rev: 48ebc48fa497ea1d1ca74301278d011db5120905) Change-Id: I2eacb25ec9468147a8b478e42b4be32df6094aef Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- .../meta-witherspoon/recipes-kernel/linux/linux-aspeed/rainier.cfg | 7 +++++++ .../meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend | 1 + 2 files changed, 8 insertions(+) create mode 100644 meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/rainier.cfg (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/rainier.cfg b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/rainier.cfg new file mode 100644 index 000000000..dc41d5834 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed/rainier.cfg @@ -0,0 +1,7 @@ +CONFIG_SENSORS_IIO_HWMON=y +CONFIG_SENSORS_TMP421=y +CONFIG_SENSORS_MAX31785=y +CONFIG_SENSORS_UCD9000=y +CONFIG_RTC_DRV_RV8803=y +CONFIG_IIO=y +CONFIG_BMP280=y diff --git a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend index 6f9a382ac..30df8a8a3 100644 --- a/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-kernel/linux/linux-aspeed_%.bbappend @@ -1,4 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append_ibm-ac-server = " file://witherspoon.cfg" +SRC_URI_append_rainier = " file://rainier.cfg" SRC_URI_append_mihawk = " file://mihawk.cfg" SRC_URI_append_witherspoon-128 = " file://0001-ARM-dts-Aspeed-Add-witherspoon-128-machine.patch" -- cgit v1.2.3 From c66791eee836737a8aee932b6aa5c01631ff8e36 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 4 Oct 2019 15:34:11 -0500 Subject: rainier: software manager mtd names The rainier filesystem is in a bit of flux right now. Just do the basics for now. (From meta-ibm rev: f86820a1b7fb22606ee4de8486b21c3567e36332) Change-Id: Idfaac713628d1c21d04a129d4231e47b86343339 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- .../recipes-phosphor/flash/phosphor-software-manager_%.bbappend | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend index 61a99fd1a..61297c12c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/flash/phosphor-software-manager_%.bbappend @@ -1,12 +1,16 @@ BMC_RW_MTD_ibm-ac-server = "bmc" +BMC_RW_MTD_rainier = "bmc" BMC_RW_MTD_mihawk = "bmc" BMC_RO_MTD_ibm-ac-server = "alt-bmc+bmc" +BMC_RO_MTD_rainier = "bmc" BMC_RO_MTD_mihawk = "alt-bmc+bmc" BMC_KERNEL_MTD_ibm-ac-server = "bmc" +BMC_KERNEL_MTD_rainier = "bmc" BMC_KERNEL_MTD_mihawk = "bmc" # Enable signature verification PACKAGECONFIG_append_ibm-ac-server = " verify_signature" +PACKAGECONFIG_append_rainier = " verify_signature" PACKAGECONFIG_append_mihawk = " verify_signature" # Enable sync of persistent files to the alternate BMC chip -- cgit v1.2.3 From 31178805e8cbbd03f5a2322fbc280cbddea28737 Mon Sep 17 00:00:00 2001 From: Jim Wright Date: Mon, 14 Oct 2019 18:42:02 -0500 Subject: Fix Rainier power sequence build error The 'GPIOAnalysis' section of the power sequence YAML file is not optional. Add a dummy section to allow for successful builds. (From meta-ibm rev: 5af0bcc9a13ae14caa9d37095018393fef6d715b) Signed-off-by: Jim Wright Change-Id: I2e93739a31d3653f04efedff54a46f231537199b Signed-off-by: Brad Bishop --- .../power/power-sequencer/rainier/ucd90160.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml index d23ce58fb..e40e8dd7c 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/power-sequencer/rainier/ucd90160.yaml @@ -198,3 +198,13 @@ pinID: 83 poll: false analysis: none + GPIOAnalysis: + - type: none + path: "" + gpio_value: low + error_function: memGoodError + option_flags: none + GPIODefinitions: + - GPIODefinition: none + gpio: 0 + callout: "" -- cgit v1.2.3 From 2c735aa6770e7e3ebfa3b8db49ae7f0fb528a5ff Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Mon, 14 Oct 2019 14:16:40 -0500 Subject: ibm: wspoon-pfault-analysis: Use EXTRA_OEMESON As this repository now uses meson, the bitbake variable to pass in options to the build needs to change to the meson one. Tested: witherspoon-tacoma now uses the correct UCD90160 YAML file instead of the default example one. (From meta-ibm rev: 6017c7fa7084eeae49c67f44dd045835f224d070) Signed-off-by: Matt Spinler Change-Id: I5eef042e20759a52376cadc0810e357552307890 Signed-off-by: Brad Bishop --- .../recipes-phosphor/power/witherspoon-pfault-analysis_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb index 0645eb7a7..62bfbcec4 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb @@ -21,7 +21,7 @@ DEPENDS += " \ power-sequencer \ " -EXTRA_OECONF = "UCD90160_DEF_YAML_FILE=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" +EXTRA_OEMESON += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" CHASSIS_ON_TGT = "obmc-chassis-poweron@0.target" SEQ_MONITOR_SVC = "pseq-monitor.service" -- cgit v1.2.3 From ea39f1724b157cb7d9fe1c978f9ad3f707938151 Mon Sep 17 00:00:00 2001 From: Joel Stanley Date: Fri, 4 Oct 2019 17:53:49 +0930 Subject: witherspoon: ncsi: Run unit once networking is up This unit does not depend on any openbmc related network daemons running. It only needs the network interface to be present, which it is once userspace starts. Drop the Wants/After on xyz.openbmc_project.Network.service and instead depend only on systemd's network.service. (From meta-ibm rev: 305adec9542e2adda0859ecf19a2f794979000c0) Signed-off-by: Joel Stanley Change-Id: I37fb90eb42da79f937348212a391e44b7f9f5b17 Signed-off-by: Brad Bishop --- .../recipes-phosphor/network/network/ncsi-netlink.service | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service b/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service index 44b34195e..890551e7a 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/network/network/ncsi-netlink.service @@ -1,7 +1,6 @@ [Unit] Description=Stop the ethernet link failover -Wants=xyz.openbmc_project.Network.service -After=xyz.openbmc_project.Network.service +After=network.service [Service] Restart=no -- cgit v1.2.3 From a4a7cb2ac0600d1e6266d782fdcb9495bb58a24b Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Wed, 16 Oct 2019 10:43:11 -0500 Subject: rainier: Enable the OpenPower PEL logging plugin This enables Platform Event Log handling in phosphor-log-manager. (From meta-ibm rev: 56f42aeb06f3af4ede874f81a1102ccc3ab64bc0) Signed-off-by: Matt Spinler Change-Id: I65cbda241510919917381c9c084370561713266f Signed-off-by: Brad Bishop --- .../recipes-phosphor/logging/phosphor-logging_%.bbappend | 1 + 1 file changed, 1 insertion(+) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend index 5e2dc6c20..9dff37d10 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/logging/phosphor-logging_%.bbappend @@ -1 +1,2 @@ PACKAGECONFIG_append_witherspoon-128 = " openpower-pels" +PACKAGECONFIG_append_rainier = " openpower-pels" -- cgit v1.2.3 From 3d464553f3b86d949e928177a03dcbdbe66bba57 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 4 Oct 2019 14:50:40 -0500 Subject: rainier: add in basic features to rainier image This is just setting a base, other features can be added as they become needed and/or available (From meta-ibm rev: 42598f80dfa5086b5d0999a171399c87732a8d45) Change-Id: I9e1b745f4b23beb049280935c038431addb36f91 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- .../recipes-phosphor/images/obmc-phosphor-image.bbappend | 1 + 1 file changed, 1 insertion(+) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend index c66cc4efc..562679222 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/images/obmc-phosphor-image.bbappend @@ -1,2 +1,3 @@ OBMC_IMAGE_EXTRA_INSTALL_append_ibm-ac-server = " mboxd max31785-msl phosphor-msl-verify liberation-fonts uart-render-controller first-boot-set-mac first-boot-set-hostname" +OBMC_IMAGE_EXTRA_INSTALL_append_rainier = " mboxd" OBMC_IMAGE_EXTRA_INSTALL_append_mihawk = " mboxd liberation-fonts uart-render-controller first-boot-set-mac" -- cgit v1.2.3 From e345a46ed3881281abd692b9490d31e83cda7e5b Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 4 Oct 2019 14:56:58 -0500 Subject: rainier: inventory and misc rdepends Just pulling in a subset of what is needed and works for rainier right now (From meta-ibm rev: a50c56d4883967a56a7713816cdd2f220fbb7aec) Change-Id: Ib5995a084b7ba5414be43e4d64254ebb4526093f Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- .../recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index c75c7d0f9..215e03291 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,7 +1,9 @@ RDEPENDS_${PN}-inventory_append_ibm-ac-server = " openpower-fru-vpd openpower-occ-control phosphor-cooling-type virtual/obmc-gpio-presence" +RDEPENDS_${PN}-inventory_append_rainier = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence" RDEPENDS_${PN}-inventory_append_mihawk = " openpower-fru-vpd openpower-occ-control virtual/obmc-gpio-presence id-button phosphor-cooling-type" RDEPENDS_${PN}-fan-control_append_ibm-ac-server = " witherspoon-fan-watchdog" RDEPENDS_${PN}-extras_append_ibm-ac-server = " witherspoon-pfault-analysis witherspoon-power-supply-sync phosphor-webui" +RDEPENDS_${PN}-extras_append_rainier = " phosphor-webui" RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing" RDEPENDS_${PN}-extras_remove_rainier = "obmc-ikvm liberation-fonts uart-render-controller" RDEPENDS_${PN}-extras_remove_witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller" -- cgit v1.2.3 From 8efc5edfdd3dcec6f28742f2186a380221dac650 Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Wed, 9 Oct 2019 09:45:17 -0500 Subject: wspoon: Additional thermal modes Add the additional thermal modes needed to handle adjusting the fan floor speeds necessary to support some hot pci cards. (From meta-ibm rev: 149bc55f4f7a9dbe035c5868aa5fd738e5837a9f) Change-Id: I3a0de84558381d68fb2c4feafa246d03a2ca9ecb Signed-off-by: Matthew Barth Signed-off-by: Brad Bishop --- .../witherspoon/zones.yaml | 41 ++++++++++++++++++---- 1 file changed, 34 insertions(+), 7 deletions(-) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml index d31b30445..63303d7c0 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-zone-config/witherspoon/zones.yaml @@ -28,9 +28,19 @@ zone_configuration: - value: CUSTOM description: > Custom thermal control mode for handling the use of - optical cables located behind the GPU exhaust that - could produce overtemp warnings without this mode - enabled. + PCI cards located behind the GPU exhaust that + could overtemp where the default mode is not + sufficient enough. + - value: HEAVY_IO + description: > + Heavy IO thermal control mode for handling the use + of PCI cards that produce heavy IO utilization and + could overtemp. + - value: MAX_BASE_FAN_FLOOR + description: > + Maximum base fan floor mode is for handling the + use of any hardware that requires the highest + amount of cooling even when the system may be idle. - name: Current type: string persist: true @@ -63,11 +73,28 @@ zone_configuration: - value: DEFAULT description: > Default thermal control mode + - value: CUSTOM + description: > + Custom thermal control mode for handling the use of + PCI cards located behind the GPU exhaust that + could overtemp where the default mode is not + sufficient enough. + - value: HEAVY_IO + description: > + Heavy IO thermal control mode for handling the use + of PCI cards that produce heavy IO utilization and + could overtemp. + - value: MAX_BASE_FAN_FLOOR + description: > + Maximum base fan floor mode is for handling the + use of any hardware that requires the highest + amount of cooling even when the system may be idle. - name: Current type: string persist: true values: - - value: DEFAULT - description: > - Set current thermal control mode to the - default. No other modes are supported. + - value: DEFAULT + description: > + Set current thermal control mode to the + default which will be replaced on startup if + another selected mode was persisted. -- cgit v1.2.3 From f3b54df0bb4a9cd9148d2deaec2e3d927724a9ad Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 14 Oct 2019 14:00:23 +0000 Subject: phosphor-power: srcrev bump b3853e2d3a..7dc31bb1f7 Add nlohmann-json dependency to fix build failure. George Liu (1): Add an example JSON file based on power-supply Lei YU (1): Add loadJSONFromFile() in utility (From meta-ibm rev: 78be06623cc1da4d36d9dbaf47323596d5389bf4) Change-Id: I7c37738ed6638920c290548c2f3a3caaa1bdefb0 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- .../recipes-phosphor/power/witherspoon-pfault-analysis.inc | 2 +- .../recipes-phosphor/power/witherspoon-pfault-analysis_git.bb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc index 0612d62af..668d837f5 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "b3853e2d3ac295a961e08927d177b40ddd683914" +SRCREV = "7dc31bb1f711927e80b900e256f8d413b2e71331" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb index 62bfbcec4..49fe344dc 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis_git.bb @@ -19,6 +19,7 @@ DEPENDS += " \ sdbus++-native \ sdeventplus \ power-sequencer \ + nlohmann-json \ " EXTRA_OEMESON += "-Ducd90160-yaml=${STAGING_DIR_HOST}${datadir}/power-sequencer/ucd90160.yaml" -- cgit v1.2.3 From 87d92e586e31844e6a3745b0c84f02f2a99809b4 Mon Sep 17 00:00:00 2001 From: Santosh Puranik Date: Fri, 11 Oct 2019 12:54:52 -0500 Subject: Extra argument to IPMI parsers This commit adds an option to the invocation of IPMI MRW parsers within the IBM layer to allow them to parse an incomplete MRW. The extra option is only enabled for the Rainier machine. Tested: I updated rainier.conf to point to the in progress Rainier MRW and made sure that with the new option in the recipe, the IPMI parsers no longer complained about a broken MRW. (From meta-ibm rev: 7c056f4b459fa67dc911b40e14055b86dbf1ef46) Signed-off-by: Santosh Puranik Change-Id: I4482a09c93ab727b7330946f61e52a8ec92753fc Signed-off-by: Brad Bishop --- meta-ibm/meta-witherspoon/conf/machine/rainier.conf | 1 + .../recipes-phosphor/configuration/acx22-yaml-config.bb | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf index 03f2623ef..628a45a22 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/rainier.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/rainier.conf @@ -21,3 +21,4 @@ PREFERRED_PROVIDER_virtual/phosphor-fan-presence-config_df-mrw = \ "phosphor-fan-presence-config" FLASH_SIZE = "131072" +SKIP_BROKEN_MRW = "1" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb index 5371c3a09..5ec7d4565 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/configuration/acx22-yaml-config.bb @@ -50,18 +50,19 @@ do_install() { # generate extra-properties.yaml from the MRW for ipmi-fru-parser $perlbin $scriptpath/gen_fru_properties.pl -m $mrw \ -c $op_configpath/ipmi-fru-properties-mrw.yaml \ - -o extra-properties.yaml + -o extra-properties.yaml ${EXTRA_MRW_SCRIPT_ARGS} # generate fru-read.yaml from the MRW, for ipmid and ipmi-fru-parser $perlbin $scriptpath/gen_ipmi_fru.pl -i $mrw \ -m $op_configpath/ipmi-hostboot-fru-mrw.yaml \ - -o fru-read-partial.yaml + -o fru-read-partial.yaml ${EXTRA_MRW_SCRIPT_ARGS} cat fru-read-partial.yaml ${ACx22_IPMI_EXTRA_FRU_READ_YAMLS} \ > fru-read.yaml # generate inventory-sensors.yaml from the MRW, for ipmid $perlbin $scriptpath/gen_ipmi_sel.pl -i $mrw \ - -m acx22-ipmi-inventory-sensors.yaml -o inventory-sensors.yaml + -m acx22-ipmi-inventory-sensors.yaml -o inventory-sensors.yaml \ + ${EXTRA_MRW_SCRIPT_ARGS} # generate sensors.yaml from the MRW, for ipmid cat acx22-ipmi-sensors-mrw.yaml \ @@ -69,7 +70,7 @@ do_install() { $op_configpath/ipmi-occ-active-sensor-mrw.yaml \ > sensors-mrw.yaml $perlbin $scriptpath/gen_ipmi_sensor.pl -i $mrw -m sensors-mrw.yaml \ - -o sensors-partial.yaml + -o sensors-partial.yaml ${EXTRA_MRW_SCRIPT_ARGS} cat sensors-partial.yaml ${ACx22_IPMI_EXTRA_SENSOR_YAMLS} \ > sensors.yaml -- cgit v1.2.3 From a35ae04877bf24f29fcbbdaf4330234fd4f34d82 Mon Sep 17 00:00:00 2001 From: Matt Spinler Date: Wed, 16 Oct 2019 11:08:59 -0500 Subject: rainier: Remove ibm-logging This application provided enhancements to OpenBMC's event logs such as an event description and persistent D-Bus objects for callout SN/PN information. This functionality is now implemented by the PEL logging handler on Rainier. (From meta-ibm rev: c4148c88406333e287afe46ec77f7bf5ecc81e59) Signed-off-by: Matt Spinler Change-Id: I21bd06f1a4c04c527baf13aae4d845db6922780c Signed-off-by: Brad Bishop --- .../recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index 215e03291..005dd0c66 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -7,5 +7,5 @@ RDEPENDS_${PN}-extras_append_rainier = " phosphor-webui" RDEPENDS_${PN}-extras_append_mihawk = " phosphor-webui phosphor-image-signing" RDEPENDS_${PN}-extras_remove_rainier = "obmc-ikvm liberation-fonts uart-render-controller" RDEPENDS_${PN}-extras_remove_witherspoon-tacoma = "obmc-ikvm liberation-fonts uart-render-controller" - +RDEPENDS_${PN}-logging_remove_rainier = "ibm-logging" ${PN}-software-extras_append_ibm-ac-server = " phosphor-software-manager-sync" -- cgit v1.2.3 From d91f88c936e1c3b9d4f318f8a46de577542116f4 Mon Sep 17 00:00:00 2001 From: Ben_Pai Date: Fri, 4 Oct 2019 18:58:30 +0800 Subject: meta-ibm: Add mihawk ipmi configs 1. Add dcmi config 2. Add channel config : mihawk has 2 ethernet interfaces Tested: 1. Verify ipmitool dcmi commands work ok on mihawk 2. Ran command : ipmitool lan print (From meta-ibm rev: 1568817763fe9edc5ef62239ab97875fa40bc5b5) Signed-off-by: Ben Pai Change-Id: I28854535aacb6938296eda3efa1480498b899e6d Signed-off-by: Brad Bishop --- .../mihawk/channel_config.json | 178 +++++++++++++++++++++ .../phosphor-ipmi-config/mihawk/dcmi_sensors.json | 59 +++++++ .../phosphor-ipmi-config/mihawk/power_reading.json | 3 + 3 files changed, 240 insertions(+) create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/channel_config.json create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/power_reading.json (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/channel_config.json b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/channel_config.json new file mode 100644 index 000000000..7f26c247e --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/channel_config.json @@ -0,0 +1,178 @@ +{ + "0" : { + "name" : "IPMB", + "is_valid" : true, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "ipmb", + "protocol_type" : "ipmb-1.0", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "1" : { + "name" : "eth0", + "is_valid" : true, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "lan-802.3", + "protocol_type" : "ipmb-1.0", + "session_supported" : "multi-session", + "is_ipmi" : true + } + }, + "2" : { + "name" : "eth1", + "is_valid" : true, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "lan-802.3", + "protocol_type" : "ipmb-1.0", + "session_supported" : "multi-session", + "is_ipmi" : true + } + }, + "3" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "4" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "5" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "6" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "7" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "8" : { + "name" : "INTRABMC", + "is_valid" : true, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "oem", + "protocol_type" : "oem", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "9" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "10" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "11" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "12" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "13" : { + "name" : "RESERVED", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "reserved", + "protocol_type" : "na", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "14" : { + "name" : "SELF", + "is_valid" : false, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "ipmb", + "protocol_type" : "ipmb-1.0", + "session_supported" : "session-less", + "is_ipmi" : true + } + }, + "15" : { + "name" : "SMS", + "is_valid" : true, + "active_sessions" : 0, + "channel_info" : { + "medium_type" : "system-interface", + "protocol_type" : "kcs", + "session_supported" : "session-less", + "is_ipmi" : true + } + } +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json new file mode 100644 index 000000000..cd72656e2 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/dcmi_sensors.json @@ -0,0 +1,59 @@ +{ + "inlet": [ + {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/ambient_temp", "record_id": 255} + ], + "baseboard": [ + {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_pcie_temp", "record_id": 253} + {"instance": 2, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_pcie_temp", "record_id": 254} + ], + "cpu": [ + {"instance": 1, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core0_temp", "record_id": 17}, + {"instance": 2, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core1_temp", "record_id": 20}, + {"instance": 3, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core2_temp", "record_id": 23}, + {"instance": 4, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core3_temp", "record_id": 26}, + {"instance": 5, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core4_temp", "record_id": 29}, + {"instance": 6, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core5_temp", "record_id": 32}, + {"instance": 7, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core6_temp", "record_id": 35}, + {"instance": 8, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core7_temp", "record_id": 38}, + {"instance": 9, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core8_temp", "record_id": 41}, + {"instance": 10, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core9_temp", "record_id": 44}, + {"instance": 11, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core10_temp", "record_id": 47}, + {"instance": 12, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core11_temp", "record_id": 50}, + {"instance": 13, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core12_temp", "record_id": 53}, + {"instance": 14, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core13_temp", "record_id": 56}, + {"instance": 15, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core14_temp", "record_id": 59}, + {"instance": 16, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core15_temp", "record_id": 62}, + {"instance": 17, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core16_temp", "record_id": 65}, + {"instance": 18, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core17_temp", "record_id": 68}, + {"instance": 19, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core18_temp", "record_id": 71}, + {"instance": 20, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core19_temp", "record_id": 74}, + {"instance": 21, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core20_temp", "record_id": 77}, + {"instance": 22, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core21_temp", "record_id": 80}, + {"instance": 23, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core22_temp", "record_id": 83}, + {"instance": 24, "dbus": "/xyz/openbmc_project/sensors/temperature/p0_core23_temp", "record_id": 86}, + {"instance": 25, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core0_temp", "record_id": 91}, + {"instance": 26, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core1_temp", "record_id": 94}, + {"instance": 27, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core2_temp", "record_id": 97}, + {"instance": 28, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core3_temp", "record_id": 100}, + {"instance": 29, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core4_temp", "record_id": 103}, + {"instance": 30, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core5_temp", "record_id": 106}, + {"instance": 31, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core6_temp", "record_id": 109}, + {"instance": 32, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core7_temp", "record_id": 112}, + {"instance": 33, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core8_temp", "record_id": 115}, + {"instance": 34, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core9_temp", "record_id": 118}, + {"instance": 35, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core10_temp", "record_id": 121}, + {"instance": 36, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core11_temp", "record_id": 124}, + {"instance": 37, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core12_temp", "record_id": 127}, + {"instance": 38, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core13_temp", "record_id": 130}, + {"instance": 39, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core14_temp", "record_id": 133}, + {"instance": 40, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core15_temp", "record_id": 136}, + {"instance": 41, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core16_temp", "record_id": 139}, + {"instance": 42, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core17_temp", "record_id": 142}, + {"instance": 43, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core18_temp", "record_id": 145}, + {"instance": 44, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core19_temp", "record_id": 148}, + {"instance": 45, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core20_temp", "record_id": 151}, + {"instance": 46, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core21_temp", "record_id": 154}, + {"instance": 47, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core22_temp", "record_id": 157}, + {"instance": 48, "dbus": "/xyz/openbmc_project/sensors/temperature/p1_core23_temp", "record_id": 160} + ] +} diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/power_reading.json b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/power_reading.json new file mode 100644 index 000000000..97e8f32b5 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/ipmi/phosphor-ipmi-config/mihawk/power_reading.json @@ -0,0 +1,3 @@ +{ + "path": "/xyz/openbmc_project/sensors/power/total_power" +} -- cgit v1.2.3 From 0fd1d9eba0e8a97ac80d316f7dd101682495bcf6 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Thu, 17 Oct 2019 12:00:23 +0000 Subject: phosphor-power: srcrev bump 7dc31bb1f7..f94b1133a8 George Liu (1): Update to get PSU Asset information from parsing JSON file Lei YU (2): Refactor: rename namespace witherspoon to phosphor Refactor: move get pmbus access type to utility Shawn McCarney (9): Add Shawn McCarney as a maintainer Initial documentation for regulator config files Document hardware objects in regulator config file Document operations in regulator config file Document rule and action in regulator config file Document I2C actions in regulator config file Document PMBus actions in regulator config file Document logic actions in regulator config file Document utility actions in regulator config file (From meta-ibm rev: b360259adc3a494162b52ab01be5601ad622d750) Change-Id: Ic96cd6513930a6031fe6baa293ade1a9154c0e80 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- .../recipes-phosphor/power/witherspoon-pfault-analysis.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc index 668d837f5..2c577a9da 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "7dc31bb1f711927e80b900e256f8d413b2e71331" +SRCREV = "f94b1133a81bbe9df5bb06d91afa82966f3d9efa" -- cgit v1.2.3 From 87ad221ffb3753e69264f664dcfc4f8a2e3d9081 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Sat, 19 Oct 2019 17:20:23 +0000 Subject: phosphor-power: srcrev bump f94b1133a8..bd4b86d398 Lei YU (2): Move services into repo Update MAINTAINERS (From meta-ibm rev: 3ef4cbbfb136130da1858221f8ba4808568949cf) Change-Id: Iecc77b4a2f2f06214d082b74d075afe8f9e9ccb7 Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- .../recipes-phosphor/power/witherspoon-pfault-analysis.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc index 2c577a9da..c3ef3e460 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/power/witherspoon-pfault-analysis.inc @@ -2,4 +2,4 @@ HOMEPAGE = "https://github.com/openbmc/phosphor-power" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" SRC_URI += "git://github.com/openbmc/phosphor-power" -SRCREV = "f94b1133a81bbe9df5bb06d91afa82966f3d9efa" +SRCREV = "bd4b86d3982cd5592e0417a5e45be6d3083f4c81" -- cgit v1.2.3 From f27b23b1fce8504b9e6e936681889bf09ddcf60d Mon Sep 17 00:00:00 2001 From: Ben_Pai Date: Wed, 9 Oct 2019 18:52:34 +0800 Subject: meta-ibm: Add the ncsi-netlink service for mihawk Prevent the BMC from failing over to the other ethernet port if it detects a network drop on the one it's using. (From meta-ibm rev: 4c3ea265721c4a1152ae75711af68c6caa29a772) Signed-off-by: Ben Pai Signed-off-by: Brad Bishop Change-Id: Id7f3a939e967e661937098a2ea95fdb79e973862 Signed-off-by: Brad Bishop --- .../recipes-phosphor/network/phosphor-network_%.bbappend | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend index ba6e393bb..bcb2d0136 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/network/phosphor-network_%.bbappend @@ -1,8 +1,15 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/network:" SRC_URI_append_ibm-ac-server = " file://ncsi-netlink.service" +SRC_URI_append_mihawk = " file://ncsi-netlink.service" + SYSTEMD_SERVICE_${PN}_append_ibm-ac-server = " ncsi-netlink.service" +SYSTEMD_SERVICE_${PN}_append_mihawk = " ncsi-netlink.service" do_install_append_ibm-ac-server() { install -d ${D}${systemd_system_unitdir} install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir} } +do_install_append_mihawk() { + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${WORKDIR}/ncsi-netlink.service ${D}${systemd_system_unitdir} +} -- cgit v1.2.3 From ff3836160e7bdac9fa25b2db443cff9b8ec0d39d Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 21 Oct 2019 13:18:08 -0500 Subject: rainier: make 64MB the pnor size Tested: Verified mboxd started on rainier with 64M option (From meta-ibm rev: 6116cd573167826b2080b32842a50251de1896ee) Change-Id: I6ec47d582aa87afdc1155e87213670e54174c01b Signed-off-by: Andrew Geissler Signed-off-by: Brad Bishop --- meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend | 1 + 1 file changed, 1 insertion(+) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend index 9ead95927..e23d8fa45 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/mboxd/mboxd_%.bbappend @@ -1,5 +1,6 @@ MBOXD_FLASH_SIZE_ibm-ac-server = "64M" MBOXD_FLASH_SIZE_mihawk = "64M" +MBOXD_FLASH_SIZE_rainier = "64M" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -- cgit v1.2.3 From 98712768a871c290c0874f0d5a8506bc621bd5d5 Mon Sep 17 00:00:00 2001 From: Adriana Kobylak Date: Mon, 29 Jul 2019 15:25:52 -0500 Subject: swift: Generate a mmc ext4 tar image file Swift has an emmc chip, add the directive to generate a tarball for it. (From meta-ibm rev: 42c34123c54d5ebe407fbd7b87cc5ae6c75624a5) Change-Id: I263399cba325131be2d72d9ae2d3015050317d8f Signed-off-by: Adriana Kobylak Signed-off-by: Brad Bishop --- meta-ibm/meta-witherspoon/conf/machine/swift.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/conf/machine/swift.conf b/meta-ibm/meta-witherspoon/conf/machine/swift.conf index 3915e2b98..4c0abb57d 100644 --- a/meta-ibm/meta-witherspoon/conf/machine/swift.conf +++ b/meta-ibm/meta-witherspoon/conf/machine/swift.conf @@ -1,6 +1,6 @@ require conf/machine/witherspoon.conf -IMAGE_FSTYPES += "ext4" +IMAGE_FSTYPES += "ext4 mmc-ext4-tar" KERNEL_DEVICETREE = "${KMACHINE}-bmc-opp-${MACHINE}.dtb" -- cgit v1.2.3 From 2795589128d1f7509ac0ab9eba940d868413ac7d Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Wed, 9 Oct 2019 09:46:26 -0500 Subject: wspoon: Enable fan floor adjustments based on mode Add actions to adjust the fan floor speed table used based on the thermal mode of the system. In addition to adjusting the fan floor speed table, in some modes the default fan floor required adjustment as well. These fan floor speed values and the corresponding default fan floor speed per mode were provided by the thermal characterization team. Tested: Generated code from these events (From meta-ibm rev: 0c6a7b5a5aadcbabd7bf5d25cd102fd228e26f42) Change-Id: Ic2bfca05979cb41489fcf123f1779d2d5f089e7c Signed-off-by: Matthew Barth Signed-off-by: Brad Bishop --- .../witherspoon/events.yaml | 353 +++++++++++++-------- 1 file changed, 229 insertions(+), 124 deletions(-) (limited to 'meta-ibm') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml index 5534cb6cd..c1902d02b 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/fans/phosphor-fan-control-events-config/witherspoon/events.yaml @@ -297,6 +297,19 @@ actions: - property - defevents - altevents + - name: update_default_floor + description: > + Update the default fan floor to the given speed + parameters: + - property + - speed + - name: use_events_on_state + description: > + Use a set of events when all the group properties are at a given + state, otherwise remove the events + parameters: + - property + - events events: - name: default_fan_floor_on_service_fail @@ -358,6 +371,222 @@ events: speed: value: 10500 type: uint64_t + - name: set_speed_boundaries_based_on_ambient + groups: + - name: zone0_control_mode + interface: xyz.openbmc_project.Control.ThermalMode + property: + name: Current + type: std::string + triggers: + - name: init + method: getProperties + handler: setProperty + - name: signal + signal: propertiesChanged + handler: setProperty + actions: + - name: update_default_floor + property: + value: DEFAULT + type: std::string + speed: + value: 8000 + type: uint64_t + - name: update_default_floor + property: + value: CUSTOM + type: std::string + speed: + value: 8000 + type: uint64_t + - name: update_default_floor + property: + value: HEAVY_IO + type: std::string + speed: + value: 10500 + type: uint64_t + - name: update_default_floor + property: + value: MAX_BASE_FAN_FLOOR + type: std::string + speed: + value: 10500 + type: uint64_t + - name: use_events_on_state + property: + value: DEFAULT + type: std::string + events: + - name: default_fan_speed_boundaries + groups: + - name: zone0_ambient + zone_conditions: + - name: air_cooled_chassis + zones: + - 0 + 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_floor_from_average_sensor_value + map: + value: + - 27000: 3500 + - 32000: 4600 + - 37000: 5200 + - 40000: 5800 + type: std::map + - name: set_ceiling_from_average_sensor_value + map: + value: + - 25000: 7200 + - 27000: 10500 + type: std::map + - name: default_fan_speed_boundaries + groups: + - name: zone0_ambient + zone_conditions: + - name: water_and_air_cooled_chassis + zones: + - 0 + 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_floor_from_average_sensor_value + map: + value: + - 27000: 3000 + - 32000: 4300 + - 37000: 5000 + - 40000: 5800 + type: std::map + - name: set_ceiling_from_average_sensor_value + map: + value: + - 25000: 7200 + - 27000: 10500 + type: std::map + - name: use_events_on_state + property: + value: CUSTOM + type: std::string + events: + - name: custom_fan_speed_boundaries + groups: + - name: zone0_ambient + 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_floor_from_average_sensor_value + map: + value: + - 27000: 4600 + - 32000: 5000 + - 37000: 5400 + - 40000: 5800 + type: std::map + - name: set_ceiling_from_average_sensor_value + map: + value: + - 25000: 7200 + - 27000: 10500 + type: std::map + - name: use_events_on_state + property: + value: HEAVY_IO + type: std::string + events: + - name: heavy_io_fan_speed_boundaries + groups: + - name: zone0_ambient + 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_floor_from_average_sensor_value + map: + value: + - 27000: 5900 + - 32000: 6800 + - 37000: 7500 + - 40000: 8200 + type: std::map + - name: set_ceiling_from_average_sensor_value + map: + value: + - 25000: 7200 + - 27000: 10500 + type: std::map + - name: use_events_on_state + property: + value: MAX_BASE_FAN_FLOOR + type: std::string + events: + - name: max_base_fan_floor_fan_speed_boundaries + groups: + - name: zone0_ambient + 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_floor_from_average_sensor_value + map: + value: + - 27000: 7200 + - 32000: 8800 + - 37000: 9600 + - 40000: 10500 + type: std::map + - name: set_ceiling_from_average_sensor_value + map: + value: + - 25000: 7200 + - 27000: 10500 + type: std::map - name: full_speed_at_power_on precondition: name: property_states_match @@ -448,130 +677,6 @@ events: speed: value: 10500 type: uint64_t - - name: set_air_cooled_speed_boundaries_based_on_ambient - groups: - - name: zone0_control_mode - zone_conditions: - - name: air_cooled_chassis - zones: - - 0 - interface: xyz.openbmc_project.Control.ThermalMode - property: - name: Current - type: std::string - triggers: - - name: init - method: getProperties - handler: setProperty - - name: signal - signal: propertiesChanged - handler: setProperty - actions: - - name: use_alternate_events_on_state - property: - value: CUSTOM - type: std::string - defevents: - - name: default_floor_boundary - groups: - - name: zone0_ambient - zone_conditions: - - name: air_cooled_chassis - zones: - - 0 - 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_floor_from_average_sensor_value - map: - value: - - 27000: 3500 - - 32000: 4600 - - 37000: 5200 - - 40000: 5800 - type: std::map - - name: set_ceiling_from_average_sensor_value - map: - value: - - 25000: 7200 - - 27000: 10500 - type: std::map - altevents: - - name: alternate_floor_boundary - groups: - - name: zone0_ambient - zone_conditions: - - name: air_cooled_chassis - zones: - - 0 - 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_floor_from_average_sensor_value - map: - value: - - 27000: 4600 - - 32000: 5000 - - 37000: 5400 - - 40000: 5800 - type: std::map - - name: set_ceiling_from_average_sensor_value - map: - value: - - 25000: 7200 - - 27000: 10500 - type: std::map - - name: set_water_cooled_speed_boundaries_based_on_ambient - groups: - - name: zone0_ambient - zone_conditions: - - name: water_and_air_cooled_chassis - zones: - - 0 - 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_floor_from_average_sensor_value - map: - value: - - 27000: 3000 - - 32000: 4300 - - 37000: 5000 - - 40000: 5800 - type: std::map - - name: set_ceiling_from_average_sensor_value - map: - value: - - 25000: 7200 - - 27000: 10500 - type: std::map - name: occ_active_speed_changes precondition: name: property_states_match -- cgit v1.2.3