From 275b604ffd65b5c7622dc974067ab0cfc5b73c35 Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Fri, 31 May 2019 13:30:53 -0500 Subject: swift: Add tmp275 ambient sensor Swift has 3 ambient temperature sensors, the tmp275 will be labeled as `ambient0` and initially use the same warn/crit temperature configurations as Witherspoon. Tested: Built image that contained the config file (From meta-ibm rev: 51daebff52005f4cf40fa5a4bf8c5f779bb6c997) Change-Id: Iebb780c517a41ec64e5ad99ebf41c401faab90e9 Signed-off-by: Matthew Barth Signed-off-by: Brad Bishop --- .../swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf new file mode 100644 index 000000000..ef2b46d53 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/tmp275@48.conf @@ -0,0 +1,5 @@ +LABEL_temp1 = "ambient0" +WARNHI_temp1 = "25000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "35000" +CRITLO_temp1 = "0" -- cgit v1.2.3 From 797085a61036f546e29829f0738e8fa06f9c0c26 Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Fri, 31 May 2019 13:39:52 -0500 Subject: swift: Add dps310 ambient sensor Swift has 3 ambient temperature sensors, the dps310 will be labeled as `ambient1` and initially use the same warn/crit temperature configurations as Witherspoon. Tested: Built image that contained the config file (From meta-ibm rev: b86d99ad97152a5932f0e53a3a80a422e421437b) Change-Id: Ibd7a11b9203d6ec82b500874d6d38a3e762e4173 Signed-off-by: Matthew Barth Signed-off-by: Brad Bishop --- .../swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf | 5 +++++ .../recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 1 + 2 files changed, 6 insertions(+) create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf new file mode 100644 index 000000000..d685863f8 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/dps310@76.conf @@ -0,0 +1,5 @@ +LABEL_temp1 = "ambient1" +WARNHI_temp1 = "25000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "35000" +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 8ebf37eb0..c5d75a788 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -25,6 +25,7 @@ CHIPS_append_swift = " \ bus@1e78a000/i2c-bus@440/tmp275@4a \ bus@1e78a000/i2c-bus@440/tmp275@48 \ bus@1e78a000/i2c-bus@300/tmp275@48 \ + bus@1e78a000/i2c-bus@300/dps310@76 \ " ITEMSFMT = "ahb/apb/{0}.conf" -- cgit v1.2.3 From 6052e32ec45ff3f32ae2d96c4dfd89b1e7d5bb3c Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Fri, 31 May 2019 13:44:13 -0500 Subject: swift: Add si7021a20 ambient sensor Swift has 3 ambient temperature sensors, the si7021a20 will be labeled as `ambient2` and initially use the same warn/crit temperature configurations as Witherspoon. Tested: Built image that contained the config file (From meta-ibm rev: 44d15151813b30aeb9f93cf4afb2818be2ed0b70) Change-Id: Ie5e538d270ab27cd1ebd4979c79038c1b18bb1db Signed-off-by: Matthew Barth Signed-off-by: Brad Bishop --- .../obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf | 5 +++++ .../recipes-phosphor/sensors/phosphor-hwmon_%.bbappend | 1 + 2 files changed, 6 insertions(+) create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf new file mode 100644 index 000000000..c8a729067 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/si7021a20@20.conf @@ -0,0 +1,5 @@ +LABEL_temp1 = "ambient2" +WARNHI_temp1 = "25000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "35000" +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 c5d75a788..dfd992b60 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -26,6 +26,7 @@ CHIPS_append_swift = " \ bus@1e78a000/i2c-bus@440/tmp275@48 \ bus@1e78a000/i2c-bus@300/tmp275@48 \ bus@1e78a000/i2c-bus@300/dps310@76 \ + bus@1e78a000/i2c-bus@300/si7021a20@20 \ " ITEMSFMT = "ahb/apb/{0}.conf" -- cgit v1.2.3 From 466193732b3fe99986982f5ca444fb221d0b970d Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Fri, 31 May 2019 16:27:24 -0500 Subject: swift: Add CP0 ir35219 and ir35221 sensors On processor 0 in Swift, an IR35219 is used for the VDD vrm and IR35221s are used for the VDN & VCS vrms and VIO vrm.. Initially the same warn/crit configuration values as Witherspoon will be used. Tested: Built image that contained the config files (From meta-ibm rev: e21e2d20610744cfbf1d96345e0781ae3a47159d) Change-Id: I94b687e77f988442e9b6a7f5583608be01a793c8 Signed-off-by: Matthew Barth Signed-off-by: Brad Bishop --- .../apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf | 23 +++++++++++ .../apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf | 47 ++++++++++++++++++++++ .../apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf | 23 +++++++++++ .../sensors/phosphor-hwmon_%.bbappend | 3 ++ 4 files changed, 96 insertions(+) create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf new file mode 100644 index 000000000..7d2f2ef2a --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35219@70.conf @@ -0,0 +1,23 @@ +qLABEL_temp1 = "p0_vdd_temp" +WARNHI_temp1 = "80000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "85000" +CRITLO_temp1 = "0" + +LABEL_curr2 = "p0_vdd_current" +WARNLO_curr2 = "0" +CRITLO_curr2 = "0" +WARNHI_curr2 = "320000" +CRITHI_curr2 = "360000" + +LABEL_in2 = "p0_vdd_voltage" +WARNLO_in2 = "0" +CRITLO_in2 = "0" +WARNHI_in2 = "1150" +CRITHI_in2 = "1300" + +LABEL_power2 = "p0_vdd_power" +WARNLO_power2 = "0" +CRITLO_power2 = "0" +WARNHI_power2 = "270000000" +CRITHI_power2 = "290000000" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf new file mode 100644 index 000000000..ca7793722 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@71.conf @@ -0,0 +1,47 @@ +LABEL_temp1 = "p0_vdn_temp" +WARNHI_temp1 = "80000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "85000" +CRITLO_temp1 = "0" + +LABEL_curr2 = "p0_vdn_current" +WARNLO_curr2 = "0" +CRITLO_curr2 = "0" +WARNHI_curr2 = "80000" +CRITHI_curr2 = "110000" + +LABEL_in2 = "p0_vdn_voltage" +WARNLO_in2 = "0" +CRITLO_in2 = "0" +WARNHI_in2 = "1100" +CRITHI_in2 = "1300" + +LABEL_power2 = "p0_vdn_power" +WARNLO_power2 = "0" +CRITLO_power2 = "0" +WARNHI_power2 = "88000000" +CRITHI_power2 = "121000000" + +LABEL_temp2 = "p0_vcs_temp" +WARNHI_temp2 = "80000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "85000" +CRITLO_temp2 = "0" + +LABEL_curr3 = "p0_vcs_current" +WARNLO_curr3 = "0" +CRITLO_curr3 = "0" +WARNHI_curr3 = "20000" +CRITHI_curr3 = "25000" + +LABEL_in3 = "p0_vcs_voltage" +WARNLO_in3 = "0" +CRITLO_in3 = "0" +WARNHI_in3 = "1150" +CRITHI_in3 = "1300" + +LABEL_power3 = "p0_vcs_power" +WARNLO_power3 = "0" +CRITLO_power3 = "0" +WARNHI_power3 = "20000000" +CRITHI_power3 = "25000000" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf new file mode 100644 index 000000000..7b6b356a4 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@380/ir35221@72.conf @@ -0,0 +1,23 @@ +LABEL_temp1 = "p0_vio_temp" +WARNHI_temp1 = "80000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "85000" +CRITLO_temp1 = "0" + +LABEL_curr2 = "p0_vio_current" +WARNLO_curr2 = "0" +CRITLO_curr2 = "0" +WARNHI_curr2 = "80000" +CRITHI_curr2 = "110000" + +LABEL_in2 = "p0_vio_voltage" +WARNLO_in2 = "0" +CRITLO_in2 = "0" +WARNHI_in2 = "1100" +CRITHI_in2 = "1300" + +LABEL_power2 = "p0_vio_power" +WARNLO_power2 = "0" +CRITLO_power2 = "0" +WARNHI_power2 = "88000000" +CRITHI_power2 = "121000000" 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 dfd992b60..b54acff07 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -27,6 +27,9 @@ CHIPS_append_swift = " \ bus@1e78a000/i2c-bus@300/tmp275@48 \ bus@1e78a000/i2c-bus@300/dps310@76 \ bus@1e78a000/i2c-bus@300/si7021a20@20 \ + bus@1e78a000/i2c-bus@380/ir35219@70 \ + bus@1e78a000/i2c-bus@380/ir35221@71 \ + bus@1e78a000/i2c-bus@380/ir35221@72 \ " ITEMSFMT = "ahb/apb/{0}.conf" -- cgit v1.2.3 From 999ce88a6d235b4fad994b7668e0902ae274057a Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Fri, 31 May 2019 16:37:16 -0500 Subject: swift: Add CP1 ir35219 and ir35221 sensors On processor 1 in Swift, an IR35219 is used for the VDD vrm and IR35221s are used for the VDN & VCS vrms and VIO vrm. Initially the same warn/crit configuration values as Witherspoon will be used. Tested: Built image that contained the config files (From meta-ibm rev: a296aa3c0ad4278c060c66c4ca4c1ed5913cfe06) Change-Id: I961c12469c550d36ec03bc5f249fe46019d1c5d1 Signed-off-by: Matthew Barth Signed-off-by: Brad Bishop --- .../apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf | 23 +++++++++++ .../apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf | 47 ++++++++++++++++++++++ .../apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf | 23 +++++++++++ .../sensors/phosphor-hwmon_%.bbappend | 3 ++ 4 files changed, 96 insertions(+) create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf new file mode 100644 index 000000000..5e0c63d34 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35219@70.conf @@ -0,0 +1,23 @@ +LABEL_temp1 = "p1_vdd_temp" +WARNHI_temp1 = "80000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "85000" +CRITLO_temp1 = "0" + +LABEL_curr2 = "p1_vdd_current" +WARNLO_curr2 = "0" +CRITLO_curr2 = "0" +WARNHI_curr2 = "320000" +CRITHI_curr2 = "360000" + +LABEL_in2 = "p1_vdd_voltage" +WARNLO_in2 = "0" +CRITLO_in2 = "0" +WARNHI_in2 = "1150" +CRITHI_in2 = "1300" + +LABEL_power2 = "p1_vdd_power" +WARNLO_power2 = "0" +CRITLO_power2 = "0" +WARNHI_power2 = "270000000" +CRITHI_power2 = "290000000" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf new file mode 100644 index 000000000..836eef63b --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@71.conf @@ -0,0 +1,47 @@ +LABEL_temp1 = "p1_vdn_temp" +WARNHI_temp1 = "80000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "85000" +CRITLO_temp1 = "0" + +LABEL_curr2 = "p1_vdn_current" +WARNLO_curr2 = "0" +CRITLO_curr2 = "0" +WARNHI_curr2 = "80000" +CRITHI_curr2 = "110000" + +LABEL_in2 = "p1_vdn_voltage" +WARNLO_in2 = "0" +CRITLO_in2 = "0" +WARNHI_in2 = "1100" +CRITHI_in2 = "1300" + +LABEL_power2 = "p1_vdn_power" +WARNLO_power2 = "0" +CRITLO_power2 = "0" +WARNHI_power2 = "88000000" +CRITHI_power2 = "121000000" + +LABEL_temp2 = "p1_vcs_temp" +WARNHI_temp2 = "80000" +WARNLO_temp2 = "0" +CRITHI_temp2 = "85000" +CRITLO_temp2 = "0" + +LABEL_curr3 = "p1_vcs_current" +WARNLO_curr3 = "0" +CRITLO_curr3 = "0" +WARNHI_curr3 = "20000" +CRITHI_curr3 = "25000" + +LABEL_in3 = "p1_vcs_voltage" +WARNLO_in3 = "0" +CRITLO_in3 = "0" +WARNHI_in3 = "1150" +CRITHI_in3 = "1300" + +LABEL_power3 = "p1_vcs_power" +WARNLO_power3 = "0" +CRITLO_power3 = "0" +WARNHI_power3 = "20000000" +CRITHI_power3 = "25000000" diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf new file mode 100644 index 000000000..213f64845 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@3c0/ir35221@72.conf @@ -0,0 +1,23 @@ +LABEL_temp1 = "p1_vio_temp" +WARNHI_temp1 = "80000" +WARNLO_temp1 = "0" +CRITHI_temp1 = "85000" +CRITLO_temp1 = "0" + +LABEL_curr2 = "p1_vio_current" +WARNLO_curr2 = "0" +CRITLO_curr2 = "0" +WARNHI_curr2 = "80000" +CRITHI_curr2 = "110000" + +LABEL_in2 = "p1_vio_voltage" +WARNLO_in2 = "0" +CRITLO_in2 = "0" +WARNHI_in2 = "1100" +CRITHI_in2 = "1300" + +LABEL_power2 = "p1_vio_power" +WARNLO_power2 = "0" +CRITLO_power2 = "0" +WARNHI_power2 = "88000000" +CRITHI_power2 = "121000000" 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 b54acff07..0861025f6 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -30,6 +30,9 @@ CHIPS_append_swift = " \ bus@1e78a000/i2c-bus@380/ir35219@70 \ bus@1e78a000/i2c-bus@380/ir35221@71 \ bus@1e78a000/i2c-bus@380/ir35221@72 \ + bus@1e78a000/i2c-bus@3c0/ir35219@70 \ + bus@1e78a000/i2c-bus@3c0/ir35221@71 \ + bus@1e78a000/i2c-bus@3c0/ir35221@72 \ " ITEMSFMT = "ahb/apb/{0}.conf" -- cgit v1.2.3 From 2cec924fb3ea90c2c7dee314126ae87da1c1f57d Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Mon, 3 Jun 2019 15:56:24 -0500 Subject: swif: Add CP0/CP1 OCC sensors Create Swift's OCC sensors initially using the same thresholds as they were on Witherspoon. Swift has 12 dimms/proc with 2 temp sensors per dimm. Also there are 2 GPUs/proc. Tested: Built image that contained the config files (From meta-ibm rev: 2bd366ab4bd4b9e085b70d46f07f5f1acdd35790) Change-Id: Ia381c561f283c4d542e0035534375fa14c493278 Signed-off-by: Matthew Barth Signed-off-by: Brad Bishop --- .../00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf | 436 +++++++++++++++++++++ .../01--01--00--06/sbefifo2-dev0/occ-hwmon.2.conf | 366 +++++++++++++++++ .../sensors/phosphor-hwmon_%.bbappend | 14 +- 3 files changed, 809 insertions(+), 7 deletions(-) create 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 create 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 (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc') 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 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/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/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 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/fsi0/slave@00--00/00--00--00--0a/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_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 0861025f6..c1089ff73 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -38,16 +38,16 @@ CHIPS_append_swift = " \ ITEMSFMT = "ahb/apb/{0}.conf" ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS')}" -OCCS_witherspoon = " \ - 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 \ - " -OCCSFMT_witherspoon = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" -OCCITEMS_witherspoon = "${@compose_list(d, 'OCCSFMT_witherspoon', 'OCCS_witherspoon')}" +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 \ + " +OCCSFMT = "devices/platform/gpio-fsi/fsi0/slave@00--00/{0}.conf" +OCCITEMS = "${@compose_list(d, 'OCCSFMT', 'OCCS')}" ENVS = "obmc/hwmon/{0}" SYSTEMD_ENVIRONMENT_FILE_${PN} += "${@compose_list(d, 'ENVS', 'ITEMS')}" -SYSTEMD_ENVIRONMENT_FILE_${PN}_append_witherspoon = " ${@compose_list(d, 'ENVS', 'OCCITEMS_witherspoon')}" +SYSTEMD_ENVIRONMENT_FILE_${PN}_append = " ${@compose_list(d, 'ENVS', 'OCCITEMS')}" SYSTEMD_ENVIRONMENT_FILE_max31785-msl += "obmc/hwmon-max31785/max31785.conf" SYSTEMD_LINK_max31785-msl += "../phosphor-max31785-msl@.service:multi-user.target.wants/phosphor-max31785-msl@${MACHINE}.service" -- cgit v1.2.3 From d405e5e9346b72c01ccc359d4cc10ee3fcb8971f Mon Sep 17 00:00:00 2001 From: Matthew Barth Date: Tue, 4 Jun 2019 09:47:52 -0500 Subject: swif: Add power supply sensors Initially configure Swift's power supply sensors as they were on Witherspoon. Keep the config files separate between systems as they will be different due to differences between the power supplies used. Tested: Built Swift image that contained the config files Built Witherspoon image that still contained the config files (From meta-ibm rev: d8d27673f1b277db83859408842619ae24606235) Change-Id: I64d893c6c5dbea0e4d4a592042b17d6bad5b4596 Signed-off-by: Matthew Barth Signed-off-by: Brad Bishop --- .../bus@1e78a000/i2c-bus@100/power-supply@68.conf | 23 ++++++++++++++++++++++ .../bus@1e78a000/i2c-bus@100/power-supply@69.conf | 23 ++++++++++++++++++++++ .../sensors/phosphor-hwmon_%.bbappend | 4 ++-- 3 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf create mode 100644 meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf (limited to 'meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc') diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.conf new file mode 100644 index 000000000..2fadbdec0 --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@68.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/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.conf new file mode 100644 index 000000000..e463b517c --- /dev/null +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/swift/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/power-supply@69.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_%.bbappend b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index c1089ff73..993ca281f 100644 --- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -9,12 +9,12 @@ SRC_URI += " \ 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 = " \ bus@1e78a000/i2c-bus@100/bmp280@77 \ bus@1e78a000/i2c-bus@100/dps310@76 \ - bus@1e78a000/i2c-bus@100/power-supply@68 \ - bus@1e78a000/i2c-bus@100/power-supply@69 \ bus@1e78a000/i2c-bus@140/ir35221@70 \ bus@1e78a000/i2c-bus@140/ir35221@71 \ bus@1e78a000/i2c-bus@180/ir35221@70 \ -- cgit v1.2.3