From abf5ddacfcf0d4469c3117addd1b794abf4afa59 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Fri, 26 Nov 2021 06:12:16 +0000 Subject: meta-ampere: mtjade: sensor: change to use dbus-sensor Replace sensor monitoring in phosphor-hwmon by dbus-sensor/entity-manager. Tested: 1. Check IPMI sensor report for Temp and ADC sensors with correct threshold $ ipmitool sdr list $ ipmitool sensor list all 2. Check Redfish Thermal and Power schema for Temperature and ADC sensors Signed-off-by: Thang Q. Nguyen Change-Id: Idbb719ed01a28892bce32adce062c56dd51d3088 --- .../apb/bus@1e78a000/i2c-bus@100/tmp175@28.conf | 3 - .../apb/bus@1e78a000/i2c-bus@100/tmp175@29.conf | 3 - .../apb/bus@1e78a000/i2c-bus@100/tmp175@2a.conf | 3 - .../apb/bus@1e78a000/i2c-bus@100/tmp175@2b.conf | 3 - .../apb/bus@1e78a000/i2c-bus@100/tmp175@2c.conf | 3 - .../apb/bus@1e78a000/i2c-bus@100/tmp175@2d.conf | 3 - .../ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@58.conf | 17 --- .../ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@59.conf | 17 --- .../ahb/apb/pwm-tacho-controller@1e786000.conf | 60 ---------- .../obmc/mtjade/hwmon/iio-hwmon-adc14.conf | 4 - .../obmc/mtjade/hwmon/iio-hwmon-battery.conf | 11 -- .../obmc/mtjade/hwmon/iio-hwmon.conf | 123 --------------------- .../sensors/phosphor-hwmon_%.bbappend | 31 ------ 13 files changed, 281 deletions(-) delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@28.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@29.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2a.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2b.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2c.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2d.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@58.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@59.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-adc14.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-battery.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend (limited to 'meta-ampere/meta-jade/recipes-phosphor/sensors') diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@28.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@28.conf deleted file mode 100644 index 5d1ed0944..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@28.conf +++ /dev/null @@ -1,3 +0,0 @@ -LABEL_temp1=TS1_Temp -CRITHI_temp1=50000 -CRITLO_temp1=1000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@29.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@29.conf deleted file mode 100644 index 2429d8e14..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@29.conf +++ /dev/null @@ -1,3 +0,0 @@ -LABEL_temp1=TS2_Temp -CRITHI_temp1=50000 -CRITLO_temp1=1000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2a.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2a.conf deleted file mode 100644 index 60d2783ae..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2a.conf +++ /dev/null @@ -1,3 +0,0 @@ -LABEL_temp1=TS3_Temp -CRITHI_temp1=50000 -CRITLO_temp1=1000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2b.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2b.conf deleted file mode 100644 index 9b7987400..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2b.conf +++ /dev/null @@ -1,3 +0,0 @@ -LABEL_temp1=TS4_Temp -CRITHI_temp1=50000 -CRITLO_temp1=1000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2c.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2c.conf deleted file mode 100644 index c9fc00c05..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2c.conf +++ /dev/null @@ -1,3 +0,0 @@ -LABEL_temp1=TS5_Temp -CRITHI_temp1=50000 -CRITLO_temp1=1000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2d.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2d.conf deleted file mode 100644 index 6c71eca5d..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@100/tmp175@2d.conf +++ /dev/null @@ -1,3 +0,0 @@ -LABEL_temp1=TS6_Temp -CRITHI_temp1=50000 -CRITLO_temp1=1000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@58.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@58.conf deleted file mode 100644 index 944085d4d..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@58.conf +++ /dev/null @@ -1,17 +0,0 @@ -LABEL_temp1= "PSU0_TEMP" -CRITHI_temp1=64000 - -LABEL_power2= "PSU0_POUTPUT" - -LABEL_fan1="PSU0_fan1" -CRITHI_fan1=20300 - -LABEL_in1= "PSU0_VINPUT" -LABEL_in2= "PSU0_VOUTPUT" - -LABEL_curr1= "PSU0_IINPUT" -LABEL_curr2= "PSU0_IOUTPUT" - -LABEL_power1= "PSU0_PINPUT" - -INTERVAL=10000000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@59.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@59.conf deleted file mode 100644 index 15b965551..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/bus@1e78a000/i2c-bus@1c0/psu@59.conf +++ /dev/null @@ -1,17 +0,0 @@ -LABEL_temp1 = "PSU1_TEMP" -CRITHI_temp1=64000 - -LABEL_power2 = "PSU1_POUTPUT" - -LABEL_fan1 = "PSU1_fan1" -CRITHI_fan1=20300 - -LABEL_in1= "PSU1_VINPUT" -LABEL_in2= "PSU1_VOUTPUT" - -LABEL_curr1= "PSU1_IINPUT" -LABEL_curr2= "PSU1_IOUTPUT" - -LABEL_power1 = "PSU1_PINPUT" - -INTERVAL=10000000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf deleted file mode 100644 index b14392bea..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/ahb/apb/pwm-tacho-controller@1e786000.conf +++ /dev/null @@ -1,60 +0,0 @@ -LABEL_fan5 = "FAN3_1" -CRITLO_fan5=500 -CRITHI_fan5=23100 - -LABEL_fan6 = "FAN3_2" -CRITLO_fan6=500 -CRITHI_fan6=23100 - -LABEL_fan7 = "FAN4_1" -CRITLO_fan7=500 -CRITHI_fan7=23100 - -LABEL_fan8 = "FAN4_2" -CRITLO_fan8=500 -CRITHI_fan8=23100 - -LABEL_fan9 = "FAN5_1" -CRITLO_fan9=500 -CRITHI_fan9=23100 - -LABEL_fan10 = "FAN5_2" -CRITLO_fan10=500 -CRITHI_fan10=23100 - -LABEL_fan11 = "FAN6_1" -CRITLO_fan11=500 -CRITHI_fan11=23100 - -LABEL_fan12 = "FAN6_2" -CRITLO_fan12=500 -CRITHI_fan12=23100 - -LABEL_fan13 = "FAN7_1" -CRITLO_fan13=500 -CRITHI_fan13=23100 - -LABEL_fan14 = "FAN7_2" -CRITLO_fan14=500 -CRITHI_fan14=23100 - -LABEL_fan15 = "FAN8_1" -CRITLO_fan15=500 -CRITHI_fan15=23100 - -LABEL_fan16 = "FAN8_2" -CRITLO_fan16=500 -CRITHI_fan16=23100 - -PWM_TARGET_fan5 = "3" -PWM_TARGET_fan6 = "3" -PWM_TARGET_fan7 = "4" -PWM_TARGET_fan8 = "4" -PWM_TARGET_fan9 = "5" -PWM_TARGET_fan10 = "5" -PWM_TARGET_fan11 = "6" -PWM_TARGET_fan12 = "6" -PWM_TARGET_fan13 = "7" -PWM_TARGET_fan14 = "7" -PWM_TARGET_fan15 = "8" -PWM_TARGET_fan16 = "8" diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-adc14.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-adc14.conf deleted file mode 100644 index a5c5c2a45..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-adc14.conf +++ /dev/null @@ -1,4 +0,0 @@ -LABEL_in1=3V3_SB -GAIN_in1=3 -CRITHI_in1=3960 -CRITLO_in1=2320 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-battery.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-battery.conf deleted file mode 100644 index 3cc58229d..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon-battery.conf +++ /dev/null @@ -1,11 +0,0 @@ -LABEL_in1=VBAT_RTC -GAIN_in1=3 -CRITHI_in1=3564 -CRITLO_in1=2106 - -# GPIOS4 needs to be pulled high for battery voltage reading -GPIOCHIP_in1=0 -GPIO_in1=148 - -# Read it every day so it does not impact battery life -INTERVAL=86400000000 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon.conf b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon.conf deleted file mode 100644 index 4e46123ae..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon/obmc/mtjade/hwmon/iio-hwmon.conf +++ /dev/null @@ -1,123 +0,0 @@ -LABEL_in1=S0_0V8_VDDC_SOC -CRITHI_in1=960 -CRITLO_in1=560 - -LABEL_in2=S1_0V8_VDDC_SOC -CRITHI_in2=960 -CRITLO_in2=560 - -LABEL_in3=S0_0V75_PCP -CRITHI_in3=1323 -CRITLO_in3=504 - -LABEL_in4=S1_0V75_PCP -CRITHI_in4=1323 -CRITLO_in4=504 - -LABEL_in5=S0_1V2_VDDQ0123 -CRITHI_in5=1442 -CRITLO_in5=840 - -LABEL_in6=S1_1V2_VDDQ0123 -CRITHI_in6=1442 -CRITLO_in6=840 - -LABEL_in7=S0_0V6_VTT0123 -CRITHI_in7=720 -CRITLO_in7=420 - -LABEL_in8=S1_0V6_VTT0123 -CRITHI_in8=720 -CRITLO_in8=420 - -LABEL_in9=S0_2V5_VPP0123 -GAIN_in9=2 -CRITHI_in9=3000 -CRITLO_in9=1755 - -LABEL_in10=S1_2V5_VPP0123 -GAIN_in10=2 -CRITHI_in10=3000 -CRITLO_in10=1755 - -LABEL_in11=S0_1V2_VDDQ4567 -CRITHI_in11=1442 -CRITLO_in11=840 - -LABEL_in12=S1_1V2_VDDQ4567 -CRITHI_in12=1442 -CRITLO_in12=840 - -LABEL_in13=S0_0V6_VTT4567 -CRITHI_in13=720 -CRITLO_in13=420 - -LABEL_in14=S1_0V6_VTT4567 -CRITHI_in14=720 -CRITLO_in14=420 - -LABEL_in15=S0_2V5_VPP4567 -GAIN_in15=2 -CRITHI_in15=3000 -CRITLO_in15=1755 - -LABEL_in16=S1_2V5_VPP4567 -GAIN_in16=2 -CRITHI_in16=3000 -CRITLO_in16=1755 - -LABEL_in17=S0_0V85_RCA -CRITHI_in17=1080 -CRITLO_in17=630 - -LABEL_in18=S1_0V85_RCA -CRITHI_in18=1080 -CRITLO_in18=630 - -LABEL_in19=S0_1V8_VDDH -GAIN_in19=2 -CRITHI_in19=2156 -CRITLO_in19=1265 - -LABEL_in20=S1_1V8_VDDH -GAIN_in20=2 -CRITHI_in20=2156 -CRITLO_in20=1265 - -LABEL_in21=S0_1V5_VDDH -CRITHI_in21=1800 -CRITLO_in21=1053 - -LABEL_in22=S1_1V5_VDDH -CRITHI_in22=1800 -CRITLO_in22=1053 - -LABEL_in23=S0_1V8_SOC -GAIN_in23=2 -CRITHI_in23=2156 -CRITLO_in23=1265 - -LABEL_in24=S1_1V8_SOC -GAIN_in24=2 -CRITHI_in24=2156 -CRITLO_in24=1265 - -LABEL_in25=S0_1V8_PCP -GAIN_in25=2 -CRITHI_in25=2156 -CRITLO_in25=1265 - -LABEL_in26=S1_1V8_PCP -GAIN_in26=2 -CRITHI_in26=2156 -CRITLO_in26=1265 - -LABEL_in27=S0_3V3_SOC -GAIN_in27=3 -CRITHI_in27=3960 -CRITLO_in27=2320 - -LABEL_in28=S1_3V3_SOC -GAIN_in28=3 -CRITHI_in28=3960 -CRITLO_in28=2320 diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend deleted file mode 100644 index a77a59be0..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ /dev/null @@ -1,31 +0,0 @@ -FILESEXTRAPATHS:append:mtjade := "${THISDIR}/${PN}:" - -EXTRA_OEMESON:append:mtjade = " -Dnegative-errno-on-fail=true" - -CHIPS:mtjade = " \ - bus@1e78a000/i2c-bus@100/tmp175@28 \ - bus@1e78a000/i2c-bus@100/tmp175@29 \ - bus@1e78a000/i2c-bus@100/tmp175@2a \ - bus@1e78a000/i2c-bus@100/tmp175@2b \ - bus@1e78a000/i2c-bus@100/tmp175@2c \ - bus@1e78a000/i2c-bus@100/tmp175@2d \ - bus@1e78a000/i2c-bus@1c0/psu@58 \ - bus@1e78a000/i2c-bus@1c0/psu@59 \ - pwm-tacho-controller@1e786000 \ - " - -ITEMSFMT = "ahb/apb/{0}.conf" - -ITEMS = "${@compose_list(d, 'ITEMSFMT', 'CHIPS:${MACHINE}')}" - -ITEMS += "iio-hwmon.conf iio-hwmon-adc14.conf iio-hwmon-battery.conf" - -ENVS = "obmc/${MACHINE}/hwmon/{0}" -SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mtjade = " ${@compose_list(d, 'ENVS', 'ITEMS')}" - -do_install:append:mtjade() { - SOURCEDIR="${WORKDIR}/obmc/${MACHINE}/hwmon" - DESTDIR="${D}${sysconfdir}/default/obmc" - install -d ${DESTDIR} - cp -r ${SOURCEDIR} ${DESTDIR} -} -- cgit v1.2.3 From 54cfdab2070a7bf23b887286459cb6b8b10e14a4 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Wed, 22 Dec 2021 07:53:52 +0000 Subject: meta-ampere: mtjade: support NVME Temperature Enable phosphor-nvme with configuration for nvme_max sensor for FAN control support later. Tested: 1. Check NVME Temp: $ busctl get-property xyz.openbmc_project.nvme.manager \ /xyz/openbmc_project/sensors/temperature/nvme20 \ xyz.openbmc_project.Sensor.Value Value d 22 2. Check nvme_max has valid value $ busctl introspect xyz.openbmc_project.VirtualSensor \ /xyz/openbmc_project/sensors/temperature/nvme_max Signed-off-by: Thang Q. Nguyen Change-Id: Ied609ba5b5d39877c09ed04faff5063c7882a689 --- meta-ampere/meta-jade/conf/machine/mtjade.conf | 1 + .../sensors/phosphor-nvme/nvme_config.json | 118 +++++++++++ .../sensors/phosphor-nvme_%.bbappend | 8 + .../virtual_sensor_config.json | 218 ++++++++++++++++++++- .../sensors/phosphor-virtual-sensor_%.bbappend | 8 +- 5 files changed, 346 insertions(+), 7 deletions(-) create mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json create mode 100644 meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme_%.bbappend (limited to 'meta-ampere/meta-jade/recipes-phosphor/sensors') diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index ede176ad0..642e7469e 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -34,6 +34,7 @@ OBMC_IMAGE_EXTRA_INSTALL:append = "\ mtjade-gpio-config \ ampere-platform-init \ ampere-ipmi-oem \ + phosphor-nvme \ " PREFERRED_PROVIDER_virtual/obmc-chassis-mgmt = "packagegroup-ampere-apps" diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json new file mode 100644 index 000000000..9c2aade75 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme/nvme_config.json @@ -0,0 +1,118 @@ +{ + "config": [ + { + "NVMeDriveIndex": 0, + "NVMeDriveBusID": 50 + }, + { + "NVMeDriveIndex": 1, + "NVMeDriveBusID": 51 + }, + { + "NVMeDriveIndex": 2, + "NVMeDriveBusID": 52 + }, + { + "NVMeDriveIndex": 3, + "NVMeDriveBusID": 53 + }, + { + "NVMeDriveIndex": 4, + "NVMeDriveBusID": 54 + }, + { + "NVMeDriveIndex": 5, + "NVMeDriveBusID": 55 + }, + { + "NVMeDriveIndex": 6, + "NVMeDriveBusID": 56 + }, + { + "NVMeDriveIndex": 7, + "NVMeDriveBusID": 57 + }, + { + "NVMeDriveIndex": 8, + "NVMeDriveBusID": 60 + }, + { + "NVMeDriveIndex": 9, + "NVMeDriveBusID": 61 + }, + { + "NVMeDriveIndex": 10, + "NVMeDriveBusID": 62 + }, + { + "NVMeDriveIndex": 11, + "NVMeDriveBusID": 63 + }, + { + "NVMeDriveIndex": 12, + "NVMeDriveBusID": 64 + }, + { + "NVMeDriveIndex": 13, + "NVMeDriveBusID": 65 + }, + { + "NVMeDriveIndex": 14, + "NVMeDriveBusID": 66 + }, + { + "NVMeDriveIndex": 15, + "NVMeDriveBusID": 67 + }, + { + "NVMeDriveIndex": 16, + "NVMeDriveBusID": 70 + }, + { + "NVMeDriveIndex": 17, + "NVMeDriveBusID": 71 + }, + { + "NVMeDriveIndex": 18, + "NVMeDriveBusID": 72 + }, + { + "NVMeDriveIndex": 19, + "NVMeDriveBusID": 73 + }, + { + "NVMeDriveIndex": 20, + "NVMeDriveBusID": 74 + }, + { + "NVMeDriveIndex": 21, + "NVMeDriveBusID": 75 + }, + { + "NVMeDriveIndex": 22, + "NVMeDriveBusID": 76 + }, + { + "NVMeDriveIndex": 23, + "NVMeDriveBusID": 77 + }, + { + "NVMeDriveIndex": 24, + "NVMeDriveBusID": 80 + }, + { + "NVMeDriveIndex": 25, + "NVMeDriveBusID": 81 + } + ], + "threshold": [ + { + "criticalHigh": 80, + "criticalLow": 0, + "warningHigh": 70, + "warningLow": 5, + "maxValue": 127, + "minValue": -128 + } + ] +} diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme_%.bbappend new file mode 100644 index 000000000..5eadc25f7 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-nvme_%.bbappend @@ -0,0 +1,8 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +SRC_URI += " file://nvme_config.json" + +do_install:append() { + install -m 0644 -D ${WORKDIR}/nvme_config.json \ + ${D}/etc/nvme +} diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json index d0dc76782..abacb4f65 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor/virtual_sensor_config.json @@ -8,12 +8,25 @@ "Threshold" : { }, + "Associations": + [ + [ + "chassis", + "all_sensors", + "/xyz/openbmc_project/inventory/system/chassis/Mt_Jade" + ], + [ + "inventory", + "sensors", + "/xyz/openbmc_project/inventory/system/chassis/Mt_Jade" + ] + ], "Params": { "DbusParam": [ { - "ParamName": "PSU0_POUTPUT", + "ParamName": "P0", "Desc": { "Name": "PSU0_POUTPUT", @@ -21,7 +34,7 @@ } }, { - "ParamName": "PSU1_POUTPUT", + "ParamName": "P1", "Desc": { "Name": "PSU1_POUTPUT", @@ -30,7 +43,206 @@ } ] }, - "Expression": "PSU0_POUTPUT + PSU1_POUTPUT" + "Expression": "(P0 + P1) >= 0 ? (P0 + P1) : NULL" + }, + { + "Desc":{ + "Name":"nvme_max", + "SensorType":"temperature" + }, + "Threshold":{ + "CriticalHigh": 80, + "CriticalLow": 0, + "WarningHigh": 70, + "WarningLow": 5 + }, + "Params":{ + "DbusParam": [ + { + "ParamName": "n0", + "Desc": { + "Name": "nvme0", + "SensorType": "temperature" + } + }, + { + "ParamName": "n1", + "Desc": { + "Name": "nvme1", + "SensorType": "temperature" + } + }, + { + "ParamName": "n2", + "Desc": { + "Name": "nvme2", + "SensorType": "temperature" + } + }, + { + "ParamName": "n3", + "Desc": { + "Name": "nvme3", + "SensorType": "temperature" + } + }, + { + "ParamName": "n4", + "Desc": { + "Name": "nvme4", + "SensorType": "temperature" + } + }, + { + "ParamName": "n5", + "Desc": { + "Name": "nvme5", + "SensorType": "temperature" + } + }, + { + "ParamName": "n6", + "Desc": { + "Name": "nvme6", + "SensorType": "temperature" + } + }, + { + "ParamName": "n7", + "Desc": { + "Name": "nvme7", + "SensorType": "temperature" + } + }, + { + "ParamName": "n8", + "Desc": { + "Name": "nvme8", + "SensorType": "temperature" + } + }, + { + "ParamName": "n9", + "Desc": { + "Name": "nvme9", + "SensorType": "temperature" + } + }, + { + "ParamName": "n10", + "Desc": { + "Name": "nvme10", + "SensorType": "temperature" + } + }, + { + "ParamName": "n11", + "Desc": { + "Name": "nvme11", + "SensorType": "temperature" + } + }, + { + "ParamName": "n12", + "Desc": { + "Name": "nvme12", + "SensorType": "temperature" + } + }, + { + "ParamName": "n13", + "Desc": { + "Name": "nvme13", + "SensorType": "temperature" + } + }, + { + "ParamName": "n14", + "Desc": { + "Name": "nvme14", + "SensorType": "temperature" + } + }, + { + "ParamName": "n15", + "Desc": { + "Name": "nvme15", + "SensorType": "temperature" + } + }, + { + "ParamName": "n16", + "Desc": { + "Name": "nvme16", + "SensorType": "temperature" + } + }, + { + "ParamName": "n17", + "Desc": { + "Name": "nvme17", + "SensorType": "temperature" + } + }, + { + "ParamName": "n18", + "Desc": { + "Name": "nvme18", + "SensorType": "temperature" + } + }, + { + "ParamName": "n19", + "Desc": { + "Name": "nvme19", + "SensorType": "temperature" + } + }, + { + "ParamName": "n20", + "Desc": { + "Name": "nvme20", + "SensorType": "temperature" + } + }, + { + "ParamName": "n21", + "Desc": { + "Name": "nvme21", + "SensorType": "temperature" + } + }, + { + "ParamName": "n22", + "Desc": { + "Name": "nvme22", + "SensorType": "temperature" + } + }, + { + "ParamName": "n23", + "Desc": { + "Name": "nvme23", + "SensorType": "temperature" + } + }, + { + "ParamName": "n24", + "Desc": { + "Name": "nvme24", + "SensorType": "temperature" + } + }, + { + "ParamName": "n25", + "Desc": { + "Name": "nvme25", + "SensorType": "temperature" + } + } + ] + }, + "Expression": "max(0,(n0 == n0) ? n0 : NULL,(n1 == n1) ? n1 : NULL,(n2 == n2) ? n2 : NULL,(n3 == n3) ? n3 : NULL,(n4 == n4) ? n4 : NULL,(n5 == n5) ? n5 : NULL,(n6 == n6) ? n6 : NULL,(n7 == n7) ? n7 : NULL,(n8 == n8) ? n8 : NULL,(n9 == n9) ? n9 : NULL,(n10 == n10) ? n10 : NULL,(n11 == n11) ? n11 : NULL,(n12 == n12) ? n12 : NULL,(n13 == n13) ? n13 : NULL,(n14 == n14) ? n14 : NULL,(n15 == n15) ? n15 : NULL,(n16 == n16) ? n16 : NULL,(n17 == n17) ? n17 : NULL,(n18 == n18) ? n18 : NULL,(n19 == n19) ? n19 : NULL,(n20 == n20) ? n20 : NULL,(n21 == n21) ? n21 : NULL,(n22 == n22) ? n22 : NULL,(n23 == n23) ? n23 : NULL,(n24 == n24) ? n24 : NULL,(n25 == n25) ? n25 : NULL)" } ] diff --git a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend index 3a1af4f3b..0d1b5e63c 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -1,10 +1,10 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI:append:mtjade += " \ - file://virtual_sensor_config.json \ - " +SRC_URI:append += " \ + file://virtual_sensor_config.json \ + " -do_install:append:mtjade() { +do_install:append() { install -m 0644 ${WORKDIR}/virtual_sensor_config.json ${D}${datadir}/phosphor-virtual-sensor/ } -- cgit v1.2.3