From cd92b83260b660c8df5a7c047885ef1c79b8fe99 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Tue, 14 Dec 2021 13:06:22 +0000 Subject: meta-ampere: mtjade: fru: use dynamic sensors Change to use dynamic sensors for FRU support to take advantage of IPMI fru read/write commands. Tested: 1. Check FRU reading $ ipmitool fru print 2. Write fru.bin into FRU EEPROM Signed-off-by: Thang Q. Nguyen Signed-off-by: Thang Tran Change-Id: I0d0b52ae7b0fd301a14d0d2894268637d867a5b8 --- .../configuration/mtjade-yaml-config.bb | 19 +- .../mtjade-yaml-config/ipmi-sensors-mtjade.yaml | 399 --------------------- .../mtjade-ipmi-fru-properties.yaml | 23 -- .../mtjade-yaml-config/mtjade-ipmi-fru.yaml | 85 ----- .../mtjade-yaml-config/mtjade-ipmi-sensors.yaml | 399 +++++++++++++++++++++ .../obmc/eeproms/system/chassis/motherboard | 2 - .../ipmi/phosphor-ipmi-fru_%.bbappend | 26 -- .../ipmi/phosphor-ipmi-host_%.bbappend | 16 +- 8 files changed, 413 insertions(+), 556 deletions(-) delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/ipmi-sensors-mtjade.yaml delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru-properties.yaml create mode 100644 meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-sensors.yaml delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend (limited to 'meta-ampere/meta-jade/recipes-phosphor') 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 c9f27020f..376ebc075 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,27 +5,18 @@ 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 \ + file://mtjade-ipmi-sensors.yaml \ " 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 - install -m 0644 -D fru-read.yaml \ - ${D}${datadir}/${BPN}/ipmi-fru-read.yaml + install -m 0644 -D mtjade-ipmi-sensors.yaml \ + ${D}${datadir}/${BPN}/ipmi-sensors.yaml } FILES:${PN}-dev = " \ - ${datadir}/${BPN}/ipmi-sensors-${MACHINE}.yaml \ - ${datadir}/${BPN}/ipmi-extra-properties.yaml \ - ${datadir}/${BPN}/ipmi-fru-read.yaml \ - " + ${datadir}/${BPN}/ipmi-sensors.yaml \ + " ALLOW_EMPTY:${PN} = "1" 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 deleted file mode 100644 index 959f353f3..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/ipmi-sensors-mtjade.yaml +++ /dev/null @@ -1,399 +0,0 @@ -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/configuration/mtjade-yaml-config/mtjade-ipmi-fru-properties.yaml b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru-properties.yaml deleted file mode 100644 index db8de9f40..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru-properties.yaml +++ /dev/null @@ -1,23 +0,0 @@ -/system/chassis/motherboard: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system/chassis: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' - -/system: - xyz.openbmc_project.Inventory.Decorator.Replaceable: - FieldReplaceable: 'true' - xyz.openbmc_project.Inventory.Decorator.Cacheable: - Cached: 'true' - xyz.openbmc_project.Inventory.Item: - Present: 'true' diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru.yaml b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru.yaml index 80bcce434..e69de29bb 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru.yaml +++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-fru.yaml @@ -1,85 +0,0 @@ -0x00: - /system/chassis/motherboard: - entityID: 7 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Asset: - BuildDate: - IPMIFruProperty: Mfg Date - IPMIFruSection: Board - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Board - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Board - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Item.NetworkInterface: - MACAddress: - IPMIFruProperty: Custom Field 1 - IPMIFruSection: Board - xyz.openbmc_project.Inventory.Decorator.VendorInformation: - CustomField1: - IPMIFruProperty: FRU File ID - IPMIFruSection: Board - xyz.openbmc_project.Common.UUID: - UUID: - IPMIFruProperty: UUID - IPMIFruSection: MultiRecord - /system/chassis: - entityID: 23 - entityInstance: 1 - interfaces: - xyz.openbmc_project.Inventory.Decorator.Asset: - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Chassis - PartNumber: - IPMIFruProperty: Part Number - IPMIFruSection: Chassis - Model: - IPMIFruProperty: Type - IPMIFruSection: Chassis - xyz.openbmc_project.Inventory.Decorator.VendorInformation: - CustomField2: - IPMIFruProperty: Custom Field 1 - IPMIFruSection: Chassis - /system: - entityID: 7 - entityInstance: 2 - interfaces: - xyz.openbmc_project.Inventory.Item: - PrettyName: - IPMIFruProperty: Name - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Asset: - PartNumber: - IPMIFruProperty: Model Number - IPMIFruSection: Product - Manufacturer: - IPMIFruProperty: Manufacturer - IPMIFruSection: Product - SerialNumber: - IPMIFruProperty: Serial Number - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.Revision: - Version: - IPMIFruProperty: Version - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.AssetTag: - AssetTag: - IPMIFruProperty: Asset Tag - IPMIFruSection: Product - xyz.openbmc_project.Inventory.Decorator.VendorInformation: - CustomField1: - IPMIFruProperty: FRU File ID - IPMIFruSection: Product - CustomField2: - IPMIFruProperty: Custom Field 1 - IPMIFruSection: Product diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-sensors.yaml b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-sensors.yaml new file mode 100644 index 000000000..959f353f3 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/mtjade-yaml-config/mtjade-ipmi-sensors.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/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard deleted file mode 100644 index f0498347b..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru/obmc/eeproms/system/chassis/motherboard +++ /dev/null @@ -1,2 +0,0 @@ -SYSFS_PATH=/sys/bus/i2c/devices/3-0050/eeprom -FRUID=0 diff --git a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend deleted file mode 100644 index 5150e2312..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend +++ /dev/null @@ -1,26 +0,0 @@ -inherit obmc-phosphor-systemd - -DEPENDS:append:mtjade = " mtjade-yaml-config" - -EXTRA_OECONF:mtjade = " \ - YAML_GEN=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-fru-read.yaml \ - PROP_YAML=${STAGING_DIR_HOST}${datadir}/mtjade-yaml-config/ipmi-extra-properties.yaml \ - " -FILESEXTRAPATHS:prepend:mtjade := "${THISDIR}/${PN}:" - -EEPROM_NAMES = "motherboard" - -EEPROMFMT = "system/chassis/{0}" -EEPROM_ESCAPEDFMT = "system-chassis-{0}" -EEPROMS = "${@compose_list(d, 'EEPROMFMT', 'EEPROM_NAMES')}" -EEPROMS_ESCAPED = "${@compose_list(d, 'EEPROM_ESCAPEDFMT', 'EEPROM_NAMES')}" - -ENVFMT = "obmc/eeproms/{0}" -SYSTEMD_ENVIRONMENT_FILE:${PN}:append:mtjade := "${@compose_list(d, 'ENVFMT', 'EEPROMS')}" - -TMPL = "obmc-read-eeprom@.service" -TGT = "multi-user.target" -INSTFMT = "obmc-read-eeprom@{0}.service" -FMT = "../${TMPL}:${TGT}.wants/${INSTFMT}" - -SYSTEMD_LINK:${PN}:append:mtjade := "${@compose_list(d, 'FMT', 'EEPROMS_ESCAPED')}" 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 fce5b74eb..04fff3d63 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 @@ -1,6 +1,6 @@ -FILESEXTRAPATHS:append:mtjade := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:append := "${THISDIR}/${PN}:" -DEPENDS:append:mtjade = " mtjade-yaml-config" +DEPENDS:append = " ${MACHINE}-yaml-config" RRECOMMENDS:${PN} += "ipmitool" RDEPENDS:${PN} += "bash" @@ -10,14 +10,16 @@ SRC_URI += " \ file://ampere.xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service \ " -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 \ - " +EXTRA_OECONF = " \ + SENSOR_YAML_GEN=${STAGING_DIR_HOST}${datadir}/${MACHINE}-yaml-config/ipmi-sensors.yaml \ + " AMPERE_SOFTPOWEROFF_TMPL = "ampere.xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service" -do_install:append:mtjade(){ +PACKAGECONFIG:append = " dynamic-sensors" +HOSTIPMI_PROVIDER_LIBRARY += "libdynamiccmds.so" + +do_install:append(){ install -d ${D}${includedir}/phosphor-ipmi-host install -m 0644 -D ${S}/selutility.hpp ${D}${includedir}/phosphor-ipmi-host install -m 0755 ${WORKDIR}/ampere-phosphor-softpoweroff ${D}/${bindir}/phosphor-softpoweroff -- cgit v1.2.3 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 --- .../configuration/dbus-sensors_%.bbappend | 1 + .../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 ------ 14 files changed, 1 insertion(+), 281 deletions(-) create mode 100644 meta-ampere/meta-jade/recipes-phosphor/configuration/dbus-sensors_%.bbappend 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') diff --git a/meta-ampere/meta-jade/recipes-phosphor/configuration/dbus-sensors_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/configuration/dbus-sensors_%.bbappend new file mode 100644 index 000000000..bfd03f8c5 --- /dev/null +++ b/meta-ampere/meta-jade/recipes-phosphor/configuration/dbus-sensors_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG:remove = " cpusensor ipmbsensor" 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') 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 From 775dfa41360e48d926489c18553fb4997d4f7d37 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Wed, 22 Dec 2021 09:54:52 +0000 Subject: meta-ampere: mtjade: clean up phosphor-hwmon configs Disable phosphor-hwmon from compilation and clean up sensor inventory which added before for phosphor-hwmon. Tested: 1. Check if no phosphor-hwmon compiled and run 2. Check all S0 and S1 ADC sensors are still available in Redfish. Signed-off-by: Thang Q. Nguyen Change-Id: Ic6ac13963e755e6ef0d93b3f6486546c61b1abe0 --- .../phosphor-inventory-manager/associations.json | 63 +--------------------- .../packagegroups/packagegroup-obmc-apps.bbappend | 14 +++-- 2 files changed, 10 insertions(+), 67 deletions(-) (limited to 'meta-ampere/meta-jade/recipes-phosphor') 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 e7b3256a8..5e535d502 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 @@ -72,68 +72,7 @@ "/xyz/openbmc_project/sensors/fan_tach/FAN8_1", "/xyz/openbmc_project/sensors/fan_tach/FAN8_2", "/xyz/openbmc_project/sensors/fan_tach/PSU0_fan1", - "/xyz/openbmc_project/sensors/fan_tach/PSU1_fan1", - - "/xyz/openbmc_project/sensors/temperature/TS1_Temp", - "/xyz/openbmc_project/sensors/temperature/TS2_Temp", - "/xyz/openbmc_project/sensors/temperature/TS3_Temp", - "/xyz/openbmc_project/sensors/temperature/TS4_Temp", - "/xyz/openbmc_project/sensors/temperature/TS5_Temp", - "/xyz/openbmc_project/sensors/temperature/TS6_Temp", - "/xyz/openbmc_project/sensors/temperature/PSU0_TEMP", - "/xyz/openbmc_project/sensors/temperature/PSU1_TEMP", - - "/xyz/openbmc_project/sensors/voltage/S0_0V8_VDDC_SOC", - "/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_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_3V3_SOC", - "/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_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_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_3V3_SOC", - "/xyz/openbmc_project/sensors/voltage/3V3_SB", - "/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" + "/xyz/openbmc_project/sensors/fan_tach/PSU1_fan1" ] } ] 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 56db56883..7b27a7edd 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 @@ -3,13 +3,17 @@ RDEPENDS:${PN}-extras:append:mtjade = " \ phosphor-image-signing \ phosphor-virtual-sensor \ phosphor-misc-usb-ctrl \ - " + fault-monitor \ + id-button \ + psu-hotswap-reset \ + " RDEPENDS:${PN}-inventory:append:mtjade = " \ - fault-monitor \ - id-button \ - psu-hotswap-reset \ host-gpio-handling \ dbus-sensors \ entity-manager \ - " + " + +RDEPENDS:${PN}-extras:remove:mtjade = " phosphor-hwmon" +VIRTUAL-RUNTIME_obmc-sensors-hwmon ?= "dbus-sensors" +RDEPENDS:${PN}-extras:append:mtjade = " phosphor-virtual-sensor" -- cgit v1.2.3 From 51a992da77acde9850afc13e93685640319d86e3 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Thu, 30 Dec 2021 04:35:08 +0000 Subject: meta-ampere: redfish: remove Chassis chassis instance The chassis instance when implementing sensor monitor using dbus-sensor/entity-manager is /redfish/v1/Chassis/ where is defined from entity-manager configuration. This commit removes /redfish/v1/Chassis/chassis which is redundant and make incorrect link from other schema like ComputerSystem and BMC Manager. Tested: 1. Check no /redfish/v1/Chassis/chassis available. 2. Check all sensors are available in /redfish/v1/Chassis/Mt_Jade. Signed-off-by: Thang Q. Nguyen Change-Id: I334a94bb65c3caa49d0bcb6ab03a42f7999728d5 --- .../inventory/inventory-cleanup.bb | 17 +++++ .../inventory-cleanup/inventory-cleanup.yaml | 16 +++++ .../inventory/inventory-cleanup.bb | 17 ----- .../inventory-cleanup/inventory-cleanup.yaml | 16 ----- .../phosphor-inventory-manager/associations.json | 80 ---------------------- .../phosphor-inventory-manager_%.bbappend | 10 --- 6 files changed, 33 insertions(+), 123 deletions(-) create mode 100644 meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup.bb create mode 100644 meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup.bb delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend (limited to 'meta-ampere/meta-jade/recipes-phosphor') diff --git a/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup.bb new file mode 100644 index 000000000..1b5a119b1 --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup.bb @@ -0,0 +1,17 @@ +SUMMARY = "Copy the inventory cleanup yaml for inventory manager" +PR = "r1" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" + +inherit allarch +inherit phosphor-inventory-manager + +S = "${WORKDIR}" + +SRC_URI = "file://inventory-cleanup.yaml" + +do_install() { + install -D inventory-cleanup.yaml ${D}${base_datadir}/events.d/inventory-cleanup.yaml +} + +FILES:${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml" diff --git a/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml b/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml new file mode 100644 index 000000000..23f54e331 --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml @@ -0,0 +1,16 @@ +description: > + Ampere inventory fixups + +events: + - name: Add Chassis interface + description: > + Add the chassis interface on the chassis inventory path + type: startup + actions: + - name: createObjects + objs: + /system/chassis: + xyz.openbmc_project.Inventory.Item.Chassis: + Type: + value: "xyz.openbmc_project.Inventory.Item.Chassis.ChassisType.RackMount" + type: string diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup.bb b/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup.bb deleted file mode 100644 index 1b5a119b1..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "Copy the inventory cleanup yaml for inventory manager" -PR = "r1" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -inherit allarch -inherit phosphor-inventory-manager - -S = "${WORKDIR}" - -SRC_URI = "file://inventory-cleanup.yaml" - -do_install() { - install -D inventory-cleanup.yaml ${D}${base_datadir}/events.d/inventory-cleanup.yaml -} - -FILES:${PN} += "${base_datadir}/events.d/inventory-cleanup.yaml" diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml b/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml deleted file mode 100644 index 3fa190852..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/inventory/inventory-cleanup/inventory-cleanup.yaml +++ /dev/null @@ -1,16 +0,0 @@ -description: > - Mt.Jade inventory fixups - -events: - - name: Add Chassis interface - description: > - Add the chassis interface on the chassis inventory path - type: startup - actions: - - name: createObjects - objs: - /system/chassis: - xyz.openbmc_project.Inventory.Item.Chassis: - Type: - value: "xyz.openbmc_project.Inventory.Item.Chassis.ChassisType.RackMount" - type: string 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 deleted file mode 100644 index 5e535d502..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager/associations.json +++ /dev/null @@ -1,80 +0,0 @@ -[ - { - "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": - [ - { - "types": - { - "rType": "chassis", - "fType": "all_sensors" - }, - "paths": - [ - "/xyz/openbmc_project/sensors/fan_tach/FAN3_1", - "/xyz/openbmc_project/sensors/fan_tach/FAN3_2", - "/xyz/openbmc_project/sensors/fan_tach/FAN4_1", - "/xyz/openbmc_project/sensors/fan_tach/FAN4_2", - "/xyz/openbmc_project/sensors/fan_tach/FAN5_1", - "/xyz/openbmc_project/sensors/fan_tach/FAN5_2", - "/xyz/openbmc_project/sensors/fan_tach/FAN6_1", - "/xyz/openbmc_project/sensors/fan_tach/FAN6_2", - "/xyz/openbmc_project/sensors/fan_tach/FAN7_1", - "/xyz/openbmc_project/sensors/fan_tach/FAN7_2", - "/xyz/openbmc_project/sensors/fan_tach/FAN8_1", - "/xyz/openbmc_project/sensors/fan_tach/FAN8_2", - "/xyz/openbmc_project/sensors/fan_tach/PSU0_fan1", - "/xyz/openbmc_project/sensors/fan_tach/PSU1_fan1" - ] - } - ] - } -] diff --git a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend b/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend deleted file mode 100644 index ab3030879..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/inventory/phosphor-inventory-manager_%.bbappend +++ /dev/null @@ -1,10 +0,0 @@ -DEPENDS:append:mtjade = " inventory-cleanup" - -FILESEXTRAPATHS:prepend:mtjade := "${THISDIR}/${PN}:" -PACKAGECONFIG:append:mtjade = " associations" -SRC_URI:append:mtjade = " file://associations.json" - -do_install:append:mtjade() { - install -d ${D}${base_datadir} - install -m 0755 ${WORKDIR}/associations.json ${D}${base_datadir} -} -- cgit v1.2.3 From 81878cce3ee6a6b4920ad663479ad37a6f6c64fa Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Thu, 30 Dec 2021 05:43:02 +0000 Subject: Revert "meta-ampere: mtjade: support PSU present detection via GPIO" By replacing phosphor-hwmon by dbus-sensor, PSU presence detection via GPIO does not work anymore and it causes confiction with dbus-sensor's PSUSensor. Revert the commit to avoid the confliction Change-Id: Idfd54325c122921a3c5df062bce1b6909b643999 Signed-off-by: Thang Q. Nguyen --- .../recipes-ac01/packagegroups/packagegroup-ampere-apps.bb | 1 - meta-ampere/meta-jade/conf/machine/mtjade.conf | 2 -- .../obmc/gpio/phosphor-power-supply-0.conf | 6 ------ .../obmc/gpio/phosphor-power-supply-1.conf | 6 ------ .../recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend | 12 ------------ 5 files changed, 27 deletions(-) delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf delete mode 100644 meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend (limited to 'meta-ampere/meta-jade/recipes-phosphor') 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 ede8d9db5..9f1461905 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,7 +26,6 @@ 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/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index 642e7469e..40bd0f81e 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -14,8 +14,6 @@ FLASH_KERNEL_OFFSET = "1024" FLASH_ROFS_OFFSET = "10240" FLASH_RWFS_OFFSET = "43008" -OBMC_POWER_SUPPLY_INSTANCES = "0 1" - MACHINE_FEATURES += "\ obmc-phosphor-chassis-mgmt \ obmc-phosphor-flash-mgmt \ 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 deleted file mode 100644 index c5fc23ace..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-0.conf +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index e591227d2..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor/obmc/gpio/phosphor-power-supply-1.conf +++ /dev/null @@ -1,6 +0,0 @@ -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 deleted file mode 100644 index 527cbbda0..000000000 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/phosphor-gpio-monitor_%.bbappend +++ /dev/null @@ -1,12 +0,0 @@ -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')}" -- cgit v1.2.3