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 --- .../ipmi/phosphor-ipmi-fru_%.bbappend | 9 + .../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 +- 9 files changed, 422 insertions(+), 556 deletions(-) create mode 100644 meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend 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 diff --git a/meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend b/meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend new file mode 100644 index 000000000..75177dce1 --- /dev/null +++ b/meta-ampere/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-fru_%.bbappend @@ -0,0 +1,9 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" + +inherit obmc-phosphor-systemd + +HOSTIPMI_PROVIDER_LIBRARY:remove = "libstrgfnhandler.so" + +do_install:append () { + rm -rf ${D}${libdir}/ipmid-providers +} 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