diff options
| author | Nikita Kosenkov <NKosenkov@IBS.RU> | 2022-09-30 14:46:38 +0300 |
|---|---|---|
| committer | Nikita Kosenkov <NKosenkov@IBS.RU> | 2022-09-30 14:46:38 +0300 |
| commit | eb7a190e5d215c9a81690a250c0ac44ffa8a29e9 (patch) | |
| tree | 3f45a64ed2853ae14edf796d521ffe5b037aebde | |
| parent | d86571b739f625c37e9207b6f7de3950ba0c870e (diff) | |
| parent | 7f53e4016fb09390ae5f98d202134fb74a135a17 (diff) | |
| download | openbmc-eb7a190e5d215c9a81690a250c0ac44ffa8a29e9.tar.xz | |
Merge branch 'sila-32MiB' of git.sila.ru:pub/openbmc/openbmc into sila-32MiB
2 files changed, 70 insertions, 1 deletions
diff --git a/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0005-Add-AS1200-PSU-PowerState-Flag.patch b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0005-Add-AS1200-PSU-PowerState-Flag.patch new file mode 100644 index 0000000000..15375a823f --- /dev/null +++ b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0005-Add-AS1200-PSU-PowerState-Flag.patch @@ -0,0 +1,68 @@ +From 91c823bc14c7665fbe3f5729028cdc79bc2bc077 Mon Sep 17 00:00:00 2001 +From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru> +Date: Fri, 30 Sep 2022 12:48:00 +0300 +Subject: [PATCH] Add AS1200 PSU PowerState Flag + +--- + configurations/aspower_u1a-d11200_psu.json | 19 ++++++++++++++++--- + 1 file changed, 16 insertions(+), 3 deletions(-) + +diff --git a/configurations/aspower_u1a-d11200_psu.json b/configurations/aspower_u1a-d11200_psu.json +index 7b9ad79..8d46f30 100644 +--- a/configurations/aspower_u1a-d11200_psu.json ++++ b/configurations/aspower_u1a-d11200_psu.json +@@ -98,6 +98,7 @@ + "temp1", + "fan1" + ], ++ "PowerState" : "On", + "Name": "PSU$ADDRESS % 4 + 1", + "Thresholds": [ + { +@@ -142,7 +143,7 @@ + "Severity": 0, + "Value": 0 + }, +-{ ++ { + "Direction": "greater than", + "Label": "pin", + "Name": "upper critical", +@@ -170,7 +171,7 @@ + "Severity": 0, + "Value": 0 + }, +-{ ++ { + "Direction": "greater than", + "Label": "iout1", + "Name": "upper critical", +@@ -274,7 +275,8 @@ + { + "Name" : "PSU$ADDRESS % 4 + 1 Output Current", + "EntityId": "0x01", +- "EntityInstance": "$ADDRESS % 4 + 4" ++ "EntityInstance": "$ADDRESS % 4 + 4", ++ "PowerState" : "On" + + }, + { +@@ -282,7 +284,18 @@ + "EntityId": "0x01", + "EntityInstance": "$ADDRESS % 4 + 6" + ++ }, ++ { ++ "Name" : "PSU$ADDRESS % 4 + 1 Output Voltage", ++ "PowerState" : "On" ++ ++ }, ++ { ++ "Name" : "PSU$ADDRESS % 4 + 1 Output Power", ++ "PowerState" : "On" ++ + } ++ + ], + "Name": "ASPOWER 1200W PSU $ADDRESS % 4 + 1", + "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'U1A-D11200-DRB'})", diff --git a/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend index 385b058157..f3ad7f1407 100644 --- a/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend +++ b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend @@ -3,6 +3,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SRC_URI += "file://0001-Add-ASPOWER1200-Vin-Vout-Pout-thresholds.patch \ file://0002-Add-PID-Zone-to-AS1200.patch \ file://0003-Add-Ipmi-Decorator-To-Schemas.patch \ - file://0004-AS1200-JSON-Add-Thresholds-and-IPMI.patch \ + file://0004-AS1200-JSON-Add-Thresholds-and-IPMI.patch \ + file://0005-Add-AS1200-PSU-PowerState-Flag.patch \ " |