diff options
Diffstat (limited to 'meta-ampere')
29 files changed, 673 insertions, 132 deletions
diff --git a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb index d29b87083..8da9e896e 100644 --- a/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb +++ b/meta-ampere/meta-common/recipes-ac01/packagegroups/packagegroup-ampere-apps.bb @@ -26,6 +26,7 @@ RDEPENDS_${PN}-chassis = " \ phosphor-hostlogger \ phosphor-sel-logger \ phosphor-logging \ + virtual/obmc-gpio-presence \ " SUMMARY_${PN}-system = "Ampere System" diff --git a/meta-ampere/meta-jade/conf/local.conf.sample b/meta-ampere/meta-jade/conf/local.conf.sample index 200d89797..54d05d90b 100644 --- a/meta-ampere/meta-jade/conf/local.conf.sample +++ b/meta-ampere/meta-jade/conf/local.conf.sample @@ -126,12 +126,11 @@ EXTRA_IMAGE_FEATURES = "debug-tweaks" # enable extra features. Some available options which can be included in this variable # are: # - 'buildstats' collect build statistics -# - 'image-mklibs' to reduce shared library files size for an image # - 'image-prelink' in order to prelink the filesystem image # - 'image-swab' to perform host system intrusion detection # NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink # NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended -USER_CLASSES ?= "buildstats image-mklibs image-prelink" +USER_CLASSES ?= "buildstats image-prelink" # # Runtime testing of images diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index 2649c2e91..171a023f4 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -6,6 +6,15 @@ require conf/machine/include/ast2500.inc require conf/machine/include/obmc-bsp-common.inc require conf/distro/include/phosphor-isolation.inc +# Reformat SPI flash layout to 64MB +FLASH_SIZE = "65536" +FLASH_UBOOT_OFFSET = "0" +FLASH_KERNEL_OFFSET = "1024" +FLASH_ROFS_OFFSET = "10240" +FLASH_RWFS_OFFSET = "43008" + +OBMC_POWER_SUPPLY_INSTANCES = "0 1" + OBMC_MACHINE_FEATURES += "\ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb index 66238dcf3..cf154eee6 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5 inherit allarch SRC_URI = " \ + file://ipmi-sensors-${MACHINE}.yaml \ file://mtjade-ipmi-fru.yaml \ file://mtjade-ipmi-fru-properties.yaml \ " @@ -12,6 +13,8 @@ SRC_URI = " \ S = "${WORKDIR}" do_install() { + install -m 0644 -D ipmi-sensors-${MACHINE}.yaml \ + ${D}${datadir}/${BPN}/ipmi-sensors-${MACHINE}.yaml cat mtjade-ipmi-fru.yaml > fru-read.yaml install -m 0644 -D mtjade-ipmi-fru-properties.yaml \ ${D}${datadir}/${BPN}/ipmi-extra-properties.yaml @@ -20,6 +23,7 @@ do_install() { } FILES_${PN}-dev = " \ + ${datadir}/${BPN}/ipmi-sensors-${MACHINE}.yaml \ ${datadir}/${BPN}/ipmi-extra-properties.yaml \ ${datadir}/${BPN}/ipmi-fru-read.yaml \ " diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/ipmi-sensors-mtjade.yaml b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/ipmi-sensors-mtjade.yaml new file mode 100644 index 000000000..959f353f3 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/ipmi-sensors-mtjade.yaml @@ -0,0 +1,399 @@ +1: &TEMP_DEFAULTS + bExp: 0 + entityID: 30 + entityInstance: 1 + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 255: + type: double + multiplierM: 1 + mutability: Mutability::Write|Mutability::Read + offsetB: 0 + path: /xyz/openbmc_project/sensors/temperature/TS1_Temp + rExp: 0 + readingType: readingData + sensorNamePattern: nameLeaf + sensorReadingType: 1 + sensorType: 1 + serviceInterface: org.freedesktop.DBus.Properties + unit: xyz.openbmc_project.Sensor.Value.Unit.DegreesC +2: + <<: *TEMP_DEFAULTS + entityInstance: 2 + path: /xyz/openbmc_project/sensors/temperature/TS2_Temp +3: + <<: *TEMP_DEFAULTS + entityInstance: 3 + path: /xyz/openbmc_project/sensors/temperature/TS3_Temp +4: + <<: *TEMP_DEFAULTS + entityInstance: 4 + path: /xyz/openbmc_project/sensors/temperature/TS4_Temp +5: + <<: *TEMP_DEFAULTS + entityInstance: 5 + path: /xyz/openbmc_project/sensors/temperature/TS5_Temp +6: + <<: *TEMP_DEFAULTS + entityInstance: 6 + path: /xyz/openbmc_project/sensors/temperature/TS6_Temp +243: + <<: *TEMP_DEFAULTS + entityInstance: 58 + path: /xyz/openbmc_project/sensors/temperature/PSU0_TEMP +244: + <<: *TEMP_DEFAULTS + entityInstance: 59 + path: /xyz/openbmc_project/sensors/temperature/PSU1_TEMP + +37: &FAN_DEFAULTS + entityID: 29 + entityInstance: 13 + sensorType: 4 + path: /xyz/openbmc_project/sensors/fan_tach/FAN3_1 + sensorReadingType: 1 + multiplierM: 100 + offsetB: 0 + rExp: 0 + unit: xyz.openbmc_project.Sensor.Value.Unit.RPMS + mutability: Mutability::Write|Mutability::Read + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + sensorNamePattern: nameLeaf + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0x0: + type: double + +40: + <<: *FAN_DEFAULTS + entityInstance: 16 + path: /xyz/openbmc_project/sensors/fan_tach/FAN3_2 +43: + <<: *FAN_DEFAULTS + entityInstance: 19 + path: /xyz/openbmc_project/sensors/fan_tach/FAN4_1 +46: + <<: *FAN_DEFAULTS + entityInstance: 22 + path: /xyz/openbmc_project/sensors/fan_tach/FAN4_2 +49: + <<: *FAN_DEFAULTS + entityInstance: 25 + path: /xyz/openbmc_project/sensors/fan_tach/FAN5_1 +52: + <<: *FAN_DEFAULTS + entityInstance: 28 + path: /xyz/openbmc_project/sensors/fan_tach/FAN5_2 +55: + <<: *FAN_DEFAULTS + entityInstance: 31 + path: /xyz/openbmc_project/sensors/fan_tach/FAN6_1 +58: + <<: *FAN_DEFAULTS + entityInstance: 34 + path: /xyz/openbmc_project/sensors/fan_tach/FAN6_2 +61: + <<: *FAN_DEFAULTS + entityInstance: 37 + path: /xyz/openbmc_project/sensors/fan_tach/FAN7_1 +64: + <<: *FAN_DEFAULTS + entityInstance: 40 + path: /xyz/openbmc_project/sensors/fan_tach/FAN7_2 +67: + <<: *FAN_DEFAULTS + entityInstance: 43 + path: /xyz/openbmc_project/sensors/fan_tach/FAN8_1 +70: + <<: *FAN_DEFAULTS + entityInstance: 46 + path: /xyz/openbmc_project/sensors/fan_tach/FAN8_2 +245: + <<: *FAN_DEFAULTS + entityInstance: 60 + path: /xyz/openbmc_project/sensors/fan_tach/PSU0_fan1 +246: + <<: *FAN_DEFAULTS + entityInstance: 61 + path: /xyz/openbmc_project/sensors/fan_tach/PSU1_fan1 + +73: &VOLTAGE_DEFAULTS + entityID: 0x13 + entityInstance: 9 + sensorType: 0x02 + path: /xyz/openbmc_project/sensors/voltage/S0_0V8_VDDC_SOC + sensorReadingType: 0x01 + multiplierM: 5 + offsetB: 0 + bExp: 0 + unit: xyz.openbmc_project.Sensor.Value.Unit.Volts + rExp: -3 + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double +74: + <<: *VOLTAGE_DEFAULTS + entityInstance: 11 + multiplierM: 7 + path: /xyz/openbmc_project/sensors/voltage/S0_0V75_PCP +75: + <<: *VOLTAGE_DEFAULTS + entityInstance: 13 + multiplierM: 7 + path: /xyz/openbmc_project/sensors/voltage/S0_1V2_VDDQ0123 +76: + <<: *VOLTAGE_DEFAULTS + entityInstance: 15 + multiplierM: 4 + path: /xyz/openbmc_project/sensors/voltage/S0_0V6_VTT0123 +77: + <<: *VOLTAGE_DEFAULTS + entityInstance: 17 + multiplierM: 15 + path: /xyz/openbmc_project/sensors/voltage/S0_2V5_VPP0123 +78: + <<: *VOLTAGE_DEFAULTS + entityInstance: 19 + multiplierM: 7 + path: /xyz/openbmc_project/sensors/voltage/S0_1V2_VDDQ4567 +79: + <<: *VOLTAGE_DEFAULTS + entityInstance: 21 + multiplierM: 4 + path: /xyz/openbmc_project/sensors/voltage/S0_0V6_VTT4567 +80: + <<: *VOLTAGE_DEFAULTS + entityInstance: 23 + multiplierM: 15 + path: /xyz/openbmc_project/sensors/voltage/S0_2V5_VPP4567 +81: + <<: *VOLTAGE_DEFAULTS + entityInstance: 25 + multiplierM: 5 + path: /xyz/openbmc_project/sensors/voltage/S0_0V85_RCA +82: + <<: *VOLTAGE_DEFAULTS + entityInstance: 27 + multiplierM: 11 + path: /xyz/openbmc_project/sensors/voltage/S0_1V8_VDDH +83: + <<: *VOLTAGE_DEFAULTS + entityInstance: 29 + multiplierM: 9 + path: /xyz/openbmc_project/sensors/voltage/S0_1V5_VDDH +84: + <<: *VOLTAGE_DEFAULTS + entityInstance: 31 + multiplierM: 11 + path: /xyz/openbmc_project/sensors/voltage/S0_1V8_SOC +85: + <<: *VOLTAGE_DEFAULTS + entityInstance: 33 + multiplierM: 11 + path: /xyz/openbmc_project/sensors/voltage/S0_1V8_PCP +86: + <<: *VOLTAGE_DEFAULTS + entityInstance: 35 + multiplierM: 20 + path: /xyz/openbmc_project/sensors/voltage/S0_3V3_SOC + +87: + <<: *VOLTAGE_DEFAULTS + entityInstance: 10 + multiplierM: 5 + path: /xyz/openbmc_project/sensors/voltage/S1_0V8_VDDC_SOC +88: + <<: *VOLTAGE_DEFAULTS + entityInstance: 12 + multiplierM: 7 + path: /xyz/openbmc_project/sensors/voltage/S1_0V75_PCP +89: + <<: *VOLTAGE_DEFAULTS + entityInstance: 14 + multiplierM: 7 + path: /xyz/openbmc_project/sensors/voltage/S1_1V2_VDDQ0123 +90: + <<: *VOLTAGE_DEFAULTS + entityInstance: 16 + multiplierM: 4 + path: /xyz/openbmc_project/sensors/voltage/S1_0V6_VTT0123 +91: + <<: *VOLTAGE_DEFAULTS + entityInstance: 18 + multiplierM: 15 + path: /xyz/openbmc_project/sensors/voltage/S1_2V5_VPP0123 +92: + <<: *VOLTAGE_DEFAULTS + entityInstance: 20 + multiplierM: 7 + path: /xyz/openbmc_project/sensors/voltage/S1_1V2_VDDQ4567 +93: + <<: *VOLTAGE_DEFAULTS + entityInstance: 22 + multiplierM: 4 + path: /xyz/openbmc_project/sensors/voltage/S1_0V6_VTT4567 +94: + <<: *VOLTAGE_DEFAULTS + entityInstance: 24 + multiplierM: 15 + path: /xyz/openbmc_project/sensors/voltage/S1_2V5_VPP4567 +95: + <<: *VOLTAGE_DEFAULTS + entityInstance: 26 + multiplierM: 5 + path: /xyz/openbmc_project/sensors/voltage/S1_0V85_RCA +96: + <<: *VOLTAGE_DEFAULTS + entityInstance: 28 + multiplierM: 11 + path: /xyz/openbmc_project/sensors/voltage/S1_1V8_VDDH +97: + <<: *VOLTAGE_DEFAULTS + entityInstance: 30 + multiplierM: 9 + path: /xyz/openbmc_project/sensors/voltage/S1_1V5_VDDH +98: + <<: *VOLTAGE_DEFAULTS + entityInstance: 32 + multiplierM: 11 + path: /xyz/openbmc_project/sensors/voltage/S1_1V8_SOC +99: + <<: *VOLTAGE_DEFAULTS + entityInstance: 34 + multiplierM: 11 + path: /xyz/openbmc_project/sensors/voltage/S1_1V8_PCP +100: + <<: *VOLTAGE_DEFAULTS + entityInstance: 36 + multiplierM: 20 + path: /xyz/openbmc_project/sensors/voltage/S1_3V3_SOC +101: + <<: *VOLTAGE_DEFAULTS + entityInstance: 37 + multiplierM: 20 + path: /xyz/openbmc_project/sensors/voltage/3V3_SB +102: + <<: *VOLTAGE_DEFAULTS + entityInstance: 38 + multiplierM: 18 + path: /xyz/openbmc_project/sensors/voltage/VBAT_RTC +230: + <<: *VOLTAGE_DEFAULTS + entityInstance: 74 + multiplierM: 18 + rExp: -1 + path: /xyz/openbmc_project/sensors/voltage/PSU0_VINPUT +231: + <<: *VOLTAGE_DEFAULTS + entityInstance: 75 + multiplierM: 18 + rExp: -1 + path: /xyz/openbmc_project/sensors/voltage/PSU1_VINPUT +232: + <<: *VOLTAGE_DEFAULTS + entityInstance: 76 + multiplierM: 18 + rExp: -2 + path: /xyz/openbmc_project/sensors/voltage/PSU0_VOUTPUT +233: + <<: *VOLTAGE_DEFAULTS + entityInstance: 77 + multiplierM: 18 + rExp: -2 + path: /xyz/openbmc_project/sensors/voltage/PSU1_VOUTPUT + +240: &power + sensorType: 0x08 + path: /xyz/openbmc_project/sensors/power/PSU0_POUTPUT + entityID: 19 + entityInstance: 84 + sensorReadingType: 0x01 + multiplierM: 80 + offsetB: 0 + bExp: 0 + unit: xyz.openbmc_project.Sensor.Value.Unit.Watts + rExp: -1 + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +241: + <<: *power + entityInstance: 85 + multiplierM: 80 + rExp: -1 + path: /xyz/openbmc_project/sensors/power/PSU1_POUTPUT + +242: + <<: *power + entityInstance: 57 + multiplierM: 80 + rExp: -1 + path: /xyz/openbmc_project/sensors/power/total_power + +238: + <<: *power + entityInstance: 82 + multiplierM: 80 + rExp: -1 + path: /xyz/openbmc_project/sensors/power/PSU0_PINPUT + +239: + <<: *power + entityInstance: 83 + multiplierM: 80 + rExp: -1 + path: /xyz/openbmc_project/sensors/power/PSU1_PINPUT + +234: ¤t + sensorType: 0x03 + path: /xyz/openbmc_project/sensors/current/PSU0_IINPUT + entityID: 19 + entityInstance: 78 + sensorReadingType: 0x01 + multiplierM: 80 + offsetB: 0 + bExp: 0 + unit: xyz.openbmc_project.Sensor.Value.Unit.Amperes + rExp: -3 + serviceInterface: org.freedesktop.DBus.Properties + readingType: readingData + interfaces: + xyz.openbmc_project.Sensor.Value: + Value: + Offsets: + 0xFF: + type: double + +235: + <<: *current + entityInstance: 79 + multiplierM: 80 + path: /xyz/openbmc_project/sensors/current/PSU1_IINPUT + +236: + <<: *current + entityInstance: 80 + multiplierM: 80 + path: /xyz/openbmc_project/sensors/current/PSU0_IOUTPUT + +237: + <<: *current + entityInstance: 81 + multiplierM: 80 + path: /xyz/openbmc_project/sensors/current/PSU1_IOUTPUT diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf new file mode 100644 index 000000000..c5fc23ace --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf @@ -0,0 +1,6 @@ +INVENTORY=/system/chassis/motherboard/powersupply0 +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=64 +NAME=powersupply0 +DRIVERS=/sys/bus/i2c/drivers/pmbus,6-0058 +EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf new file mode 100644 index 000000000..e591227d2 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf @@ -0,0 +1,6 @@ +INVENTORY=/system/chassis/motherboard/powersupply1 +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=65 +NAME=powersupply1 +DRIVERS=/sys/bus/i2c/drivers/pmbus,6-0059 +EXTRA_IFACES=xyz.openbmc_project.Inventory.Item.PowerSupply diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend new file mode 100644 index 000000000..0bff1c777 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend @@ -0,0 +1,12 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +TMPL_POWERSUPPLY = "phosphor-gpio-presence@.service" +INSTFMT_POWERSUPPLY = "phosphor-gpio-presence@{0}.service" +POWERSUPPLY_TGT = "multi-user.target" +FMT_POWERSUPPLY = "../${TMPL_POWERSUPPLY}:${POWERSUPPLY_TGT}.requires/${INSTFMT_POWERSUPPLY}" + +SYSTEMD_LINK_${PN}-presence_append_mtjade = " ${@compose_list(d, 'FMT_POWERSUPPLY', 'OBMC_POWER_SUPPLY_INSTANCES')}" + +POWERSUPPLY_ENV_FMT = "obmc/gpio/phosphor-power-supply-{0}.conf" + +SYSTEMD_ENVIRONMENT_FILE_${PN}-presence_append_mtjade = " ${@compose_list(d, 'POWERSUPPLY_ENV_FMT', 'OBMC_POWER_SUPPLY_INSTANCES')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb new file mode 100644 index 000000000..9f7b24f00 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset.bb @@ -0,0 +1,33 @@ +SUMMARY = "Ampere Computing LLC PSU Hot Swap Reseting application" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit obmc-phosphor-systemd +inherit allarch + +DEPENDS += "virtual/obmc-gpio-monitor" +RDEPENDS_${PN} += "virtual/obmc-gpio-monitor" + +OBMC_PSU_MONITOR_INSTANCES = "PSU1_B25 PSU2_B25" + +# Copies config file having arguments for psu +# via GPIO assertion +SYSTEMD_ENVIRONMENT_FILE_${PN} +="obmc/gpio/PSU1_B25 \ + obmc/gpio/PSU2_B25 \ + " +SYSTEMD_SERVICE_${PN} ?= "psu1_hotswap_reset.service psu2_hotswap_reset.service" + +SRC_URI += "file://ampere_psu_reset_hotswap.sh" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${WORKDIR}/ampere_psu_reset_hotswap.sh \ + ${D}${bindir}/ampere_psu_reset_hotswap.sh +} + +GPIO_MONITOR_TMPL = "phosphor-gpio-monitor@.service" +GPIO_MONITOR_TGTFMT = "phosphor-gpio-monitor@{0}.service" +TGT = "multi-user.target" +PSU_MONITOR_FMT = "../${GPIO_MONITOR_TMPL}:${TGT}.requires/${GPIO_MONITOR_TGTFMT}" +SYSTEMD_LINK_${PN} += "${@compose_list(d, 'PSU_MONITOR_FMT', 'OBMC_PSU_MONITOR_INSTANCES', 'OBMC_HOST_INSTANCES')}" diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/ampere_psu_reset_hotswap.sh b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/ampere_psu_reset_hotswap.sh new file mode 100644 index 000000000..65bff9dc1 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/ampere_psu_reset_hotswap.sh @@ -0,0 +1,74 @@ +#!/bin/sh + +# When system only use single PSU ( ex : PSU1 ) to power ON normal 12V, +# HSC2 will be trigged Fault event (FET health). +# At this time, to plug-in PSU2 in system, PSU2 won't deliver power to +# +12V_MB because HSC2 is protected by Fault event. +# Due to HSC2 protected, the PSU redundancy mechanism can't be created. +# Once PSU1 is plugged out at this moment, system will crash ( reset ) +# because +12V_MB dropped. + +# BMC SW work-around solution: +# - When BMC detect event PSU is plugged in system, BMC will reset HSC +# by disbale HOT SWAP and then enable HOT SWAP through pmbus command to clear +# Fault event. + +# Note: +# In case hot swap occurs during BMC reset, BMC still not in operation state, +# BMC can't detect PSU plug/unplug, then the work-around won't be executed + +# Author: Chanh Nguyen <chnguyen@amperecomputing.com> + +HSC1_PMBUS_NUM=10 +HSC2_PMBUS_NUM=10 +HSC1_SLAVE_ADDR=0x10 +HSC2_SLAVE_ADDR=0x11 +OPERATION=0x01 +STATUS_MFR_SPECIFIC=0x80 + +# $1 will be the name of the psu +PSU=$1 + +if [[ $PSU == 1 ]]; then + HSC_PMBUS_NUM=$HSC1_PMBUS_NUM + HSC_SLAVE_ADDR=$HSC1_SLAVE_ADDR +elif [[ $PSU == 2 ]]; then + HSC_PMBUS_NUM=$HSC2_PMBUS_NUM + HSC_SLAVE_ADDR=$HSC2_SLAVE_ADDR +else + echo "Please choose PSU1 (1) or PSU2 (2)" + echo "Ex: ampere_psu_reset_hotswap.sh 1" + exit 0 +fi + +# Check HOST state +chassisstate=$(obmcutil chassisstate | awk -F. '{print $NF}') +if [[ "$chassisstate" == 'Off' ]]; then + echo "HOST is being OFF, so can't access the i2c $HSC_PMBUS_NUM. Please Turn ON HOST !" + exit 1 +fi + +# Check FET health problems +data=$(i2cget -f -y $HSC_PMBUS_NUM $HSC_SLAVE_ADDR $STATUS_MFR_SPECIFIC) + +if [[ $? -ne 0 ]]; then + echo "ERROR: Can't access the i2c. Please check /dev/i2c-$HSC_PMBUS_NUM" + exit 1 +fi + +psu_sts=$(((data & 0x80) != 0)) + +if [[ $psu_sts == 1 ]]; then + echo "PSU $PSU: FET health problems have been detected" + echo "Reset Hot swap output on PSU $PSU" + # Disable Hot swap output + write_data=0x00 + i2cset -f -y $HSC_PMBUS_NUM $HSC_SLAVE_ADDR $OPERATION $write_data b + + # Enable Hot swap output + write_data=0x80; + i2cset -f -y $HSC_PMBUS_NUM $HSC_SLAVE_ADDR $OPERATION $write_data b + +else + echo "PSU $PSU: FET health problems have not been detected" +fi
\ No newline at end of file diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/obmc/gpio/PSU1_B25 b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/obmc/gpio/PSU1_B25 new file mode 100644 index 000000000..b0ce1a83e --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/obmc/gpio/PSU1_B25 @@ -0,0 +1,4 @@ +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=60 +POLARITY=0 +TARGET=psu1_hotswap_reset.service diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/obmc/gpio/PSU2_B25 b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/obmc/gpio/PSU2_B25 new file mode 100644 index 000000000..ac50f5375 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/obmc/gpio/PSU2_B25 @@ -0,0 +1,4 @@ +DEVPATH=/dev/input/by-path/platform-gpio-keys-event +KEY=61 +POLARITY=0 +TARGET=psu2_hotswap_reset.service diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/psu1_hotswap_reset.service b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/psu1_hotswap_reset.service new file mode 100644 index 000000000..fec3ad6a2 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/psu1_hotswap_reset.service @@ -0,0 +1,6 @@ +[Unit] +Description=Ampere Computing LLC PSU1 reset hotswap + +[Service] +Restart=no +ExecStart=ampere_psu_reset_hotswap.sh 1 diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/psu2_hotswap_reset.service b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/psu2_hotswap_reset.service new file mode 100644 index 000000000..fdb8692a5 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/psu-hotswap-reset/psu2_hotswap_reset.service @@ -0,0 +1,6 @@ +[Unit] +Description=Ampere Computing LLC PSU2 reset hotswap + +[Service] +Restart=no +ExecStart=ampere_psu_reset_hotswap.sh 2 diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json index bc9cfee32..e7b3256a8 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json +++ b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json @@ -1,5 +1,53 @@ [ { + "path": "system/chassis/motherboard/powersupply0", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/PSU0_fan1", + "/xyz/openbmc_project/sensors/temperature/PSU0_TEMP", + "/xyz/openbmc_project/sensors/voltage/PSU0_VINPUT", + "/xyz/openbmc_project/sensors/voltage/PSU0_VOUTPUT", + "/xyz/openbmc_project/sensors/power/PSU0_PINPUT", + "/xyz/openbmc_project/sensors/power/PSU0_POUTPUT", + "/xyz/openbmc_project/sensors/current/PSU0_IINPUT", + "/xyz/openbmc_project/sensors/current/PSU0_IOUTPUT" + ] + } + ] + }, + { + "path": "system/chassis/motherboard/powersupply1", + "endpoints": + [ + { + "types": + { + "rType": "inventory", + "fType": "sensors" + }, + "paths": + [ + "/xyz/openbmc_project/sensors/fan_tach/PSU1_fan1", + "/xyz/openbmc_project/sensors/temperature/PSU1_TEMP", + "/xyz/openbmc_project/sensors/voltage/PSU1_VINPUT", + "/xyz/openbmc_project/sensors/voltage/PSU1_VOUTPUT", + "/xyz/openbmc_project/sensors/power/PSU1_PINPUT", + "/xyz/openbmc_project/sensors/power/PSU1_POUTPUT", + "/xyz/openbmc_project/sensors/current/PSU1_IINPUT", + "/xyz/openbmc_project/sensors/current/PSU1_IOUTPUT" + ] + } + ] + }, + { "path": "system/chassis", "endpoints": [ @@ -35,36 +83,57 @@ "/xyz/openbmc_project/sensors/temperature/PSU0_TEMP", "/xyz/openbmc_project/sensors/temperature/PSU1_TEMP", - "/xyz/openbmc_project/sensors/voltage/S0_0V6_VTT0123", - "/xyz/openbmc_project/sensors/voltage/S0_0V6_VTT4567", - "/xyz/openbmc_project/sensors/voltage/S0_0V75_PCP", "/xyz/openbmc_project/sensors/voltage/S0_0V8_VDDC_SOC", - "/xyz/openbmc_project/sensors/voltage/S0_0V85_RCA", + "/xyz/openbmc_project/sensors/voltage/S0_0V75_PCP", "/xyz/openbmc_project/sensors/voltage/S0_1V2_VDDQ0123", + "/xyz/openbmc_project/sensors/voltage/S0_0V6_VTT0123", + "/xyz/openbmc_project/sensors/voltage/S0_2V5_VPP0123", "/xyz/openbmc_project/sensors/voltage/S0_1V2_VDDQ4567", - "/xyz/openbmc_project/sensors/voltage/S0_1V5_VDDH", + "/xyz/openbmc_project/sensors/voltage/S0_0V6_VTT4567", + "/xyz/openbmc_project/sensors/voltage/S0_2V5_VPP4567", + "/xyz/openbmc_project/sensors/voltage/S0_0V85_RCA", "/xyz/openbmc_project/sensors/voltage/S0_1V8_VDDH", + "/xyz/openbmc_project/sensors/voltage/S0_1V5_VDDH", "/xyz/openbmc_project/sensors/voltage/S0_1V8_SOC", "/xyz/openbmc_project/sensors/voltage/S0_1V8_PCP", - "/xyz/openbmc_project/sensors/voltage/S0_2V5_VPP0123", - "/xyz/openbmc_project/sensors/voltage/S0_2V5_VPP4567", "/xyz/openbmc_project/sensors/voltage/S0_3V3_SOC", - "/xyz/openbmc_project/sensors/voltage/S1_0V6_VTT0123", - "/xyz/openbmc_project/sensors/voltage/S1_0V6_VTT4567", - "/xyz/openbmc_project/sensors/voltage/S1_0V75_PCP", + "/xyz/openbmc_project/sensors/voltage/S0_CPU_VCORE", + "/xyz/openbmc_project/sensors/voltage/S0_DIMM_DDR_Volt", + "/xyz/openbmc_project/sensors/voltage/S0_DIMM_VR1_Volt", + "/xyz/openbmc_project/sensors/voltage/S0_DIMM_VR2_Volt", + "/xyz/openbmc_project/sensors/voltage/S0_RCA_VR_Volt", + "/xyz/openbmc_project/sensors/voltage/S0_SOC_Volt", "/xyz/openbmc_project/sensors/voltage/S1_0V8_VDDC_SOC", - "/xyz/openbmc_project/sensors/voltage/S1_0V85_RCA", + "/xyz/openbmc_project/sensors/voltage/S1_0V75_PCP", "/xyz/openbmc_project/sensors/voltage/S1_1V2_VDDQ0123", + "/xyz/openbmc_project/sensors/voltage/S1_0V6_VTT0123", + "/xyz/openbmc_project/sensors/voltage/S1_2V5_VPP0123", "/xyz/openbmc_project/sensors/voltage/S1_1V2_VDDQ4567", - "/xyz/openbmc_project/sensors/voltage/S1_1V5_VDDH", + "/xyz/openbmc_project/sensors/voltage/S1_0V6_VTT4567", + "/xyz/openbmc_project/sensors/voltage/S1_2V5_VPP4567", + "/xyz/openbmc_project/sensors/voltage/S1_0V85_RCA", "/xyz/openbmc_project/sensors/voltage/S1_1V8_VDDH", + "/xyz/openbmc_project/sensors/voltage/S1_1V5_VDDH", "/xyz/openbmc_project/sensors/voltage/S1_1V8_SOC", "/xyz/openbmc_project/sensors/voltage/S1_1V8_PCP", - "/xyz/openbmc_project/sensors/voltage/S1_2V5_VPP0123", - "/xyz/openbmc_project/sensors/voltage/S1_2V5_VPP4567", "/xyz/openbmc_project/sensors/voltage/S1_3V3_SOC", "/xyz/openbmc_project/sensors/voltage/3V3_SB", - "/xyz/openbmc_project/sensors/voltage/VBAT_RTC" + "/xyz/openbmc_project/sensors/voltage/VBAT_RTC", + "/xyz/openbmc_project/sensors/voltage/PSU0_VINPUT", + "/xyz/openbmc_project/sensors/voltage/PSU0_VOUTPUT", + "/xyz/openbmc_project/sensors/voltage/PSU1_VINPUT", + "/xyz/openbmc_project/sensors/voltage/PSU1_VOUTPUT", + + "/xyz/openbmc_project/sensors/power/PSU0_PINPUT", + "/xyz/openbmc_project/sensors/power/PSU1_PINPUT", + "/xyz/openbmc_project/sensors/power/PSU0_POUTPUT", + "/xyz/openbmc_project/sensors/power/PSU1_POUTPUT", + "/xyz/openbmc_project/sensors/power/total_power", + + "/xyz/openbmc_project/sensors/current/PSU0_IINPUT", + "/xyz/openbmc_project/sensors/current/PSU0_IOUTPUT", + "/xyz/openbmc_project/sensors/current/PSU1_IINPUT", + "/xyz/openbmc_project/sensors/current/PSU1_IOUTPUT" ] } ] diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend index 980746ede..c0bcbdd3a 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend @@ -5,6 +5,7 @@ DEPENDS_append_mtjade = " mtjade-yaml-config" RRECOMMENDS_${PN} += "ipmitool" EXTRA_OECONF_mtjade = " \ + SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-sensors-${MACHINE}.yaml \ FRU_YAML_GEN=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-fru-read.yaml \ " diff --git a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend index c84a7f106..f41e5bcd7 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend +++ b/meta-ampere/meta-jade/recipes-phosphor/packagegroups/packagegroup-obmc-apps.bbappend @@ -1,2 +1,2 @@ RDEPENDS_${PN}-extras_append_mtjade = " webui-vue phosphor-image-signing" -RDEPENDS_${PN}-inventory_append_mtjade = " fault-monitor id-button" +RDEPENDS_${PN}-inventory_append_mtjade = " fault-monitor id-button psu-hotswap-reset" 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 index 2ea76ae96..5d1ed0944 100644 --- 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 @@ -1,5 +1,3 @@ LABEL_temp1=TS1_Temp CRITHI_temp1=50000 CRITLO_temp1=1000 -WARNHI_temp1=48000 -WARNLO_temp1=3000 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 index 186ae09d7..2429d8e14 100644 --- 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 @@ -1,5 +1,3 @@ LABEL_temp1=TS2_Temp CRITHI_temp1=50000 CRITLO_temp1=1000 -WARNHI_temp1=48000 -WARNLO_temp1=3000 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 index f87872b84..60d2783ae 100644 --- 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 @@ -1,5 +1,3 @@ LABEL_temp1=TS3_Temp CRITHI_temp1=50000 CRITLO_temp1=1000 -WARNHI_temp1=48000 -WARNLO_temp1=3000 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 index a2229ece9..9b7987400 100644 --- 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 @@ -1,5 +1,3 @@ LABEL_temp1=TS4_Temp CRITHI_temp1=50000 CRITLO_temp1=1000 -WARNHI_temp1=48000 -WARNLO_temp1=3000 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 index 4cd5b1bfc..c9fc00c05 100644 --- 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 @@ -1,5 +1,3 @@ LABEL_temp1=TS5_Temp CRITHI_temp1=50000 CRITLO_temp1=1000 -WARNHI_temp1=48000 -WARNLO_temp1=3000 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 index 6f72d2a21..6c71eca5d 100644 --- 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 @@ -1,5 +1,3 @@ LABEL_temp1=TS6_Temp CRITHI_temp1=50000 CRITLO_temp1=1000 -WARNHI_temp1=48000 -WARNLO_temp1=3000 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 index a1ff27801..944085d4d 100644 --- 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 @@ -1,15 +1,17 @@ LABEL_temp1= "PSU0_TEMP" CRITHI_temp1=64000 -CRITLO_temp1=1000 -WARNHI_temp1=62000 -WARNLO_temp1=3000 -LABEL_power2= "PSU0_POUT" +LABEL_power2= "PSU0_POUTPUT" LABEL_fan1="PSU0_fan1" CRITHI_fan1=20300 -CRITLO_fan1=500 -WARNHI_fan1=19300 -WARNLO_fan1=600 + +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 index f1e722241..15b965551 100644 --- 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 @@ -1,15 +1,17 @@ LABEL_temp1 = "PSU1_TEMP" CRITHI_temp1=64000 -CRITLO_temp1=1000 -WARNHI_temp1=62000 -WARNLO_temp1=3000 -LABEL_power2 = "PSU1_POUT" +LABEL_power2 = "PSU1_POUTPUT" LABEL_fan1 = "PSU1_fan1" CRITHI_fan1=20300 -CRITLO_fan1=500 -WARNHI_fan1=19300 -WARNLO_fan1=600 + +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 index 6448c37c5..b14392bea 100644 --- 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 @@ -1,74 +1,50 @@ LABEL_fan5 = "FAN3_1" CRITLO_fan5=500 CRITHI_fan5=23100 -WARNLO_fan5=1600 -WARNHI_fan5=22000 LABEL_fan6 = "FAN3_2" CRITLO_fan6=500 CRITHI_fan6=23100 -WARNLO_fan6=1600 -WARNHI_fan6=22000 LABEL_fan7 = "FAN4_1" CRITLO_fan7=500 CRITHI_fan7=23100 -WARNLO_fan7=1600 -WARNHI_fan7=22000 LABEL_fan8 = "FAN4_2" CRITLO_fan8=500 CRITHI_fan8=23100 -WARNLO_fan8=1600 -WARNHI_fan8=22000 LABEL_fan9 = "FAN5_1" CRITLO_fan9=500 CRITHI_fan9=23100 -WARNLO_fan9=1600 -WARNHI_fan9=22000 LABEL_fan10 = "FAN5_2" CRITLO_fan10=500 CRITHI_fan10=23100 -WARNLO_fan10=1600 -WARNHI_fan10=22000 LABEL_fan11 = "FAN6_1" CRITLO_fan11=500 CRITHI_fan11=23100 -WARNLO_fan11=1600 -WARNHI_fan11=22000 LABEL_fan12 = "FAN6_2" CRITLO_fan12=500 CRITHI_fan12=23100 -WARNLO_fan12=1600 -WARNHI_fan12=22000 LABEL_fan13 = "FAN7_1" CRITLO_fan13=500 CRITHI_fan13=23100 -WARNLO_fan13=1600 -WARNHI_fan13=22000 LABEL_fan14 = "FAN7_2" CRITLO_fan14=500 CRITHI_fan14=23100 -WARNLO_fan14=1600 -WARNHI_fan14=22000 LABEL_fan15 = "FAN8_1" CRITLO_fan15=500 CRITHI_fan15=23100 -WARNLO_fan15=1600 -WARNHI_fan15=22000 LABEL_fan16 = "FAN8_2" CRITLO_fan16=500 CRITHI_fan16=23100 -WARNLO_fan16=1600 -WARNHI_fan16=22000 PWM_TARGET_fan5 = "3" PWM_TARGET_fan6 = "3" 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 index d144cfd28..a5c5c2a45 100644 --- 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 @@ -2,5 +2,3 @@ LABEL_in1=3V3_SB GAIN_in1=3 CRITHI_in1=3960 CRITLO_in1=2320 -WARNHI_in1=3920 -WARNLO_in1=2360 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 index 50a45e3b4..3cc58229d 100644 --- 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 @@ -2,8 +2,6 @@ LABEL_in1=VBAT_RTC GAIN_in1=3 CRITHI_in1=3564 CRITLO_in1=2106 -WARNHI_in1=3528 -WARNLO_in1=2142 # GPIOS4 needs to be pulled high for battery voltage reading GPIOCHIP_in1=0 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 index 46b975d7c..4e46123ae 100644 --- 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 @@ -1,179 +1,123 @@ LABEL_in1=S0_0V8_VDDC_SOC CRITHI_in1=960 CRITLO_in1=560 -WARNHI_in1=950 -WARNLO_in1=570 LABEL_in2=S1_0V8_VDDC_SOC CRITHI_in2=960 CRITLO_in2=560 -WARNHI_in2=950 -WARNLO_in2=570 LABEL_in3=S0_0V75_PCP CRITHI_in3=1323 CRITLO_in3=504 -WARNHI_in3=1295 -WARNLO_in3=532 LABEL_in4=S1_0V75_PCP CRITHI_in4=1323 CRITLO_in4=504 -WARNHI_in4=1295 -WARNLO_in4=532 LABEL_in5=S0_1V2_VDDQ0123 CRITHI_in5=1442 CRITLO_in5=840 -WARNHI_in5=1330 -WARNLO_in5=854 LABEL_in6=S1_1V2_VDDQ0123 CRITHI_in6=1442 CRITLO_in6=840 -WARNHI_in6=1330 -WARNLO_in6=854 LABEL_in7=S0_0V6_VTT0123 CRITHI_in7=720 CRITLO_in7=420 -WARNHI_in7=712 -WARNLO_in7=428 LABEL_in8=S1_0V6_VTT0123 CRITHI_in8=720 CRITLO_in8=420 -WARNHI_in8=648 -WARNLO_in8=460 LABEL_in9=S0_2V5_VPP0123 GAIN_in9=2 CRITHI_in9=3000 CRITLO_in9=1755 -WARNHI_in9=2970 -WARNLO_in9=1785 LABEL_in10=S1_2V5_VPP0123 GAIN_in10=2 CRITHI_in10=3000 CRITLO_in10=1755 -WARNHI_in10=2970 -WARNLO_in10=1785 LABEL_in11=S0_1V2_VDDQ4567 CRITHI_in11=1442 CRITLO_in11=840 -WARNHI_in11=1330 -WARNLO_in11=854 LABEL_in12=S1_1V2_VDDQ4567 CRITHI_in12=1442 CRITLO_in12=840 -WARNHI_in12=1330 -WARNLO_in12=854 LABEL_in13=S0_0V6_VTT4567 CRITHI_in13=720 CRITLO_in13=420 -WARNHI_in13=712 -WARNLO_in13=428 LABEL_in14=S1_0V6_VTT4567 CRITHI_in14=720 CRITLO_in14=420 -WARNHI_in14=712 -WARNLO_in14=428 LABEL_in15=S0_2V5_VPP4567 GAIN_in15=2 CRITHI_in15=3000 CRITLO_in15=1755 -WARNHI_in15=2970 -WARNLO_in15=1785 LABEL_in16=S1_2V5_VPP4567 GAIN_in16=2 CRITHI_in16=3000 CRITLO_in16=1755 -WARNHI_in16=2970 -WARNLO_in16=1785 LABEL_in17=S0_0V85_RCA -CRITHI_in17=1020 -CRITLO_in17=595 -WARNHI_in17=1005 -WARNLO_in17=610 +CRITHI_in17=1080 +CRITLO_in17=630 LABEL_in18=S1_0V85_RCA -CRITHI_in18=1020 -CRITLO_in18=595 -WARNHI_in18=1005 -WARNLO_in18=610 +CRITHI_in18=1080 +CRITLO_in18=630 LABEL_in19=S0_1V8_VDDH GAIN_in19=2 CRITHI_in19=2156 CRITLO_in19=1265 -WARNHI_in19=2134 -WARNLO_in19=1287 LABEL_in20=S1_1V8_VDDH GAIN_in20=2 CRITHI_in20=2156 CRITLO_in20=1265 -WARNHI_in20=2134 -WARNLO_in20=1287 LABEL_in21=S0_1V5_VDDH CRITHI_in21=1800 CRITLO_in21=1053 -WARNHI_in21=1782 -WARNLO_in21=1071 LABEL_in22=S1_1V5_VDDH CRITHI_in22=1800 CRITLO_in22=1053 -WARNHI_in22=1782 -WARNLO_in22=1071 LABEL_in23=S0_1V8_SOC GAIN_in23=2 CRITHI_in23=2156 CRITLO_in23=1265 -WARNHI_in23=2134 -WARNLO_in23=1287 LABEL_in24=S1_1V8_SOC GAIN_in24=2 CRITHI_in24=2156 CRITLO_in24=1265 -WARNHI_in24=2134 -WARNLO_in24=1287 LABEL_in25=S0_1V8_PCP GAIN_in25=2 CRITHI_in25=2156 CRITLO_in25=1265 -WARNHI_in25=2134 -WARNLO_in25=1287 LABEL_in26=S1_1V8_PCP GAIN_in26=2 CRITHI_in26=2156 CRITLO_in26=1265 -WARNHI_in26=2134 -WARNLO_in26=1287 LABEL_in27=S0_3V3_SOC GAIN_in27=3 CRITHI_in27=3960 CRITLO_in27=2320 -WARNHI_in27=3920 -WARNLO_in27=2360 LABEL_in28=S1_3V3_SOC GAIN_in28=3 CRITHI_in28=3960 CRITLO_in28=2320 -WARNHI_in28=3920 -WARNLO_in28=2360 |