From 89ad2543e8345f702c22bba6e2f162aa4aa5ada9 Mon Sep 17 00:00:00 2001 From: Raptor Engineering Development Team Date: Sun, 22 Mar 2020 15:05:34 -0500 Subject: [PATCH] Remove OCC sensors that can never be present on Blackbird This includes sensors on: * 6 DIMM slots * The second CPU socket This relates to Bug #1 --- .../sbefifo1-dev0/occ-hwmon.1.conf | 38 ------ .../sbefifo2-dev0/occ-hwmon.2.conf | 123 ------------------ 2 files changed, 161 deletions(-) delete mode 100644 meta-rcs/meta-blackbird/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf diff --git a/meta-rcs/meta-blackbird/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-rcs/meta-blackbird/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf index 24c349c08..bee641b25 100644 --- a/meta-rcs/meta-blackbird/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf +++ b/meta-rcs/meta-blackbird/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf @@ -25,11 +25,7 @@ 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_freq1 = "label" MODE_freq2 = "label" MODE_freq3 = "label" @@ -57,11 +53,7 @@ MODE_freq24 = "label" MODE_freq25 = "label" MODE_freq26 = "label" MODE_freq27 = "label" -MODE_freq28 = "label" -MODE_freq29 = "label" -MODE_freq30 = "label" MODE_freq31 = "label" -MODE_freq32 = "label" LABEL_temp91 = "p0_core0_temp" LABEL_temp92 = "p0_core1_temp" LABEL_temp93 = "p0_core2_temp" @@ -88,13 +80,7 @@ LABEL_temp113 = "p0_core22_temp" LABEL_temp114 = "p0_core23_temp" LABEL_temp255 = "p0_vdd_temp" LABEL_temp27 = "dimm0_temp" -LABEL_temp28 = "dimm1_temp" -LABEL_temp29 = "dimm2_temp" -LABEL_temp30 = "dimm3_temp" LABEL_temp31 = "dimm4_temp" -LABEL_temp32 = "dimm5_temp" -LABEL_temp33 = "dimm6_temp" -LABEL_temp34 = "dimm7_temp" LABEL_freq91 = "p0_core0_freq" LABEL_freq92 = "p0_core1_freq" LABEL_freq93 = "p0_core2_freq" @@ -123,13 +109,7 @@ LABEL_power2 = "p0_power" LABEL_power3 = "p0_vdd_power" LABEL_power4 = "p0_vdn_power" WARNLO_temp27 = "0" -WARNLO_temp28 = "0" -WARNLO_temp29 = "0" -WARNLO_temp30 = "0" WARNLO_temp31 = "0" -WARNLO_temp32 = "0" -WARNLO_temp33 = "0" -WARNLO_temp34 = "0" WARNLO_temp91 = "0" WARNLO_temp92 = "0" WARNLO_temp93 = "0" @@ -159,13 +139,7 @@ WARNLO_power2 = "-1000000" WARNLO_power3 = "-1000000" WARNLO_power4 = "-1000000" CRITLO_temp27 = "-40000" -CRITLO_temp28 = "-40000" -CRITLO_temp29 = "-40000" -CRITLO_temp30 = "-40000" CRITLO_temp31 = "-40000" -CRITLO_temp32 = "-40000" -CRITLO_temp33 = "-40000" -CRITLO_temp34 = "-40000" CRITLO_temp91 = "-40000" CRITLO_temp92 = "-40000" CRITLO_temp93 = "-40000" @@ -195,13 +169,7 @@ CRITLO_power2 = "-1000000" CRITLO_power3 = "-1000000" CRITLO_power4 = "-1000000" WARNHI_temp27 = "60000" -WARNHI_temp28 = "60000" -WARNHI_temp29 = "60000" -WARNHI_temp30 = "60000" WARNHI_temp31 = "60000" -WARNHI_temp32 = "60000" -WARNHI_temp33 = "60000" -WARNHI_temp34 = "60000" WARNHI_temp91 = "78000" WARNHI_temp92 = "78000" WARNHI_temp93 = "78000" @@ -231,13 +199,7 @@ WARNHI_power2 = "190000000" WARNHI_power3 = "180000000" WARNHI_power4 = "40000000" CRITHI_temp27 = "85000" -CRITHI_temp28 = "85000" -CRITHI_temp29 = "85000" -CRITHI_temp30 = "85000" CRITHI_temp31 = "85000" -CRITHI_temp32 = "85000" -CRITHI_temp33 = "85000" -CRITHI_temp34 = "85000" CRITHI_temp91 = "90000" CRITHI_temp92 = "90000" CRITHI_temp93 = "90000" diff --git a/meta-rcs/meta-blackbird/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf b/meta-rcs/meta-blackbird/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf deleted file mode 100644 index d90820d8c..000000000 --- a/meta-rcs/meta-blackbird/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/devices/platform/gpio-fsi/fsi0/slave@00--00/00--00--00--0a/fsi1/slave@01--00/01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf +++ /dev/null @@ -1,123 +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_freq1 = "label" -MODE_freq2 = "label" -MODE_freq3 = "label" -MODE_freq4 = "label" -MODE_freq5 = "label" -MODE_freq6 = "label" -MODE_freq7 = "label" -MODE_freq8 = "label" -MODE_freq9 = "label" -MODE_freq10 = "label" -MODE_freq11 = "label" -MODE_freq12 = "label" -MODE_freq13 = "label" -MODE_freq14 = "label" -MODE_freq15 = "label" -MODE_freq16 = "label" -MODE_freq17 = "label" -MODE_freq18 = "label" -MODE_freq19 = "label" -MODE_freq20 = "label" -MODE_freq21 = "label" -MODE_freq22 = "label" -MODE_freq23 = "label" -MODE_freq24 = "label" -MODE_freq25 = "label" -MODE_freq26 = "label" -MODE_freq27 = "label" -MODE_freq28 = "label" -MODE_freq29 = "label" -MODE_freq30 = "label" -MODE_freq31 = "label" -MODE_freq32 = "label" -LABEL_temp115 = "p1_core0_temp" -LABEL_temp116 = "p1_core1_temp" -LABEL_temp117 = "p1_core2_temp" -LABEL_temp118 = "p1_core3_temp" -LABEL_temp119 = "p1_core4_temp" -LABEL_temp120 = "p1_core5_temp" -LABEL_temp121 = "p1_core6_temp" -LABEL_temp122 = "p1_core7_temp" -LABEL_temp123 = "p1_core8_temp" -LABEL_temp124 = "p1_core9_temp" -LABEL_temp125 = "p1_core10_temp" -LABEL_temp126 = "p1_core11_temp" -LABEL_temp127 = "p1_core12_temp" -LABEL_temp128 = "p1_core13_temp" -LABEL_temp129 = "p1_core14_temp" -LABEL_temp130 = "p1_core15_temp" -LABEL_temp131 = "p1_core16_temp" -LABEL_temp132 = "p1_core17_temp" -LABEL_temp133 = "p1_core18_temp" -LABEL_temp134 = "p1_core19_temp" -LABEL_temp135 = "p1_core20_temp" -LABEL_temp136 = "p1_core21_temp" -LABEL_temp137 = "p1_core22_temp" -LABEL_temp138 = "p1_core23_temp" -LABEL_temp35 = "dimm8_temp" -LABEL_temp36 = "dimm9_temp" -LABEL_temp37 = "dimm10_temp" -LABEL_temp38 = "dimm11_temp" -LABEL_temp39 = "dimm12_temp" -LABEL_temp40 = "dimm13_temp" -LABEL_temp41 = "dimm14_temp" -LABEL_temp42 = "dimm15_temp" -LABEL_freq115 = "p1_core0_freq" -LABEL_freq116 = "p1_core1_freq" -LABEL_freq117 = "p1_core2_freq" -LABEL_freq118 = "p1_core3_freq" -LABEL_freq119 = "p1_core4_freq" -LABEL_freq120 = "p1_core5_freq" -LABEL_freq121 = "p1_core6_freq" -LABEL_freq122 = "p1_core7_freq" -LABEL_freq123 = "p1_core8_freq" -LABEL_freq124 = "p1_core9_freq" -LABEL_freq125 = "p1_core10_freq" -LABEL_freq126 = "p1_core11_freq" -LABEL_freq127 = "p1_core12_freq" -LABEL_freq128 = "p1_core13_freq" -LABEL_freq129 = "p1_core14_freq" -LABEL_freq130 = "p1_core15_freq" -LABEL_freq131 = "p1_core16_freq" -LABEL_freq132 = "p1_core17_freq" -LABEL_freq133 = "p1_core18_freq" -LABEL_freq134 = "p1_core19_freq" -LABEL_freq135 = "p1_core20_freq" -LABEL_freq136 = "p1_core21_freq" -LABEL_freq137 = "p1_core22_freq" -LABEL_freq138 = "p1_core23_freq" -LABEL_power2 = "p1_power" -LABEL_power3 = "p1_vdd_power" -LABEL_power4 = "p1_vdn_power" -- 2.30.2