From addb1466f22c9d8435ad4cfebbf01106314dee74 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sat, 20 Apr 2019 09:59:37 -0400 Subject: subtree updates meta-aspeed: c8d791ede6..35a494ecb3: Andrew Jeffery (1): linux-aspeed: OCC, ISL68137, ASPEED spi-nor updates meta-ingrasys: 67bcaf389f..71846afdc6: Patrick Venture (5): meta-ingrasys: zaius: hwmon: udc90160 specify informative names meta-ingrasys: zaius: enable isl68137 and ir38064 meta-ingrasys: zaius: phosphor-hwmon: add vrm nodes meta-ingrasys: zaius: phosphor-hwmon: add power-brick nodes meta-ingrasys: zaius: update ipmi sensor inventory Robert Lippert (3): meta-ingrasys: zaius: remove reflock fixup recipe meta-ingrasys: zaius: avsbus-control: use linux driver instead of raw I2C commands meta-ingrasys: zaius: no longer need to set VDN VOUT_MAX during host boot Change-Id: I5dbcfae6f937e0f01e5fca4c1f686be0e82b7ee1 Signed-off-by: Brad Bishop --- .../chassis/avsbus-control/avsbus-enable@.service | 1 - .../chassis/avsbus-control/zaius_avsbus.sh | 46 +-- .../recipes-phosphor/chassis/refclock-fixup.bb | 22 -- .../chassis/refclock-fixup/fix_zaius_refclock.sh | 27 -- .../refclock-fixup/op-refclock-fixup@.service | 19 -- .../recipes-phosphor/host/p9-host-start.bbappend | 1 - .../ipmi/zaius-ipmi-sensor-inventory/config.yaml | 349 ++++++++++++++++++++- .../bus@1e78a000/i2c-bus@300/power-brick@30.conf | 5 + .../bus@1e78a000/i2c-bus@300/power-brick@6a.conf | 5 + .../ahb/apb/bus@1e78a000/i2c-bus@300/vrm@40.conf | 8 + .../ahb/apb/bus@1e78a000/i2c-bus@300/vrm@41.conf | 8 + .../ahb/apb/bus@1e78a000/i2c-bus@300/vrm@43.conf | 6 + .../ahb/apb/bus@1e78a000/i2c-bus@300/vrm@60.conf | 8 + .../ahb/apb/bus@1e78a000/i2c-bus@300/vrm@64.conf | 11 + .../ahb/apb/bus@1e78a000/i2c-bus@340/vrm@40.conf | 8 + .../ahb/apb/bus@1e78a000/i2c-bus@340/vrm@41.conf | 8 + .../ahb/apb/bus@1e78a000/i2c-bus@340/vrm@42.conf | 6 + .../ahb/apb/bus@1e78a000/i2c-bus@340/vrm@60.conf | 8 + .../ahb/apb/bus@1e78a000/i2c-bus@340/vrm@64.conf | 11 + .../apb/bus@1e78a000/i2c-bus@40/ucd90160@64.conf | 40 +-- .../sensors/phosphor-hwmon_%.bbappend | 12 + 21 files changed, 468 insertions(+), 141 deletions(-) delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup.bb delete mode 100755 meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/fix_zaius_refclock.sh delete mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@30.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@6a.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@40.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@41.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@43.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@60.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@64.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@40.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@41.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@42.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@60.conf create mode 100644 meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@64.conf (limited to 'meta-ingrasys/meta-zaius/recipes-phosphor') diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service index 24aadf5ad..f0d14d220 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/avsbus-enable@.service @@ -6,7 +6,6 @@ Conflicts=obmc-host-stop@%i.target ConditionPathExists=!/run/openbmc/chassis@%i-on [Service] -ExecStart=/usr/bin/env zaius_avsbus.sh vdn_max ExecStart=/usr/bin/env zaius_avsbus.sh enable SyslogIdentifier=zaius_avsbus.sh Type=oneshot diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/zaius_avsbus.sh b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/zaius_avsbus.sh index 45e60664a..57e7f99b2 100755 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/zaius_avsbus.sh +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/avsbus-control/zaius_avsbus.sh @@ -12,29 +12,14 @@ vdn_i2c_addr_page="0x64:0x01" vcs_i2c_addr_page="0x64:0x00" addrs_pages="$vdd_i2c_addr_page $vdn_i2c_addr_page $vcs_i2c_addr_page" -# Usage: vrm_set_page -vrm_set_page() -{ - i2cset -y $1 $2 0x00 $3 b -} +i2c_path="/sys/bus/i2c/devices/" # Usage: vrm_avs_enable # Initializes the AVSBus VOUT setpoint to the value in PMBus VOUT_COMMAND -# Sets OPERATION PMBUS register to -# - Enable/Disable: On -# - VOUT Source: AVSBus Target Rail Voltage -# - AVSBus Copy: VOUT_COMMAND remains unchanged -# Writes to VOUT setpoint over AVSBus will persist after the VRM is switched to -# PMBus control. Switching back to AVSBus control restores this persisted -# setpoint rather than re-initializing to PMBus VOUT_COMMAND. This behavior is -# known to Intersil and writing VOUT_COMMAND over PMBus is the only workaround. vrm_avs_enable() { - vrm_set_page "$@" echo Enabling AVSBus on bus $1 VRM @$2 rail $3... - local vout_command=`i2cget -y $1 $2 0x21 w` - i2cset -y $1 $2 0x21 $vout_command w - i2cset -y $1 $2 0x01 0xb0 b + echo 1 > $(echo ${i2c_path}/$1-$(printf "%04x" $2)/hwmon/hwmon*/avs$(printf "%d" $3)_enable) } # Usage: vrm_avs_disable @@ -44,28 +29,8 @@ vrm_avs_enable() # - AVSBus Copy: VOUT_COMMAND remains unchanged vrm_avs_disable() { - vrm_set_page "$@" echo Disabling AVSBus on bus $1 VRM @$2 rail $3... - i2cset -y $1 $2 0x01 0x80 b -} - -# Usage: vrm_vout_max_1v1 -# Sets VOUT_MAX to 1.1V -vrm_vout_max_1v1() -{ - vrm_set_page "$@" - echo Setting VOUT_MAX=[1.1V] on bus $1 VRM @$2 rail $3... - i2cset -y $1 $2 0x24 0x44c w -} - -# Usage: vrm_print -vrm_print() -{ - vrm_set_page "$@" - local operation=`i2cget -y $1 $2 0x01 b` - local vout=`i2cget -y $1 $2 0x8b w` - local iout=`i2cget -y $1 $2 0x8c w` - echo VRM on bus $1 @$2 rail $3: OPERATION=$operation VOUT=$vout IOUT=$iout + echo 0 > $(echo ${i2c_path}/$1-$(printf "%04x" $2)/hwmon/hwmon*/avs$(printf "%d" $3)_enable) } # Usage: for_each_rail @@ -87,12 +52,7 @@ then elif [ "$1" == "disable" ] then for_each_rail vrm_avs_disable -elif [ "$1" == "vdn_max" ] -then - addrs_pages="$vdn_i2c_addr_page" - for_each_rail vrm_vout_max_1v1 else - for_each_rail vrm_print echo "\"$0 \" to control whether VRMs use AVSBus" echo "\"$0 \" to set VDN rails VOUT_MAX to 1.1V" fi diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup.bb b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup.bb deleted file mode 100644 index 4784f3172..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup.bb +++ /dev/null @@ -1,22 +0,0 @@ -DESCRIPTION = "Zaius host reference clock fixup" -PR = "r0" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${INGRASYSBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" - -inherit obmc-phosphor-systemd - -TMPL = "op-refclock-fixup@.service" -INSTFMT = "op-refclock-fixup@{0}.service" -TGTFMT = "obmc-chassis-poweron@{0}.target" -FMT = "../${TMPL}:${TGTFMT}.requires/${INSTFMT}" - -SYSTEMD_SERVICE_${PN} += "${TMPL}" -SYSTEMD_LINK_${PN} += "${@compose_list(d, 'FMT', 'OBMC_CHASSIS_INSTANCES')}" - -SRC_URI += "file://fix_zaius_refclock.sh" -RDEPENDS_${PN} += "i2c-tools" - -do_install() { - install -d ${D}${sbindir} - install -m 0755 ${WORKDIR}/fix_zaius_refclock.sh ${D}${sbindir}/fix_zaius_refclock.sh -} diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/fix_zaius_refclock.sh b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/fix_zaius_refclock.sh deleted file mode 100755 index 01eb72b71..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/fix_zaius_refclock.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# fix up refclock by reconfiguring output of Si5338C clock generator - -i2cset="i2cset" -clkgen_i2c_bus="0" -clkgen_i2c_addr="0x70" - -# Usage: clkgen_write
[write length] -clkgen_write() -{ - $i2cset -y $clkgen_i2c_bus $clkgen_i2c_addr $1 $2 $3 -} - -# disable outputs -clkgen_write 230 0x10 b - -# set output configurations of each of the four channels to 3.3V HCSL -clkgen_write 36 0x07 b -clkgen_write 37 0x07 b -clkgen_write 38 0x07 b -clkgen_write 39 0x07 b -clkgen_write 40 0xe7 b -clkgen_write 41 0x9c b -clkgen_write 42 0x27 b - -# enable outputs -clkgen_write 230 0x00 b diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service b/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service deleted file mode 100644 index 9444b367f..000000000 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/chassis/refclock-fixup/op-refclock-fixup@.service +++ /dev/null @@ -1,19 +0,0 @@ -[Unit] -Description=Fix up Zaius host refclock -Wants=obmc-host-start-pre@%i.target -Before=obmc-host-start-pre@%i.target -Wants=obmc-power-on@%i.target -After=obmc-power-on@%i.target -Before=fsi-scan@%i.service -Conflicts=obmc-host-stop@%i.target -ConditionPathExists=!/run/openbmc/chassis@%i-on - -[Service] -Restart=no -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/env fix_zaius_refclock.sh -SyslogIdentifier=fix_zaius_refclock.sh - -[Install] -RequiredBy=obmc-chassis-poweron@%i.target diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend index 246db68a3..23cdb8d7d 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/host/p9-host-start.bbappend @@ -1,2 +1 @@ -RDEPENDS_${PN}_append_zaius = ' refclock-fixup' RDEPENDS_${PN}_append_zaius = ' avsbus-control' diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-sensor-inventory/config.yaml b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-sensor-inventory/config.yaml index d6a43e4e7..a7f1a7324 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-sensor-inventory/config.yaml +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/ipmi/zaius-ipmi-sensor-inventory/config.yaml @@ -177,6 +177,295 @@ deassert: false type: bool +0x72: &voltage + sensorType: 0x02 + path: /xyz/openbmc_project/sensors/voltage/vr0_p1v2_03_vout + sensorReadingType: 0x01 + multiplierM: 8 + offsetB: 0 + bExp: 0 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + scale: -3 + rExp: -3 + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t +0x73: ¤t + sensorType: 0x03 + path: /xyz/openbmc_project/sensors/current/vr0_p1v2_03_iout + sensorReadingType: 0x01 + multiplierM: 200 + offsetB: 0 + bExp: 0 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + scale: -3 + rExp: -3 + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t +0x74: &power + sensorType: 0x08 + path: /xyz/openbmc_project/sensors/power/vr0_p1v2_03_pout + sensorReadingType: 0x01 + multiplierM: 100 + offsetB: 0 + bExp: 0 + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts + scale: -6 + rExp: -2 + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t +0x75: &temperature + sensorType: 0x01 + path: /xyz/openbmc_project/sensors/temperature/vr0_p1v2_03 + sensorReadingType: 0x01 + multiplierM: 235 + offsetB: 0 + bExp: 0 + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC + scale: -3 + rExp: -3 + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: int64_t +0x76: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/vr0_p1v2_47_vout +0x77: + <<: *current + path: /xyz/openbmc_project/sensors/current/vr0_p1v2_47_iout +0x78: + <<: *power + path: /xyz/openbmc_project/sensors/power/vr0_p1v2_47_pout +0x79: + <<: *temperature + path: /xyz/openbmc_project/sensors/temperature/vr0_p1v2_47 +0x7a: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/vr0_vio_vout +0x7b: + <<: *current + path: /xyz/openbmc_project/sensors/current/vr0_vio_iout +0x7c: + <<: *power + path: /xyz/openbmc_project/sensors/power/vr0_vio_pout +0x7d: + <<: *temperature + path: /xyz/openbmc_project/sensors/temperature/vr0_vio +0x7e: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/vr0_vdd_vout +0x7f: + <<: *current + path: /xyz/openbmc_project/sensors/current/vr0_vdd_iout +0x80: + <<: *power + path: /xyz/openbmc_project/sensors/power/vr0_vdd_pout +0x81: + <<: *temperature + path: /xyz/openbmc_project/sensors/temperature/vr0_vdd +0x82: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/vr0_vcs_vout +0x83: + <<: *current + path: /xyz/openbmc_project/sensors/current/vr0_vcs_iout +0x84: + <<: *power + path: /xyz/openbmc_project/sensors/power/vr0_vcs_pout +0x85: + <<: *temperature + path: /xyz/openbmc_project/sensors/temperature/vr0_vdncvs +0x86: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/vr0_vdn_vout +0x87: + <<: *current + path: /xyz/openbmc_project/sensors/current/vr0_vdn_iout +0x88: + <<: *power + path: /xyz/openbmc_project/sensors/power/vr0_vdn_pout +0x89: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/vr1_p1v2_03_vout +0x8a: + <<: *current + path: /xyz/openbmc_project/sensors/current/vr1_p1v2_03_iout +0x8b: + <<: *power + path: /xyz/openbmc_project/sensors/power/vr1_p1v2_03_pout +0x8c: + <<: *temperature + path: /xyz/openbmc_project/sensors/temperature/vr1_p1v2_03 +0x8d: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/vr1_p1v2_47_vout +0x8e: + <<: *current + path: /xyz/openbmc_project/sensors/current/vr1_p1v2_47_iout +0x8f: + <<: *power + path: /xyz/openbmc_project/sensors/power/vr1_p1v2_47_pout +0x90: + <<: *temperature + path: /xyz/openbmc_project/sensors/temperature/vr1_p1v2_47 +0x91: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/vr1_vio_vout +0x92: + <<: *current + path: /xyz/openbmc_project/sensors/current/vr1_vio_iout +0x93: + <<: *power + path: /xyz/openbmc_project/sensors/power/vr1_vio_pout +0x94: + <<: *temperature + path: /xyz/openbmc_project/sensors/temperature/vr1_vio +0x95: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/vr1_vdd_vout +0x96: + <<: *current + path: /xyz/openbmc_project/sensors/current/vr1_vdd_iout +0x97: + <<: *power + path: /xyz/openbmc_project/sensors/power/vr1_vdd_pout +0x98: + <<: *temperature + path: /xyz/openbmc_project/sensors/temperature/vr1_vdd +0x99: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/vr1_vcs_vout +0x9a: + <<: *current + path: /xyz/openbmc_project/sensors/current/vr1_vcs_iout +0x9b: + <<: *power + path: /xyz/openbmc_project/sensors/power/vr1_vcs_pout +0x9c: + <<: *temperature + path: /xyz/openbmc_project/sensors/temperature/vr1_vdncvs +0x9d: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/vr1_vdn_vout +0x9e: + <<: *current + path: /xyz/openbmc_project/sensors/current/vr1_vdn_iout +0x9f: + <<: *power + path: /xyz/openbmc_project/sensors/power/vr1_vdn_pout +0xA0: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/p12v + multiplierM: 51 + offsetB: 0 + bExp: 0 +0xA1: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/p5v + multiplierM: 21 + offsetB: 0 + bExp: 0 +0xA2: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/p3v3 + multiplierM: 14 + offsetB: 0 + bExp: 0 +0xA3: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/p1v8 + multiplierM: 9 + offsetB: 0 + bExp: 0 +0xA4: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/p1v05 + multiplierM: 6 + offsetB: 0 + bExp: 0 +0xA5: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/p1v0_sata + multiplierM: 5 + offsetB: 0 + bExp: 0 +0xA6: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/cpu0_vdn + multiplierM: 5 + offsetB: 0 + bExp: 0 +0xA7: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/cpu1_vdn + multiplierM: 5 + offsetB: 0 + bExp: 0 +0xA8: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/p1v5 + multiplierM: 7 + offsetB: 0 + bExp: 0 +0xA9: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/cpu0_vio + multiplierM: 5 + offsetB: 0 + bExp: 0 +0xAA: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/cpu1_vio + multiplierM: 5 + offsetB: 0 + bExp: 0 +0xAB: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/cpu0_vdd + multiplierM: 5 + offsetB: 0 + bExp: 0 +0xAC: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/cpu1_vdd + multiplierM: 5 + offsetB: 0 + bExp: 0 +0xAD: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/cpu0_vcs + multiplierM: 5 + offsetB: 0 + bExp: 0 +0xAE: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/cpu1_vcs + multiplierM: 5 + offsetB: 0 + bExp: 0 + 0xB0: &fan_tach sensorType: 0x04 path: /xyz/openbmc_project/sensors/fan_tach/fan0 @@ -204,8 +493,32 @@ 0xB3: <<: *fan_tach path: /xyz/openbmc_project/sensors/fan_tach/fan3 +0xB4: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/brick_p12v_vin + multiplierM: 393 + offsetB: 0 + bExp: 0 +0xB5: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/brick_p12v_vout + multiplierM: 212 + offsetB: 0 + bExp: 0 +0xB6: + <<: *current + path: /xyz/openbmc_project/sensors/current/brick_p12v_iout + multiplierM: 393 + offsetB: 0 + bExp: 0 +0xB7: + <<: *temperature + path: /xyz/openbmc_project/sensors/temperature/brick_p12v + multiplierM: 235 + offsetB: 0 + bExp: 0 -0xC0: &temperature +0xC0: sensorType: 0x01 path: /xyz/openbmc_project/sensors/temperature/w1_inlet sensorReadingType: 0x01 @@ -259,7 +572,7 @@ <<: *fanpwm path: /xyz/openbmc_project/sensors/fan_tach/fan3 -0xD0: &voltage +0xD0: sensorType: 0x02 path: /xyz/openbmc_project/sensors/voltage/p5v_aux sensorReadingType: 0x01 @@ -367,4 +680,34 @@ multiplierM: 15 offsetB: 0 bExp: 0 - +0xE1: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/hotswap_vin + multiplierM: 393 + offsetB: 0 + bExp: 0 +0xE2: + <<: *current + path: /xyz/openbmc_project/sensors/current/hotswap_iin + multiplierM: 200 + offsetB: 0 + bExp: 0 +0xE3: + <<: *voltage + path: /xyz/openbmc_project/sensors/voltage/hotswap_vout + multiplierM: 393 + offsetB: 0 + bExp: 0 +0xE4: + <<: *power + path: /xyz/openbmc_project/sensors/power/hotswap_power + multiplierM: 80 + offsetB: 0 + bExp: 0 + rExp: -1 +0xE5: + <<: *temperature + path: /xyz/openbmc_project/sensors/temperature/hotswap_temp + multiplierM: 511 + offsetB: 20 + bExp: 3 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@30.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@30.conf new file mode 100644 index 000000000..4416f54a1 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@30.conf @@ -0,0 +1,5 @@ +LABEL_curr1=brick_p12v_iout +LABEL_in1=brick_p12v_vin +LABEL_in2=brick_p12v_vout +LABEL_temp1=brick_p12v +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@6a.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@6a.conf new file mode 100644 index 000000000..4416f54a1 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/power-brick@6a.conf @@ -0,0 +1,5 @@ +LABEL_curr1=brick_p12v_iout +LABEL_in1=brick_p12v_vin +LABEL_in2=brick_p12v_vout +LABEL_temp1=brick_p12v +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@40.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@40.conf new file mode 100644 index 000000000..f46a59d8b --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@40.conf @@ -0,0 +1,8 @@ +LABEL_curr1=vr0_p1v2_03_iin +LABEL_curr3=vr0_p1v2_03_iout +LABEL_in1=vr0_p1v2_03_vin +LABEL_in3=vr0_p1v2_03_vout +LABEL_power1=vr0_p1v2_03_pin +LABEL_power3=vr0_p1v2_03_pout +LABEL_temp3=vr0_p1v2_03 +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@41.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@41.conf new file mode 100644 index 000000000..f6efffb80 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@41.conf @@ -0,0 +1,8 @@ +LABEL_curr1=vr0_p1v2_47_iin +LABEL_curr3=vr0_p1v2_47_iout +LABEL_in1=vr0_p1v2_47_vin +LABEL_in3=vr0_p1v2_47_vout +LABEL_power1=vr0_p1v2_47_pin +LABEL_power3=vr0_p1v2_47_pout +LABEL_temp3=vr0_p1v2_47 +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@43.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@43.conf new file mode 100644 index 000000000..d446403ae --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@43.conf @@ -0,0 +1,6 @@ +LABEL_curr1=vr0_vio_iout +LABEL_in1=vr0_vio_vin +LABEL_in2=vr0_vio_vout +LABEL_power1=vr0_vio_pout +LABEL_temp1=vr0_vio +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@60.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@60.conf new file mode 100644 index 000000000..f928e6a0f --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@60.conf @@ -0,0 +1,8 @@ +LABEL_curr1=vr0_vdd_iin +LABEL_curr3=vr0_vdd_iout +LABEL_in1=vr0_vdd_vin +LABEL_in3=vr0_vdd_vout +LABEL_power1=vr0_vdd_pin +LABEL_power3=vr0_vdd_pout +LABEL_temp3=vr0_vdd +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@64.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@64.conf new file mode 100644 index 000000000..4f93e4425 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@300/vrm@64.conf @@ -0,0 +1,11 @@ +LABEL_curr1=vr0_vdnvcs_iin +LABEL_curr2=vr0_vcs_iout +LABEL_curr3=vr0_vdn_iout +LABEL_in1=vr0_vdnvcs_vin +LABEL_in2=vr0_vcs_vout +LABEL_in3=vr0_vdn_vout +LABEL_power1=vr0_vdnvcs_pin +LABEL_power2=vr0_vcs_pout +LABEL_power3=vr0_vdn_pout +LABEL_temp3=vr0_vdncvs +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@40.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@40.conf new file mode 100644 index 000000000..3524508d3 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@40.conf @@ -0,0 +1,8 @@ +LABEL_curr1=vr1_p1v2_03_iin +LABEL_curr3=vr1_p1v2_03_iout +LABEL_in1=vr1_p1v2_03_vin +LABEL_in3=vr1_p1v2_03_vout +LABEL_power1=vr1_p1v2_03_pin +LABEL_power3=vr1_p1v2_03_pout +LABEL_temp3=vr1_p1v2_03 +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@41.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@41.conf new file mode 100644 index 000000000..9d244ba3d --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@41.conf @@ -0,0 +1,8 @@ +LABEL_curr1=vr1_p1v2_47_iin +LABEL_curr3=vr1_p1v2_47_iout +LABEL_in1=vr1_p1v2_47_vin +LABEL_in3=vr1_p1v2_47_vout +LABEL_power1=vr1_p1v2_47_pin +LABEL_power3=vr1_p1v2_47_pout +LABEL_temp3=vr1_p1v2_47 +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@42.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@42.conf new file mode 100644 index 000000000..b40901a88 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@42.conf @@ -0,0 +1,6 @@ +LABEL_curr1=vr1_vio_iout +LABEL_in1=vr1_vio_vin +LABEL_in2=vr1_vio_vout +LABEL_power1=vr1_vio_pout +LABEL_temp1=vr1_vio +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@60.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@60.conf new file mode 100644 index 000000000..67b09ba36 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@60.conf @@ -0,0 +1,8 @@ +LABEL_curr1=vr1_vdd_iin +LABEL_curr3=vr1_vdd_iout +LABEL_in1=vr1_vdd_vin +LABEL_in3=vr1_vdd_vout +LABEL_power1=vr1_vdd_pin +LABEL_power3=vr1_vdd_pout +LABEL_temp3=vr1_vdd +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@64.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@64.conf new file mode 100644 index 000000000..b9c76dc54 --- /dev/null +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@340/vrm@64.conf @@ -0,0 +1,11 @@ +LABEL_curr1=vr1_vdnvcs_iin +LABEL_curr2=vr1_vcs_iout +LABEL_curr3=vr1_vdn_iout +LABEL_in1=vr1_vdnvcs_vin +LABEL_in2=vr1_vcs_vout +LABEL_in3=vr1_vdn_vout +LABEL_power1=vr1_vdnvcs_pin +LABEL_power2=vr1_vcs_pout +LABEL_power3=vr1_vdn_pout +LABEL_temp3=vr1_vdncvs +INTERVAL=86400000000 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/ucd90160@64.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/ucd90160@64.conf index 92be7fed3..58a9a9170 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/ucd90160@64.conf +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/bus@1e78a000/i2c-bus@40/ucd90160@64.conf @@ -1,25 +1,15 @@ -LABEL_in1=vout1 - -LABEL_in2=vout2 - -LABEL_in3=vout3 - -LABEL_in4=vout4 - -LABEL_in5=vout5 - -LABEL_in6=vout6 - -LABEL_in7=vout7 - -LABEL_in8=vout8 - -LABEL_in9=vout9 - -LABEL_in10=vout10 - -LABEL_in11=vout11 - -LABEL_in12=vout12 - -LABEL_in13=vout13 +LABEL_in1=p12v +LABEL_in2=p5v +LABEL_in3=p3v3 +LABEL_in4=p1v8 +LABEL_in5=p1v05 +LABEL_in6=p1v0_sata +LABEL_in7=cpu0_vdn +LABEL_in8=cpu1_vdn +LABEL_in9=p1v5 +LABEL_in10=cpu0_vio +LABEL_in11=cpu1_vio +LABEL_in12=cpu0_vdd +LABEL_in13=cpu1_vdd +LABEL_in14=cpu0_vcs +LABEL_in15=cpu1_vcs diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend index 31825e20d..b5b0fbced 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/sensors/phosphor-hwmon_%.bbappend @@ -3,6 +3,18 @@ FILESEXTRAPATHS_prepend_zaius := "${THISDIR}/${PN}:" ZAIUS_CHIPS = "bus@1e78a000/i2c-bus@40/ucd90160@64" ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/pca9541a@70/i2c-arb/hotswap@54" ZAIUS_CHIPS += " pwm-tacho-controller@1e786000" +ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/power-brick@30" +ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/power-brick@6a" +ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/vrm@40" +ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/vrm@41" +ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/vrm@43" +ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/vrm@60" +ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@300/vrm@64" +ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@340/vrm@40" +ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@340/vrm@41" +ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@340/vrm@42" +ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@340/vrm@60" +ZAIUS_CHIPS += " bus@1e78a000/i2c-bus@340/vrm@64" ZAIUS_ITEMSFMT = "ahb/apb/{0}.conf" ZAIUS_ITEMS = "${@compose_list(d, 'ZAIUS_ITEMSFMT', 'ZAIUS_CHIPS')}" -- cgit v1.2.3