From e96820d5379bf9ca80ace325f9a1ec9e51cc3c66 Mon Sep 17 00:00:00 2001 From: "Thang Q. Nguyen" Date: Fri, 17 Dec 2021 02:24:24 +0000 Subject: meta-ampere: mtjade: Add more Host firmware support Add support SCP firmware update with checking if the ampere_fru_upgrade available to execute the update. This commit also supports 2nd Host SPI-NOR update ability. Tested: 1. Manually copy ampere_fru_upgrade to the /usr/sbin folder and run SCP firmware update via Redfish. 2. Flash UEFI firmware update on the secondary Host SPI-NOR. Signed-off-by: Thang Q. Nguyen Change-Id: Ic335ee2d21625239c3df1937ed5333708233845b --- meta-ampere/meta-jade/conf/machine/mtjade.conf | 1 - 1 file changed, 1 deletion(-) (limited to 'meta-ampere/meta-jade/conf/machine/mtjade.conf') diff --git a/meta-ampere/meta-jade/conf/machine/mtjade.conf b/meta-ampere/meta-jade/conf/machine/mtjade.conf index 633efa012..ede176ad0 100644 --- a/meta-ampere/meta-jade/conf/machine/mtjade.conf +++ b/meta-ampere/meta-jade/conf/machine/mtjade.conf @@ -32,7 +32,6 @@ OBMC_IMAGE_EXTRA_INSTALL:append = "\ ampere-flash-utils \ ampere-mac-update \ mtjade-gpio-config \ - mtd-utils \ ampere-platform-init \ ampere-ipmi-oem \ " -- 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/conf/machine/mtjade.conf') 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 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/conf/machine/mtjade.conf') 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