diff options
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor')
18 files changed, 1732 insertions, 92 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0001-fru-device-Add-MUX-channel-name-to-FRU-objects.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0001-fru-device-Add-MUX-channel-name-to-FRU-objects.patch index 5c301a7eb..865b1972a 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0001-fru-device-Add-MUX-channel-name-to-FRU-objects.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0001-fru-device-Add-MUX-channel-name-to-FRU-objects.patch @@ -171,7 +171,7 @@ index 1451830..2a5ff90 100644 } ], - "Name": "SOLUM CO IS162F22 PSU$ADDRESS % 4 + 1", -+ "Name": "$MUX SOLUM CO IS162F22 $ADDRESS % 4 + 1", ++ "Name": "$MUX SOLUM CO IS162F22 PSU$ADDRESS % 4 + 1", "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'IS162F22*'})", "Type": "PowerSupply", "xyz.openbmc_project.Inventory.Decorator.Asset": { diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0004-Adding-MUX-and-Drives-present-in-HSBP-in-json-config.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0004-Adding-MUX-and-Drives-present-in-HSBP-in-json-config.patch index 4f6679dde..d686b3cff 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0004-Adding-MUX-and-Drives-present-in-HSBP-in-json-config.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0004-Adding-MUX-and-Drives-present-in-HSBP-in-json-config.patch @@ -37,7 +37,7 @@ index c6c7678..e2eedfa 100644 + "Drive_3", + "Drive_4" + ], -+ "Name": "Drive Mux 1", ++ "Name": "HSBP 1 Mux 1", + "Type": "PCA9546Mux" + }, + { @@ -49,7 +49,7 @@ index c6c7678..e2eedfa 100644 + "Drive_7", + "Drive_8" + ], -+ "Name": "Drive Mux 2", ++ "Name": "HSBP 1 Mux 2", + "Type": "PCA9546Mux" + }, { @@ -77,7 +77,7 @@ index c6c7678..e2eedfa 100644 + "Drive_11", + "Drive_12" + ], -+ "Name": "Drive Mux 3", ++ "Name": "HSBP 2 Mux 1", + "Type": "PCA9546Mux" + }, + { @@ -89,7 +89,7 @@ index c6c7678..e2eedfa 100644 + "Drive_15", + "Drive_16" + ], -+ "Name": "Drive Mux 4", ++ "Name": "HSBP 2 Mux 2", + "Type": "PCA9546Mux" + }, { @@ -117,7 +117,7 @@ index c6c7678..e2eedfa 100644 + "Drive_19", + "Drive_20" + ], -+ "Name": "Drive Mux 5", ++ "Name": "HSBP 3 Mux 1", + "Type": "PCA9546Mux" + }, + { @@ -129,7 +129,7 @@ index c6c7678..e2eedfa 100644 + "Drive_23", + "Drive_24" + ], -+ "Name": "Drive Mux 6", ++ "Name": "HSBP 3 Mux 2", + "Type": "PCA9546Mux" + }, { diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0006-Change-HSBP-FRU-address-and-add-MUX-mode-configurati.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0006-Change-HSBP-FRU-address-and-add-MUX-mode-configurati.patch index a3d065fd9..fad44623d 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0006-Change-HSBP-FRU-address-and-add-MUX-mode-configurati.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/configuration/entity-manager/0006-Change-HSBP-FRU-address-and-add-MUX-mode-configurati.patch @@ -30,7 +30,7 @@ index e2eedfa..60e7817 100644 "Drive_4" ], + "MuxIdleMode": "Disconnect", - "Name": "Drive Mux 1", + "Name": "HSBP 1 Mux 1", "Type": "PCA9546Mux" }, @@ -28,6 +29,7 @@ @@ -38,7 +38,7 @@ index e2eedfa..60e7817 100644 "Drive_8" ], + "MuxIdleMode": "Disconnect", - "Name": "Drive Mux 2", + "Name": "HSBP 1 Mux 2", "Type": "PCA9546Mux" }, @@ -65,7 +67,7 @@ @@ -55,7 +55,7 @@ index e2eedfa..60e7817 100644 "Drive_12" ], + "MuxIdleMode": "Disconnect", - "Name": "Drive Mux 3", + "Name": "HSBP 2 Mux 1", "Type": "PCA9546Mux" }, @@ -103,6 +106,7 @@ @@ -63,7 +63,7 @@ index e2eedfa..60e7817 100644 "Drive_16" ], + "MuxIdleMode": "Disconnect", - "Name": "Drive Mux 4", + "Name": "HSBP 2 Mux 2", "Type": "PCA9546Mux" }, @@ -140,7 +144,7 @@ @@ -80,7 +80,7 @@ index e2eedfa..60e7817 100644 "Drive_20" ], + "MuxIdleMode": "Disconnect", - "Name": "Drive Mux 5", + "Name": "HSBP 3 Mux 1", "Type": "PCA9546Mux" }, @@ -178,6 +183,7 @@ @@ -88,7 +88,7 @@ index e2eedfa..60e7817 100644 "Drive_24" ], + "MuxIdleMode": "Disconnect", - "Name": "Drive Mux 6", + "Name": "HSBP 3 Mux 2", "Type": "PCA9546Mux" }, -- diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0032-Remove-chassis-from-the-odata-id-of-the-PSU.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0032-Remove-chassis-from-the-odata-id-of-the-PSU.patch new file mode 100644 index 000000000..9951a83c0 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0032-Remove-chassis-from-the-odata-id-of-the-PSU.patch @@ -0,0 +1,49 @@ +From dd4a6807841555ccc23aa2ac8b2c876101408563 Mon Sep 17 00:00:00 2001 +From: Anjaliintel-21 <anjali.ray@intel.com> +Date: Thu, 3 Mar 2022 19:42:05 +0000 +Subject: [PATCH] Remove chassis from the odata.id of the PSU + +As the Redfish validator was failing for the PSU because odata.id +of the PSU was showing a chassis device URI and the GET operation on +that URI was giving error. +So, to resolve this problem we removed chassis URI from the PSU's json +response. + +Tested: + +*** /redfish/v1/Managers/bmc#/Oem/OpenBmc/Fan/FanZones/PSU +No parent found with which to test @odata.id of ReferenceableMember +Type (#OemManager.FanZone), GET SUCCESS (time: 1.212592) +PASS +Elapsed time: 0:01:06 +Counter({'metadataNamespaces': 2335, 'pass': 2, 'passGet': 1, +'skipOptional': 1, 'warningPresent': 1, 'serviceNamespaces': 1}) +Validation has succeeded. + +Signed-off-by: Anjaliintel-21 <anjali.ray@intel.com> +--- + redfish-core/lib/managers.hpp | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp +index 7b0e14c..9ed87ef 100644 +--- a/redfish-core/lib/managers.hpp ++++ b/redfish-core/lib/managers.hpp +@@ -371,8 +371,12 @@ inline void + chassis = "#IllegalValue"; + } + nlohmann::json& zone = zones[name]; +- zone["Chassis"] = { +- {"@odata.id", "/redfish/v1/Chassis/" + chassis}}; ++ if (name != "PSU") ++ { ++ zone["Chassis"] = { ++ {"@odata.id", ++ "/redfish/v1/Chassis/" + chassis}}; ++ } + zone["@odata.id"] = + "/redfish/v1/Managers/bmc#/Oem/OpenBmc/Fan/FanZones/" + + name; +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0033-Add-message-registry-entry-for-Memhot-event.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0033-Add-message-registry-entry-for-Memhot-event.patch new file mode 100644 index 000000000..ddf239e99 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0033-Add-message-registry-entry-for-Memhot-event.patch @@ -0,0 +1,80 @@ +From 31661f341a32e07967f5e3279b79771823275395 Mon Sep 17 00:00:00 2001 +From: Hardik Panchal <hardikx.panchal@intel.com> +Date: Thu, 24 Mar 2022 12:29:48 +0000 +Subject: [PATCH] Add message registry entry for Memhot event + +Add "ComponentOverTemperature" event message entry in RedFish for +Memhot monitor to log based on the MEMHOT pins. + +Tested: +1. Redfish validator - passed for this new addition +2. Verified in Redfish, ComponentOverTemperature event logged properly. +GET: +https:/<BMC-IP>/redfish/v1/Systems/system/LogServices/EventLog/Entries +{ + "@odata.id": "/redfish/v1/Systems/system/LogServices/EventLog/ + Entries/1648143395", + "@odata.type": "#LogEntry.v1_8_0.LogEntry", + "Created": "2022-03-24T17:36:35+00:00", + "EntryType": "Event", + "Id": "1648143395", + "Message": "CPU 1 memory over temperature and being throttled.", + "MessageArgs": [ + "CPU 1 memory" + ], + "MessageId": "OpenBMC.0.1.ComponentOverTemperature", + "Name": "System Event Log Entry", + "Severity": "Critical" +} + +Signed-off-by: Hardik Panchal <hardikx.panchal@intel.com> +--- + .../registries/openbmc_message_registry.hpp | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +diff --git a/redfish-core/include/registries/openbmc_message_registry.hpp b/redfish-core/include/registries/openbmc_message_registry.hpp +index 0b409cf..a181080 100644 +--- a/redfish-core/include/registries/openbmc_message_registry.hpp ++++ b/redfish-core/include/registries/openbmc_message_registry.hpp +@@ -19,17 +19,17 @@ + namespace redfish::message_registries::openbmc + { + const Header header = { +- "Copyright 2018 OpenBMC. All rights reserved.", ++ "Copyright 2022 OpenBMC. All rights reserved.", + "#MessageRegistry.v1_4_0.MessageRegistry", +- "OpenBMC.0.3.0", ++ "OpenBMC.0.3.1", + "OpenBMC Message Registry", + "en", + "This registry defines the base messages for OpenBMC.", + "OpenBMC", +- "0.3.0", ++ "0.3.1", + "OpenBMC", + }; +-constexpr std::array<MessageEntry, 199> registry = { ++constexpr std::array<MessageEntry, 200> registry = { + MessageEntry{ + "ADDDCCorrectable", + { +@@ -340,6 +340,16 @@ constexpr std::array<MessageEntry, 199> registry = { + {}, + "None.", + }}, ++ MessageEntry{"ComponentOverTemperature", ++ { ++ "Indicates that the specified component is over temperature.", ++ "%1 over temperature and being throttled.", ++ "Critical", ++ "Critical", ++ 1, ++ {"string"}, ++ "None.", ++ }}, + MessageEntry{"CPLDFirmwarePanicReason", + { + "Indicates the reason for CPLD firmware panic.", +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0034-Update-odata.type-version-of-redfish-v1-AccountService.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0034-Update-odata.type-version-of-redfish-v1-AccountService.patch new file mode 100644 index 000000000..3269b5ca0 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0034-Update-odata.type-version-of-redfish-v1-AccountService.patch @@ -0,0 +1,47 @@ +From 9f159168ab5b1e0e73f4af8dd4536e77b440ad0b Mon Sep 17 00:00:00 2001 +From: Anjaliintel-21 <anjali.ray@intel.com> +Date: Mon, 28 Mar 2022 09:43:03 +0000 +Subject: [PATCH] Update odata.type version of /redfish/v1/AccountService/ + +Redfish validator was failing and throwing below error: +*** /redfish/v1/AccountService +AccountService.v1_10_0.ExternalAccountProvider:OAuth2Service : +Could not get details on this property (argument of type 'NoneType' is not iterable) +Type (#AccountService.v1_5_0.AccountService), GET SUCCESS (time: 1.283549) +complex @odata.id: Expected @odata.id to match URI link +/redfish/v1/AccountService#/Oem/OpenBMC +FAIL... + +As AccountService_v1.xml version was v1.10.0 and the odata.type was +"AccountService.v1_5_0.AccountService" which was mismatch. +So I updated odata.type to AccountService.v1_10_0.AccountService". + +Tested: + +*** /redfish/v1/AccountService + Type (#AccountService.v1_10_0.AccountService), GET SUCCESS (time: 1.286845) +complex @odata.id: Expected @odata.id to match URI link +/redfish/v1/AccountService#/Oem/OpenBMC + PASS + +Signed-off-by: Anjaliintel-21 <anjali.ray@intel.com> +--- + redfish-core/lib/account_service.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/redfish-core/lib/account_service.hpp b/redfish-core/lib/account_service.hpp +index 55ce6ae..b1950f7 100644 +--- a/redfish-core/lib/account_service.hpp ++++ b/redfish-core/lib/account_service.hpp +@@ -1280,7 +1280,7 @@ inline void requestAccountServiceRoutes(App& app) + asyncResp->res.jsonValue = { + {"@odata.id", "/redfish/v1/AccountService"}, + {"@odata.type", "#AccountService." +- "v1_5_0.AccountService"}, ++ "v1_10_0.AccountService"}, + {"Id", "AccountService"}, + {"Name", "Account Service"}, + {"Description", "Account Service"}, +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0035-Add-MemoryMetrics-schema-file.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0035-Add-MemoryMetrics-schema-file.patch new file mode 100644 index 000000000..0097fd93a --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/0035-Add-MemoryMetrics-schema-file.patch @@ -0,0 +1,1048 @@ +From ac0154a247412c5891fb61a95fea15a5fd170053 Mon Sep 17 00:00:00 2001 +From: Anjaliintel-21 <anjali.ray@intel.com> +Date: Mon, 4 Apr 2022 20:54:29 +0000 +Subject: [PATCH] Add MemoryMetrics schema file + +As reference URI for MemoryMetrics was missing, +which was causing redfish validator to fail. +So, added reference URI for MemoryMetrics in the +index.xml file and also added "MemoryMetrics" in +update_schemas.py file. + +Tested: + +*** /redfish/v1/Systems/system/Memory/dimm0/MemoryMetrics +Type (#MemoryMetrics.v1_4_1.MemoryMetrics), GET SUCCESS (time: 1.315905) +PASS +Elapsed time: 0:03:35 +Counter({'metadataNamespaces': 2337, 'skipOptional': 9, 'pass': 2, 'passGet': 1, 'serviceNamespaces': 1}) +Validation has succeeded. + +Signed-off-by: Anjaliintel-21 <anjali.ray@intel.com> +--- + scripts/update_schemas.py | 1 + + static/redfish/v1/$metadata/index.xml | 28 ++ + .../MemoryMetrics/MemoryMetrics.json | 473 ++++++++++++++++++ + .../v1/JsonSchemas/MemoryMetrics/index.json | 21 + + static/redfish/v1/JsonSchemas/index.json | 5 +- + static/redfish/v1/schema/MemoryMetrics_v1.xml | 424 ++++++++++++++++ + 6 files changed, 951 insertions(+), 1 deletion(-) + create mode 100644 static/redfish/v1/JsonSchemas/MemoryMetrics/MemoryMetrics.json + create mode 100644 static/redfish/v1/JsonSchemas/MemoryMetrics/index.json + create mode 100644 static/redfish/v1/schema/MemoryMetrics_v1.xml + +diff --git a/scripts/update_schemas.py b/scripts/update_schemas.py +index 3f0f57c..a233291 100755 +--- a/scripts/update_schemas.py ++++ b/scripts/update_schemas.py +@@ -48,6 +48,7 @@ include_list = [ + 'ManagerNetworkProtocol', + 'Memory', + 'MemoryCollection', ++ 'MemoryMetrics', + 'Message', + 'MessageRegistry', + 'MessageRegistryCollection', +diff --git a/static/redfish/v1/$metadata/index.xml b/static/redfish/v1/$metadata/index.xml +index 9b080f3..d7b9e08 100644 +--- a/static/redfish/v1/$metadata/index.xml ++++ b/static/redfish/v1/$metadata/index.xml +@@ -1340,6 +1340,34 @@ + <edmx:Reference Uri="/redfish/v1/schema/MemoryCollection_v1.xml"> + <edmx:Include Namespace="MemoryCollection"/> + </edmx:Reference> ++ <edmx:Reference Uri="/redfish/v1/schema/MemoryMetrics_v1.xml"> ++ <edmx:Include Namespace="MemoryMetrics"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_0_0"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_0_1"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_0_2"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_0_3"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_0_4"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_0_5"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_0_6"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_0_7"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_0_8"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_1_0"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_1_1"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_1_2"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_1_3"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_1_4"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_1_5"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_1_6"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_1_7"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_1_8"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_2_0"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_2_1"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_2_2"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_3_0"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_3_1"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_4_0"/> ++ <edmx:Include Namespace="MemoryMetrics.v1_4_1"/> ++ </edmx:Reference> + <edmx:Reference Uri="/redfish/v1/schema/Message_v1.xml"> + <edmx:Include Namespace="Message"/> + <edmx:Include Namespace="Message.v1_0_0"/> +diff --git a/static/redfish/v1/JsonSchemas/MemoryMetrics/MemoryMetrics.json b/static/redfish/v1/JsonSchemas/MemoryMetrics/MemoryMetrics.json +new file mode 100644 +index 0000000..a841f07 +--- /dev/null ++++ b/static/redfish/v1/JsonSchemas/MemoryMetrics/MemoryMetrics.json +@@ -0,0 +1,473 @@ ++{ ++ "$id": "http://redfish.dmtf.org/schemas/v1/MemoryMetrics.v1_4_1.json", ++ "$ref": "#/definitions/MemoryMetrics", ++ "$schema": "http://redfish.dmtf.org/schemas/v1/redfish-schema-v1.json", ++ "copyright": "Copyright 2014-2020 DMTF. For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright", ++ "definitions": { ++ "Actions": { ++ "additionalProperties": false, ++ "description": "The available actions for this resource.", ++ "longDescription": "This type shall contain the available actions for this resource.", ++ "patternProperties": { ++ "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": { ++ "description": "This property shall specify a valid odata or Redfish property.", ++ "type": [ ++ "array", ++ "boolean", ++ "integer", ++ "number", ++ "null", ++ "object", ++ "string" ++ ] ++ } ++ }, ++ "properties": { ++ "#MemoryMetrics.ClearCurrentPeriod": { ++ "$ref": "#/definitions/ClearCurrentPeriod" ++ }, ++ "Oem": { ++ "$ref": "#/definitions/OemActions", ++ "description": "The available OEM-specific actions for this resource.", ++ "longDescription": "This property shall contain the available OEM-specific actions for this resource." ++ } ++ }, ++ "type": "object" ++ }, ++ "AlarmTrips": { ++ "additionalProperties": false, ++ "description": "The alarm trip information about the memory. These alarms are reset when the system resets. Note that if they are re-discovered they can be reasserted.", ++ "longDescription": "This type shall contain properties that describe the types of alarms that have been raised by the memory. These alarms shall be reset when the system resets. Note that if they are re-discovered they can be reasserted.", ++ "patternProperties": { ++ "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": { ++ "description": "This property shall specify a valid odata or Redfish property.", ++ "type": [ ++ "array", ++ "boolean", ++ "integer", ++ "number", ++ "null", ++ "object", ++ "string" ++ ] ++ } ++ }, ++ "properties": { ++ "AddressParityError": { ++ "description": "An indication of whether an address parity error was detected that a retry could not correct.", ++ "longDescription": "This property shall indicate whether an address parity error was detected that a retry could not correct.", ++ "readonly": true, ++ "type": [ ++ "boolean", ++ "null" ++ ] ++ }, ++ "CorrectableECCError": { ++ "description": "An indication of whether the correctable error threshold crossing alarm trip was detected.", ++ "longDescription": "This property shall indicate whether the correctable error threshold crossing alarm trip was detected.", ++ "readonly": true, ++ "type": [ ++ "boolean", ++ "null" ++ ] ++ }, ++ "SpareBlock": { ++ "description": "An indication of whether the spare block capacity crossing alarm trip was detected.", ++ "longDescription": "This property shall indicate whether the spare block capacity crossing alarm trip was detected.", ++ "readonly": true, ++ "type": [ ++ "boolean", ++ "null" ++ ] ++ }, ++ "Temperature": { ++ "description": "An indication of whether a temperature threshold alarm trip was detected.", ++ "longDescription": "This property shall indicates whether a temperature threshold alarm trip was detected.", ++ "readonly": true, ++ "type": [ ++ "boolean", ++ "null" ++ ] ++ }, ++ "UncorrectableECCError": { ++ "description": "An indication of whether the uncorrectable error threshold alarm trip was detected.", ++ "longDescription": "This property shall indicate whether the uncorrectable error threshold alarm trip was detected.", ++ "readonly": true, ++ "type": [ ++ "boolean", ++ "null" ++ ] ++ } ++ }, ++ "type": "object" ++ }, ++ "ClearCurrentPeriod": { ++ "additionalProperties": false, ++ "description": "This action sets the CurrentPeriod property's values to 0.", ++ "longDescription": "This action shall set the CurrentPeriod property's values to 0.", ++ "parameters": {}, ++ "patternProperties": { ++ "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": { ++ "description": "This property shall specify a valid odata or Redfish property.", ++ "type": [ ++ "array", ++ "boolean", ++ "integer", ++ "number", ++ "null", ++ "object", ++ "string" ++ ] ++ } ++ }, ++ "properties": { ++ "target": { ++ "description": "Link to invoke action", ++ "format": "uri-reference", ++ "type": "string" ++ }, ++ "title": { ++ "description": "Friendly action name", ++ "type": "string" ++ } ++ }, ++ "type": "object" ++ }, ++ "CurrentPeriod": { ++ "additionalProperties": false, ++ "description": "The memory metrics since the last system reset or ClearCurrentPeriod action.", ++ "longDescription": "This type shall describe the memory metrics since last system reset or ClearCurrentPeriod action.", ++ "patternProperties": { ++ "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": { ++ "description": "This property shall specify a valid odata or Redfish property.", ++ "type": [ ++ "array", ++ "boolean", ++ "integer", ++ "number", ++ "null", ++ "object", ++ "string" ++ ] ++ } ++ }, ++ "properties": { ++ "BlocksRead": { ++ "description": "The number of blocks read since reset.", ++ "longDescription": "This property shall contain the number of blocks read since reset. When this resource is subordinate to the MemorySummary object, this property shall be the sum of BlocksRead over all memory.", ++ "readonly": true, ++ "type": [ ++ "integer", ++ "null" ++ ] ++ }, ++ "BlocksWritten": { ++ "description": "The number of blocks written since reset.", ++ "longDescription": "This property shall contain the number of blocks written since reset. When this resource is subordinate to the MemorySummary object, this property shall be the sum of BlocksWritten over all memory.", ++ "readonly": true, ++ "type": [ ++ "integer", ++ "null" ++ ] ++ }, ++ "CorrectableECCErrorCount": { ++ "description": "The number of the correctable errors since reset.", ++ "longDescription": "This property shall contain the number of correctable errors since reset. When this resource is subordinate to the MemorySummary object, this property shall be the sum of CorrectableECCErrorCount over all memory.", ++ "readonly": true, ++ "type": [ ++ "integer", ++ "null" ++ ], ++ "versionAdded": "v1_4_0" ++ }, ++ "UncorrectableECCErrorCount": { ++ "description": "The number of the uncorrectable errors since reset.", ++ "longDescription": "This property shall contain the number of uncorrectable errors since reset. When this resource is subordinate to the MemorySummary object, this property shall be the sum of UncorrectableECCErrorCount over all memory.", ++ "readonly": true, ++ "type": [ ++ "integer", ++ "null" ++ ], ++ "versionAdded": "v1_4_0" ++ } ++ }, ++ "type": "object" ++ }, ++ "HealthData": { ++ "additionalProperties": false, ++ "description": "The health information of the memory.", ++ "longDescription": "This type shall contain properties that describe the HealthData metrics for this resource.", ++ "patternProperties": { ++ "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": { ++ "description": "This property shall specify a valid odata or Redfish property.", ++ "type": [ ++ "array", ++ "boolean", ++ "integer", ++ "number", ++ "null", ++ "object", ++ "string" ++ ] ++ } ++ }, ++ "properties": { ++ "AlarmTrips": { ++ "$ref": "#/definitions/AlarmTrips", ++ "description": "Alarm trip information about the memory.", ++ "longDescription": "This object shall contain properties describe the types of alarms that have been raised by the memory. When this resource is subordinate to the MemorySummary object, this property shall indicate whether an alarm of a given type have been raised by any area of memory." ++ }, ++ "DataLossDetected": { ++ "description": "An indication of whether data loss was detected.", ++ "longDescription": "This property shall indicate whether data loss was detected. When this resource is subordinate to the MemorySummary object, this property shall indicate whether any data loss was detected in any area of memory.", ++ "readonly": true, ++ "type": [ ++ "boolean", ++ "null" ++ ] ++ }, ++ "LastShutdownSuccess": { ++ "description": "An indication of whether the last shutdown succeeded.", ++ "longDescription": "This property shall indicate whether the last shutdown succeeded.", ++ "readonly": true, ++ "type": [ ++ "boolean", ++ "null" ++ ] ++ }, ++ "PerformanceDegraded": { ++ "description": "An indication of whether performance has degraded.", ++ "longDescription": "This property shall indicate whether performance has degraded. When this resource is subordinate to the MemorySummary object, this property shall indicate whether degraded performance mode status is detected in any area of memory.", ++ "readonly": true, ++ "type": [ ++ "boolean", ++ "null" ++ ] ++ }, ++ "PredictedMediaLifeLeftPercent": { ++ "description": "The percentage of reads and writes that are predicted to still be available for the media.", ++ "longDescription": "This property shall contain an indicator of the percentage of life remaining in the media.", ++ "readonly": true, ++ "type": [ ++ "number", ++ "null" ++ ], ++ "units": "%", ++ "versionAdded": "v1_1_0" ++ }, ++ "RemainingSpareBlockPercentage": { ++ "description": "The remaining spare blocks, as a percentage.", ++ "longDescription": "This property shall contain the remaining spare blocks as a percentage. When this resource is subordinate to the MemorySummary object, this property shall be the RemainingSpareBlockPercentage over all memory.", ++ "readonly": true, ++ "type": [ ++ "number", ++ "null" ++ ], ++ "units": "%" ++ } ++ }, ++ "type": "object" ++ }, ++ "LifeTime": { ++ "additionalProperties": false, ++ "description": "The memory metrics for the lifetime of the memory.", ++ "longDescription": "This type shall describe the memory metrics since manufacturing.", ++ "patternProperties": { ++ "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": { ++ "description": "This property shall specify a valid odata or Redfish property.", ++ "type": [ ++ "array", ++ "boolean", ++ "integer", ++ "number", ++ "null", ++ "object", ++ "string" ++ ] ++ } ++ }, ++ "properties": { ++ "BlocksRead": { ++ "description": "The number of blocks read for the lifetime of the memory.", ++ "longDescription": "This property shall contain the number of blocks read for the lifetime of the memory. When this resource is subordinate to the MemorySummary object, this property shall be the sum of BlocksRead over all memory.", ++ "readonly": true, ++ "type": [ ++ "integer", ++ "null" ++ ] ++ }, ++ "BlocksWritten": { ++ "description": "The number of blocks written for the lifetime of the memory.", ++ "longDescription": "This property shall contain the number of blocks written for the lifetime of the memory. When this resource is subordinate to the MemorySummary object, this property shall be the sum of BlocksWritten over all memory.", ++ "readonly": true, ++ "type": [ ++ "integer", ++ "null" ++ ] ++ }, ++ "CorrectableECCErrorCount": { ++ "description": "The number of the correctable errors for the lifetime of the memory.", ++ "longDescription": "This property shall contain the number of the correctable errors for the lifetime of the memory. When this resource is subordinate to the MemorySummary object, this property shall be the sum of CorrectableECCErrorCount over all memory.", ++ "readonly": true, ++ "type": [ ++ "integer", ++ "null" ++ ], ++ "versionAdded": "v1_4_0" ++ }, ++ "UncorrectableECCErrorCount": { ++ "description": "The number of the uncorrectable errors for the lifetime of the memory.", ++ "longDescription": "This property shall contain the number of the uncorrectable errors for the lifetime of the memory. When this resource is subordinate to the MemorySummary object, this property shall be the sum of UncorrectableECCErrorCount over all memory.", ++ "readonly": true, ++ "type": [ ++ "integer", ++ "null" ++ ], ++ "versionAdded": "v1_4_0" ++ } ++ }, ++ "type": "object" ++ }, ++ "MemoryMetrics": { ++ "additionalProperties": false, ++ "description": "The usage and health statistics for a memory device or system memory summary.", ++ "longDescription": "The MemoryMetrics schema shall contain the memory metrics for a memory device or system memory summary in a Redfish implementation.", ++ "patternProperties": { ++ "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": { ++ "description": "This property shall specify a valid odata or Redfish property.", ++ "type": [ ++ "array", ++ "boolean", ++ "integer", ++ "number", ++ "null", ++ "object", ++ "string" ++ ] ++ } ++ }, ++ "properties": { ++ "@odata.context": { ++ "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/context" ++ }, ++ "@odata.etag": { ++ "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/etag" ++ }, ++ "@odata.id": { ++ "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/id" ++ }, ++ "@odata.type": { ++ "$ref": "http://redfish.dmtf.org/schemas/v1/odata-v4.json#/definitions/type" ++ }, ++ "Actions": { ++ "$ref": "#/definitions/Actions", ++ "description": "The available actions for this resource.", ++ "longDescription": "This property shall contain the available actions for this resource." ++ }, ++ "BandwidthPercent": { ++ "description": "The memory bandwidth utilization as a percentage.", ++ "longDescription": "This property shall contain memory bandwidth utilization as a percentage. When this resource is subordinate to the MemorySummary object, this property shall be the memory bandwidth utilization over all memory as a percentage.", ++ "minimum": 0, ++ "readonly": true, ++ "type": [ ++ "number", ++ "null" ++ ], ++ "units": "%", ++ "versionAdded": "v1_2_0" ++ }, ++ "BlockSizeBytes": { ++ "description": "The block size, in bytes.", ++ "longDescription": "This property shall contain the block size, in bytes, of all structure elements. When this resource is subordinate to the MemorySummary object, this property is not applicable.", ++ "readonly": true, ++ "type": [ ++ "integer", ++ "null" ++ ], ++ "units": "By" ++ }, ++ "CurrentPeriod": { ++ "$ref": "#/definitions/CurrentPeriod", ++ "description": "The memory metrics since the last reset or ClearCurrentPeriod action.", ++ "longDescription": "This property shall contain properties that describe the memory metrics for the current period." ++ }, ++ "Description": { ++ "anyOf": [ ++ { ++ "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Description" ++ }, ++ { ++ "type": "null" ++ } ++ ], ++ "readonly": true ++ }, ++ "HealthData": { ++ "$ref": "#/definitions/HealthData", ++ "description": "The health information of the memory.", ++ "longDescription": "This property shall contain properties that describe the health data memory metrics for the memory." ++ }, ++ "Id": { ++ "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Id", ++ "readonly": true ++ }, ++ "LifeTime": { ++ "$ref": "#/definitions/LifeTime", ++ "description": "The memory metrics for the lifetime of the memory.", ++ "longDescription": "This property shall contain properties that describe the memory metrics for the lifetime of the memory." ++ }, ++ "Name": { ++ "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Name", ++ "readonly": true ++ }, ++ "Oem": { ++ "$ref": "http://redfish.dmtf.org/schemas/v1/Resource.json#/definitions/Oem", ++ "description": "The OEM extension property.", ++ "longDescription": "This property shall contain the OEM extensions. All values for properties that this object contains shall conform to the Redfish Specification-described requirements." ++ }, ++ "OperatingSpeedMHz": { ++ "description": "Operating speed of memory in MHz or MT/s as appropriate.", ++ "longDescription": "This property shall contain the operating speed of memory in MHz or MT/s (mega-transfers per second) as reported by the memory device. Memory devices that operate at their bus speed shall report the operating speed in MHz (bus speed), while memory devices that transfer data faster than their bus speed, such as DDR memory, shall report the operating speed in MT/s (mega-transfers/second). The reported value shall match the conventionally reported values for the technology used by the memory device.", ++ "readonly": true, ++ "type": [ ++ "integer", ++ "null" ++ ], ++ "units": "MHz", ++ "versionAdded": "v1_3_0" ++ } ++ }, ++ "required": [ ++ "@odata.id", ++ "@odata.type", ++ "Id", ++ "Name" ++ ], ++ "type": "object" ++ }, ++ "OemActions": { ++ "additionalProperties": true, ++ "description": "The available OEM-specific actions for this resource.", ++ "longDescription": "This type shall contain the available OEM-specific actions for this resource.", ++ "patternProperties": { ++ "^([a-zA-Z_][a-zA-Z0-9_]*)?@(odata|Redfish|Message)\\.[a-zA-Z_][a-zA-Z0-9_]*$": { ++ "description": "This property shall specify a valid odata or Redfish property.", ++ "type": [ ++ "array", ++ "boolean", ++ "integer", ++ "number", ++ "null", ++ "object", ++ "string" ++ ] ++ } ++ }, ++ "properties": {}, ++ "type": "object" ++ } ++ }, ++ "owningEntity": "DMTF", ++ "release": "2020.3", ++ "title": "#MemoryMetrics.v1_4_1.MemoryMetrics" ++} +\ No newline at end of file +diff --git a/static/redfish/v1/JsonSchemas/MemoryMetrics/index.json b/static/redfish/v1/JsonSchemas/MemoryMetrics/index.json +new file mode 100644 +index 0000000..e506f59 +--- /dev/null ++++ b/static/redfish/v1/JsonSchemas/MemoryMetrics/index.json +@@ -0,0 +1,21 @@ ++{ ++ "@odata.context": "/redfish/v1/$metadata#JsonSchemaFile.JsonSchemaFile", ++ "@odata.id": "/redfish/v1/JsonSchemas/MemoryMetrics", ++ "@odata.type": "#JsonSchemaFile.v1_0_2.JsonSchemaFile", ++ "Name": "MemoryMetrics Schema File", ++ "Schema": "#MemoryMetrics.MemoryMetrics", ++ "Description": "MemoryMetrics Schema File Location", ++ "Id": "MemoryMetrics", ++ "Languages": [ ++ "en" ++ ], ++ "Languages@odata.count": 1, ++ "Location": [ ++ { ++ "Language": "en", ++ "PublicationUri": "http://redfish.dmtf.org/schemas/v1/MemoryMetrics.json", ++ "Uri": "/redfish/v1/JsonSchemas/MemoryMetrics/MemoryMetrics.json" ++ } ++ ], ++ "Location@odata.count": 1 ++} +\ No newline at end of file +diff --git a/static/redfish/v1/JsonSchemas/index.json b/static/redfish/v1/JsonSchemas/index.json +index 8811f26..fd5abbf 100644 +--- a/static/redfish/v1/JsonSchemas/index.json ++++ b/static/redfish/v1/JsonSchemas/index.json +@@ -4,7 +4,7 @@ + "@odata.type": "#JsonSchemaFileCollection.JsonSchemaFileCollection", + "Name": "JsonSchemaFile Collection", + "Description": "Collection of JsonSchemaFiles", +- "Members@odata.count": 58, ++ "Members@odata.count": 59, + "Members": [ + { + "@odata.id": "/redfish/v1/JsonSchemas/AccountService" +@@ -75,6 +75,9 @@ + { + "@odata.id": "/redfish/v1/JsonSchemas/Memory" + }, ++ { ++ "@odata.id": "/redfish/v1/JsonSchemas/MemoryMetrics" ++ }, + { + "@odata.id": "/redfish/v1/JsonSchemas/Message" + }, +diff --git a/static/redfish/v1/schema/MemoryMetrics_v1.xml b/static/redfish/v1/schema/MemoryMetrics_v1.xml +new file mode 100644 +index 0000000..bfeae79 +--- /dev/null ++++ b/static/redfish/v1/schema/MemoryMetrics_v1.xml +@@ -0,0 +1,424 @@ ++<?xml version="1.0" encoding="UTF-8"?> ++<!----> ++<!--################################################################################ --> ++<!--# Redfish Schema: MemoryMetrics v1.4.1 --> ++<!--# --> ++<!--# For a detailed change log, see the README file contained in the DSP8010 bundle, --> ++<!--# available at http://www.dmtf.org/standards/redfish --> ++<!--# Copyright 2014-2021 DMTF. --> ++<!--# For the full DMTF copyright policy, see http://www.dmtf.org/about/policies/copyright --> ++<!--################################################################################ --> ++<!----> ++<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0"> ++ ++ <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Core.V1.xml"> ++ <edmx:Include Namespace="Org.OData.Core.V1" Alias="OData"/> ++ </edmx:Reference> ++ <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Capabilities.V1.xml"> ++ <edmx:Include Namespace="Org.OData.Capabilities.V1" Alias="Capabilities"/> ++ </edmx:Reference> ++ <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/Resource_v1.xml"> ++ <edmx:Include Namespace="Resource.v1_0_0"/> ++ </edmx:Reference> ++ <edmx:Reference Uri="http://redfish.dmtf.org/schemas/v1/RedfishExtensions_v1.xml"> ++ <edmx:Include Namespace="RedfishExtensions.v1_0_0" Alias="Redfish"/> ++ <edmx:Include Namespace="Validation.v1_0_0" Alias="Validation"/> ++ </edmx:Reference> ++ <edmx:Reference Uri="http://docs.oasis-open.org/odata/odata/v4.0/errata03/csd01/complete/vocabularies/Org.OData.Measures.V1.xml"> ++ <edmx:Include Namespace="Org.OData.Measures.V1" Alias="Measures"/> ++ </edmx:Reference> ++ ++ <edmx:DataServices> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ ++ <EntityType Name="MemoryMetrics" BaseType="Resource.v1_0_0.Resource" Abstract="true"> ++ <Annotation Term="OData.Description" String="The usage and health statistics for a memory device or system memory summary."/> ++ <Annotation Term="OData.LongDescription" String="The MemoryMetrics schema shall contain the memory metrics for a memory device or system memory summary in a Redfish implementation."/> ++ <Annotation Term="OData.AdditionalProperties" Bool="false"/> ++ <Annotation Term="Capabilities.InsertRestrictions"> ++ <Record> ++ <PropertyValue Property="Insertable" Bool="false"/> ++ </Record> ++ </Annotation> ++ <Annotation Term="Capabilities.UpdateRestrictions"> ++ <Record> ++ <PropertyValue Property="Updatable" Bool="false"/> ++ </Record> ++ </Annotation> ++ <Annotation Term="Capabilities.DeleteRestrictions"> ++ <Record> ++ <PropertyValue Property="Deletable" Bool="false"/> ++ </Record> ++ </Annotation> ++ <Annotation Term="Redfish.Uris"> ++ <Collection> ++ <String>/redfish/v1/Systems/{ComputerSystemId}/MemorySummary/MemoryMetrics</String> ++ <String>/redfish/v1/Systems/{ComputerSystemId}/Memory/{MemoryId}/MemoryMetrics</String> ++ <String>/redfish/v1/Systems/{ComputerSystemId}/Processors/{ProcessorId}/MemorySummary/MemoryMetrics</String> ++ <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Memory/{MemoryId}/MemoryMetrics</String> ++ <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Processors/{ProcessorId}/MemorySummary/MemoryMetrics</String> ++ <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Memory/{MemoryId}/MemoryMetrics</String> ++ <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/MemorySummary/MemoryMetrics</String> ++ <String>/redfish/v1/CompositionService/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/MemorySummary/MemoryMetrics</String> ++ <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Memory/{MemoryId}/MemoryMetrics</String> ++ <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Processors/{ProcessorId}/MemorySummary/MemoryMetrics</String> ++ <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Memory/{MemoryId}/MemoryMetrics</String> ++ <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/MemorySummary/MemoryMetrics</String> ++ <String>/redfish/v1/ResourceBlocks/{ResourceBlockId}/Systems/{ComputerSystemId}/Processors/{ProcessorId}/MemorySummary/MemoryMetrics</String> ++ </Collection> ++ </Annotation> ++ </EntityType> ++ ++ <Action Name="ClearCurrentPeriod" IsBound="true"> ++ <Parameter Name="MemoryMetrics" Type="MemoryMetrics.v1_0_0.Actions"/> ++ <Annotation Term="OData.Description" String="This action sets the CurrentPeriod property's values to 0."/> ++ <Annotation Term="OData.LongDescription" String="This action shall set the CurrentPeriod property's values to 0."/> ++ </Action> ++ ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_0_0"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="Redfish.Release" String="2016.1"/> ++ ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.MemoryMetrics"> ++ <Property Name="BlockSizeBytes" Type="Edm.Int64"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="The block size, in bytes."/> ++ <Annotation Term="OData.LongDescription" String="This property shall contain the block size, in bytes, of all structure elements. When this resource is subordinate to the MemorySummary object, this property is not applicable."/> ++ <Annotation Term="Measures.Unit" String="By"/> ++ </Property> ++ <Property Name="CurrentPeriod" Type="MemoryMetrics.v1_0_0.CurrentPeriod" Nullable="false"> ++ <Annotation Term="OData.Description" String="The memory metrics since the last reset or ClearCurrentPeriod action."/> ++ <Annotation Term="OData.LongDescription" String="This property shall contain properties that describe the memory metrics for the current period."/> ++ </Property> ++ <Property Name="LifeTime" Type="MemoryMetrics.v1_0_0.LifeTime" Nullable="false"> ++ <Annotation Term="OData.Description" String="The memory metrics for the lifetime of the memory."/> ++ <Annotation Term="OData.LongDescription" String="This property shall contain properties that describe the memory metrics for the lifetime of the memory."/> ++ </Property> ++ <Property Name="HealthData" Type="MemoryMetrics.v1_0_0.HealthData" Nullable="false"> ++ <Annotation Term="OData.Description" String="The health information of the memory."/> ++ <Annotation Term="OData.LongDescription" String="This property shall contain properties that describe the health data memory metrics for the memory."/> ++ </Property> ++ <Property Name="Actions" Type="MemoryMetrics.v1_0_0.Actions" Nullable="false"> ++ <Annotation Term="OData.Description" String="The available actions for this resource."/> ++ <Annotation Term="OData.LongDescription" String="This property shall contain the available actions for this resource."/> ++ </Property> ++ </EntityType> ++ ++ <ComplexType Name="CurrentPeriod"> ++ <Annotation Term="OData.AdditionalProperties" Bool="false"/> ++ <Annotation Term="OData.Description" String="The memory metrics since the last system reset or ClearCurrentPeriod action."/> ++ <Annotation Term="OData.LongDescription" String="This type shall describe the memory metrics since last system reset or ClearCurrentPeriod action."/> ++ <Property Name="BlocksRead" Type="Edm.Int64"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="The number of blocks read since reset."/> ++ <Annotation Term="OData.LongDescription" String="This property shall contain the number of blocks read since reset. When this resource is subordinate to the MemorySummary object, this property shall be the sum of BlocksRead over all memory."/> ++ </Property> ++ <Property Name="BlocksWritten" Type="Edm.Int64"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="The number of blocks written since reset."/> ++ <Annotation Term="OData.LongDescription" String="This property shall contain the number of blocks written since reset. When this resource is subordinate to the MemorySummary object, this property shall be the sum of BlocksWritten over all memory."/> ++ </Property> ++ </ComplexType> ++ ++ <ComplexType Name="LifeTime"> ++ <Annotation Term="OData.AdditionalProperties" Bool="false"/> ++ <Annotation Term="OData.Description" String="The memory metrics for the lifetime of the memory."/> ++ <Annotation Term="OData.LongDescription" String="This type shall describe the memory metrics since manufacturing."/> ++ <Property Name="BlocksRead" Type="Edm.Int64"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="The number of blocks read for the lifetime of the memory."/> ++ <Annotation Term="OData.LongDescription" String="This property shall contain the number of blocks read for the lifetime of the memory. When this resource is subordinate to the MemorySummary object, this property shall be the sum of BlocksRead over all memory."/> ++ </Property> ++ <Property Name="BlocksWritten" Type="Edm.Int64"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="The number of blocks written for the lifetime of the memory."/> ++ <Annotation Term="OData.LongDescription" String="This property shall contain the number of blocks written for the lifetime of the memory. When this resource is subordinate to the MemorySummary object, this property shall be the sum of BlocksWritten over all memory."/> ++ </Property> ++ </ComplexType> ++ ++ <ComplexType Name="HealthData"> ++ <Annotation Term="OData.AdditionalProperties" Bool="false"/> ++ <Annotation Term="OData.Description" String="The health information of the memory."/> ++ <Annotation Term="OData.LongDescription" String="This type shall contain properties that describe the HealthData metrics for this resource."/> ++ <Property Name="RemainingSpareBlockPercentage" Type="Edm.Decimal"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="The remaining spare blocks, as a percentage."/> ++ <Annotation Term="OData.LongDescription" String="This property shall contain the remaining spare blocks as a percentage. When this resource is subordinate to the MemorySummary object, this property shall be the RemainingSpareBlockPercentage over all memory."/> ++ <Annotation Term="Measures.Unit" String="%"/> ++ </Property> ++ <Property Name="LastShutdownSuccess" Type="Edm.Boolean"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="An indication of whether the last shutdown succeeded."/> ++ <Annotation Term="OData.LongDescription" String="This property shall indicate whether the last shutdown succeeded."/> ++ </Property> ++ <Property Name="DataLossDetected" Type="Edm.Boolean"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="An indication of whether data loss was detected."/> ++ <Annotation Term="OData.LongDescription" String="This property shall indicate whether data loss was detected. When this resource is subordinate to the MemorySummary object, this property shall indicate whether any data loss was detected in any area of memory."/> ++ </Property> ++ <Property Name="PerformanceDegraded" Type="Edm.Boolean"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="An indication of whether performance has degraded."/> ++ <Annotation Term="OData.LongDescription" String="This property shall indicate whether performance has degraded. When this resource is subordinate to the MemorySummary object, this property shall indicate whether degraded performance mode status is detected in any area of memory."/> ++ </Property> ++ <Property Name="AlarmTrips" Type="MemoryMetrics.v1_0_0.AlarmTrips" Nullable="false"> ++ <Annotation Term="OData.Description" String="Alarm trip information about the memory."/> ++ <Annotation Term="OData.LongDescription" String="This object shall contain properties describe the types of alarms that have been raised by the memory. When this resource is subordinate to the MemorySummary object, this property shall indicate whether an alarm of a given type have been raised by any area of memory."/> ++ </Property> ++ </ComplexType> ++ ++ <ComplexType Name="AlarmTrips"> ++ <Annotation Term="OData.AdditionalProperties" Bool="false"/> ++ <Annotation Term="OData.Description" String="The alarm trip information about the memory. These alarms are reset when the system resets. Note that if they are re-discovered they can be reasserted."/> ++ <Annotation Term="OData.LongDescription" String="This type shall contain properties that describe the types of alarms that have been raised by the memory. These alarms shall be reset when the system resets. Note that if they are re-discovered they can be reasserted."/> ++ <Property Name="Temperature" Type="Edm.Boolean"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="An indication of whether a temperature threshold alarm trip was detected."/> ++ <Annotation Term="OData.LongDescription" String="This property shall indicates whether a temperature threshold alarm trip was detected."/> ++ </Property> ++ <Property Name="SpareBlock" Type="Edm.Boolean"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="An indication of whether the spare block capacity crossing alarm trip was detected."/> ++ <Annotation Term="OData.LongDescription" String="This property shall indicate whether the spare block capacity crossing alarm trip was detected."/> ++ </Property> ++ <Property Name="UncorrectableECCError" Type="Edm.Boolean"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="An indication of whether the uncorrectable error threshold alarm trip was detected."/> ++ <Annotation Term="OData.LongDescription" String="This property shall indicate whether the uncorrectable error threshold alarm trip was detected."/> ++ </Property> ++ <Property Name="CorrectableECCError" Type="Edm.Boolean"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="An indication of whether the correctable error threshold crossing alarm trip was detected."/> ++ <Annotation Term="OData.LongDescription" String="This property shall indicate whether the correctable error threshold crossing alarm trip was detected."/> ++ </Property> ++ <Property Name="AddressParityError" Type="Edm.Boolean"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="An indication of whether an address parity error was detected that a retry could not correct."/> ++ <Annotation Term="OData.LongDescription" String="This property shall indicate whether an address parity error was detected that a retry could not correct."/> ++ </Property> ++ </ComplexType> ++ ++ <ComplexType Name="Actions"> ++ <Annotation Term="OData.AdditionalProperties" Bool="false"/> ++ <Annotation Term="OData.Description" String="The available actions for this resource."/> ++ <Annotation Term="OData.LongDescription" String="This type shall contain the available actions for this resource."/> ++ <Property Name="Oem" Type="MemoryMetrics.v1_0_0.OemActions" Nullable="false"> ++ <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/> ++ <Annotation Term="OData.LongDescription" String="This property shall contain the available OEM-specific actions for this resource."/> ++ </Property> ++ </ComplexType> ++ ++ <ComplexType Name="OemActions"> ++ <Annotation Term="OData.AdditionalProperties" Bool="true"/> ++ <Annotation Term="OData.Description" String="The available OEM-specific actions for this resource."/> ++ <Annotation Term="OData.LongDescription" String="This type shall contain the available OEM-specific actions for this resource."/> ++ </ComplexType> ++ ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_0_1"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version was created to show that annotations in previous namespaces were updated."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_0_0.MemoryMetrics"/> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_0_2"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version was created to show BlocksWritten in CurrentPeriod and LifeTime ComplexTypes, and to update annotations in earlier versions of namespaces."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_0_1.MemoryMetrics"/> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_0_3"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version shows that AlarmTrips was modified to add semantics about AlarmTrips resets upon system reset."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_0_2.MemoryMetrics"/> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_0_4"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version was created to force the regeneration of JSON Schema so that OData properties are marked as required, and integer properties are marked as integer rather than number. It was also created to add missing percent units onto existing properties."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_0_3.MemoryMetrics"/> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_0_5"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version was created to force the regeneration of JSON Schema so that URI properties use the uri-reference format."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_0_4.MemoryMetrics"/> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_0_6"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version was created to update descriptions to give guidance to the usage of certain properties when the metrics is used for a summary of all memory in a system. It was also created to update descriptions that this schema defines."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_0_5.MemoryMetrics"/> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_0_7"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version was created to update description HealthData to allow for usage when this resource is subordinate to the MemorySummary object."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_0_6.MemoryMetrics"/> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_0_8"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_0_7.MemoryMetrics"/> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_1_0"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="Redfish.Release" String="2016.2"/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_0_0.MemoryMetrics"/> ++ ++ <ComplexType Name="HealthData" BaseType="MemoryMetrics.v1_0_0.HealthData"> ++ <Property Name="PredictedMediaLifeLeftPercent" Type="Edm.Decimal"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="The percentage of reads and writes that are predicted to still be available for the media."/> ++ <Annotation Term="OData.LongDescription" String="This property shall contain an indicator of the percentage of life remaining in the media."/> ++ <Annotation Term="Measures.Unit" String="%"/> ++ </Property> ++ </ComplexType> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_1_1"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version was created to show that annotations in previous namespaces were updated."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_1_0.MemoryMetrics"/> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_1_2"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version was created to show BlocksWritten in CurrentPeriod and LifeTime ComplexTypes, and to update annotations in earlier versions of namespaces."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_1_1.MemoryMetrics"/> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_1_3"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version shows that AlarmTrips was modified to add semantics about AlarmTrips resets upon system reset."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_1_2.MemoryMetrics"/> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_1_4"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version was created to force the regeneration of JSON Schema so that OData properties are marked as required, and integer properties are marked as integer rather than number. It was also created to add missing percent units onto existing properties."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_1_3.MemoryMetrics"/> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_1_5"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version was created to force the regeneration of JSON Schema so that URI properties use the uri-reference format."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_1_4.MemoryMetrics"/> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_1_6"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version was created to update descriptions to give guidance to the usage of certain properties when the metrics is used for a summary of all memory in a system. It was also created to update descriptions that this schema defines."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_1_5.MemoryMetrics"/> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_1_7"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version was created to update description HealthData to allow for usage when this resource is subordinate to the MemorySummary object."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_1_6.MemoryMetrics"/> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_1_8"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_1_7.MemoryMetrics"/> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_2_0"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="Redfish.Release" String="2019.2"/> ++ <Annotation Term="OData.Description" String="This version was created to add the BandwidthPercent property. It was also created to update property descriptions for cases when the metrics are used in a summary of all memory in a system."/> ++ ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_1_6.MemoryMetrics"> ++ <Property Name="BandwidthPercent" Type="Edm.Decimal"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="The memory bandwidth utilization as a percentage."/> ++ <Annotation Term="OData.LongDescription" String="This property shall contain memory bandwidth utilization as a percentage. When this resource is subordinate to the MemorySummary object, this property shall be the memory bandwidth utilization over all memory as a percentage."/> ++ <Annotation Term="Validation.Minimum" Int="0"/> ++ <Annotation Term="Measures.Unit" String="%"/> ++ </Property> ++ </EntityType> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_2_1"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version was created to update description HealthData to allow for usage when this resource is subordinate to the MemorySummary object."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_2_0.MemoryMetrics"/> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_2_2"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_2_1.MemoryMetrics"/> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_3_0"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="Redfish.Release" String="2020.1"/> ++ <Annotation Term="OData.Description" String="This version was created to add OperatingSpeedMHz property."/> ++ ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_2_1.MemoryMetrics"> ++ <Property Name="OperatingSpeedMHz" Type="Edm.Int64"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="Operating speed of memory in MHz or MT/s as appropriate."/> ++ <Annotation Term="OData.LongDescription" String="This property shall contain the operating speed of memory in MHz or MT/s (mega-transfers per second) as reported by the memory device. Memory devices that operate at their bus speed shall report the operating speed in MHz (bus speed), while memory devices that transfer data faster than their bus speed, such as DDR memory, shall report the operating speed in MT/s (mega-transfers/second). The reported value shall match the conventionally reported values for the technology used by the memory device."/> ++ <Annotation Term="Measures.Unit" String="MHz"/> ++ </Property> ++ </EntityType> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_3_1"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_3_0.MemoryMetrics"/> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_4_0"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="Redfish.Release" String="2020.3"/> ++ <Annotation Term="OData.Description" String="This version was created to add CorrectableECCErrorCount and UncorrectableECCErrorCount properties for CurrentPeriod and LifeTime of the memory."/> ++ ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_3_0.MemoryMetrics"/> ++ ++ <ComplexType Name="CurrentPeriod" BaseType="MemoryMetrics.v1_0_0.CurrentPeriod"> ++ <Property Name="CorrectableECCErrorCount" Type="Edm.Int64"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="The number of the correctable errors since reset."/> ++ <Annotation Term="OData.LongDescription" String="This property shall contain the number of correctable errors since reset. When this resource is subordinate to the MemorySummary object, this property shall be the sum of CorrectableECCErrorCount over all memory."/> ++ </Property> ++ <Property Name="UncorrectableECCErrorCount" Type="Edm.Int64"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="The number of the uncorrectable errors since reset."/> ++ <Annotation Term="OData.LongDescription" String="This property shall contain the number of uncorrectable errors since reset. When this resource is subordinate to the MemorySummary object, this property shall be the sum of UncorrectableECCErrorCount over all memory."/> ++ </Property> ++ </ComplexType> ++ ++ <ComplexType Name="LifeTime" BaseType="MemoryMetrics.v1_0_0.LifeTime"> ++ <Property Name="CorrectableECCErrorCount" Type="Edm.Int64"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="The number of the correctable errors for the lifetime of the memory."/> ++ <Annotation Term="OData.LongDescription" String="This property shall contain the number of the correctable errors for the lifetime of the memory. When this resource is subordinate to the MemorySummary object, this property shall be the sum of CorrectableECCErrorCount over all memory."/> ++ </Property> ++ <Property Name="UncorrectableECCErrorCount" Type="Edm.Int64"> ++ <Annotation Term="OData.Permissions" EnumMember="OData.Permission/Read"/> ++ <Annotation Term="OData.Description" String="The number of the uncorrectable errors for the lifetime of the memory."/> ++ <Annotation Term="OData.LongDescription" String="This property shall contain the number of the uncorrectable errors for the lifetime of the memory. When this resource is subordinate to the MemorySummary object, this property shall be the sum of UncorrectableECCErrorCount over all memory."/> ++ </Property> ++ </ComplexType> ++ </Schema> ++ ++ <Schema xmlns="http://docs.oasis-open.org/odata/ns/edm" Namespace="MemoryMetrics.v1_4_1"> ++ <Annotation Term="Redfish.OwningEntity" String="DMTF"/> ++ <Annotation Term="OData.Description" String="This version was created to fix typos in descriptions and long descriptions."/> ++ <EntityType Name="MemoryMetrics" BaseType="MemoryMetrics.v1_4_0.MemoryMetrics"/> ++ </Schema> ++ ++ </edmx:DataServices> ++</edmx:Edmx> +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0008-Add-BIOSAttributesChanged-message-entry.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0008-Add-BIOSAttributesChanged-message-entry.patch new file mode 100644 index 000000000..bbcd7df12 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/biosconfig/0008-Add-BIOSAttributesChanged-message-entry.patch @@ -0,0 +1,88 @@ +From d2b0499ad8b8610f8be1963f5ca1bb8548a97641 Mon Sep 17 00:00:00 2001 +From: Snehalatha Venkatesh <snehalathax.v@intel.com> +Date: Mon, 11 Apr 2022 07:12:53 +0000 +Subject: [PATCH] Add BIOSAttributesChanged message entry + +When BIOS attributes are changed via OOB (using Redfish PATCH operation) +No Redfish event is logged. + +Added a Message Registry entry to inform that a set of BIOS attributes +are changed via OOB. It will be logged after BIOS reset, during which +attributes are re-populated with patched values. + +Changing the BIOS attributes via OOB is possible only through +Redfish PATCH operation currently and not supported through IPMI. + +This event is implemented for the following review. +https://gerrit.openbmc-project.xyz/c/openbmc/intel-ipmi-oem/+/52320 + +Tested: +1. Redfish validator - passed for this new addition. +2. Enable "BMC Remote Setup" and Set BIOS admin password. +3. Do BIOS reset. +4. Check for the attributes in redfish uri +GET: /redfish/v1/Systems/system/Bios +Response: Success +5. Patch any attribute. +PATCH: /redfish/v1/Systems/system/Bios/Settings +Body: +{ + "data": { + "serialDebugMsgLvl": "0x2" +}} +Response: Success +6. Do BIOS reset. +7. Verified in Redfish, Biosattribute change message populated. +GET: /redfish/v1/Systems/system/LogServices/EventLog/Entries +Response: +{ + "@odata.id": "/redfish/v1/Systems/system/LogServices/EventLog/Entries/32635", + "@odata.type": "#LogEntry.v1_8_0.LogEntry", + "Created": "1970-01-01T09:03:55+00:00", + "EntryType": "Event", + "Id": "32635", + "Message": "Set of BIOS Attributes changed.", + "MessageArgs": [], + "MessageId": "OpenBMC.0.1.BIOSAttributesChanged", + "Name": "System Event Log Entry", + "Severity": "OK" +} + +Signed-off-by: Snehalatha Venkatesh <snehalathax.v@intel.com> +--- + .../include/registries/openbmc_message_registry.hpp | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +diff --git a/redfish-core/include/registries/openbmc_message_registry.hpp b/redfish-core/include/registries/openbmc_message_registry.hpp +index a181080..f0e0e59 100644 +--- a/redfish-core/include/registries/openbmc_message_registry.hpp ++++ b/redfish-core/include/registries/openbmc_message_registry.hpp +@@ -29,7 +29,7 @@ const Header header = { + "0.3.1", + "OpenBMC", + }; +-constexpr std::array<MessageEntry, 200> registry = { ++constexpr std::array<MessageEntry, 201> registry = { + MessageEntry{ + "ADDDCCorrectable", + { +@@ -139,6 +139,16 @@ constexpr std::array<MessageEntry, 200> registry = { + "None.", + }}, + ++ MessageEntry{"BIOSAttributesChanged", ++ { ++ "Indicates that a set of BIOS attributes changed.", ++ "Set of BIOS Attributes changed.", ++ "OK", ++ "OK", ++ 0, ++ {}, ++ "None.", ++ }}, + MessageEntry{ + "BIOSBoot", + { +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0006-Add-EventService-SSE-filter-support.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0006-Add-EventService-SSE-filter-support.patch index 05018a47d..5b2c48926 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0006-Add-EventService-SSE-filter-support.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0006-Add-EventService-SSE-filter-support.patch @@ -33,18 +33,18 @@ Signed-off-by: AppaRao Puli <apparao.puli@linux.intel.com> Signed-off-by: P Dheeraj Srujan Kumar <p.dheeraj.srujan.kumar@intel.com> Change-Id: I55c6f53bb5e57aa1f2d1601f1a16525a33b13bd2 --- - include/eventservice_sse.hpp | 145 +++++++++++++++++- + include/eventservice_sse.hpp | 146 +++++++++++++++++- redfish-core/include/error_messages.hpp | 9 ++ .../include/event_service_manager.hpp | 5 + redfish-core/lib/event_service.hpp | 5 - redfish-core/src/error_messages.cpp | 26 ++++ - 5 files changed, 181 insertions(+), 9 deletions(-) + 5 files changed, 182 insertions(+), 9 deletions(-) diff --git a/include/eventservice_sse.hpp b/include/eventservice_sse.hpp index 14daf00..fed7fec 100644 --- a/include/eventservice_sse.hpp +++ b/include/eventservice_sse.hpp -@@ -23,16 +23,153 @@ static bool createSubscription(std::shared_ptr<crow::SseConnection>& conn, +@@ -23,16 +23,154 @@ static bool createSubscription(std::shared_ptr<crow::SseConnection>& conn, } BMCWEB_LOG_DEBUG << "Request query param size: " << req.urlParams.size(); @@ -199,6 +199,7 @@ index 14daf00..fed7fec 100644 + subValue->registryMsgIds = msgIds; + subValue->registryPrefixes = regPrefixes; + subValue->metricReportDefinitions = mrdsArray; ++ subValue->subscriptionOwner = req.session->username; std::string id = redfish::EventServiceManager::getInstance().addSubscription(subValue, diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0015-Add-Configure-Self-support-for-Event-Subscriptions.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0015-Add-Configure-Self-support-for-Event-Subscriptions.patch new file mode 100644 index 000000000..ee62f1cbe --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb/eventservice/0015-Add-Configure-Self-support-for-Event-Subscriptions.patch @@ -0,0 +1,220 @@ +From fdc4667e34cb8ede4529e116b35ed4d411328e08 Mon Sep 17 00:00:00 2001 +From: P Dheeraj Srujan Kumar <p.dheeraj.srujan.kumar@intel.com> +Date: Fri, 11 Feb 2022 05:26:19 +0530 +Subject: [PATCH] Add Configure Self support for Event Subscriptions + +As per DTMF redfish schema privilege registry PATCH and DELETE operations +on event subscriptions require ConfigureManager or ConfigureSelf +privilege. +Currently, only ConfigureManager support was enabled, which implies only +Admin user will be able to PATCH and DELETE any given subscription. +This commits adds the support to enable ConfigureSelf, which implies, an +Operator user will be able to PATCH or DELETE self created subscription. +This support is enabled by adding SubscriptionOwner field to the +Subscriptions class, so that the Owner of the subscription will be +stored when a subscription is created. +This Commit also ensures backward compatibility by not mandating the +SubscriptionOwner field. Which implies, the older subscriptions which do +not have a SubscriptionOwner will not be force removed, but can only be +PATCHED or DELETED by Administrator. + +Tested: + - Created 2 Operator level users - Operator1 and Operator2 + - Created subscription by POST to + /redfish/v1/EventService/Subscriptions using Operator1 + - PATCH and DELETE on the subscription failed successfully when using + Operator2 user. + - PATCH and DELETE was successfull when using Operator1 user. + +Signed-off-by: P Dheeraj Srujan Kumar <p.dheeraj.srujan.kumar@intel.com> +--- + include/event_service_store.hpp | 11 +++ + include/persistent_data.hpp | 1 + + .../include/event_service_manager.hpp | 2 + + redfish-core/lib/event_service.hpp | 80 ++++++++++++++++--- + 4 files changed, 81 insertions(+), 13 deletions(-) + +diff --git a/include/event_service_store.hpp b/include/event_service_store.hpp +index dcc99f1..6997136 100644 +--- a/include/event_service_store.hpp ++++ b/include/event_service_store.hpp +@@ -22,6 +22,7 @@ struct UserSubscription + std::vector<std::string> resourceTypes; + boost::beast::http::fields httpHeaders; + std::vector<std::string> metricReportDefinitions; ++ std::string subscriptionOwner; + + static std::shared_ptr<UserSubscription> + fromJson(const nlohmann::json& j, const bool loadFromOldConfig = false) +@@ -172,6 +173,16 @@ struct UserSubscription + subvalue->metricReportDefinitions.emplace_back(*value); + } + } ++ else if (element.key() == "SubscriptionOwner") ++ { ++ const std::string* value = ++ element.value().get_ptr<const std::string*>(); ++ if (value == nullptr) ++ { ++ continue; ++ } ++ subvalue->subscriptionOwner = *value; ++ } + else + { + BMCWEB_LOG_ERROR +diff --git a/include/persistent_data.hpp b/include/persistent_data.hpp +index dbd3618..48855ec 100644 +--- a/include/persistent_data.hpp ++++ b/include/persistent_data.hpp +@@ -305,6 +305,7 @@ class ConfigFile + {"ResourceTypes", subValue->resourceTypes}, + {"SubscriptionType", subValue->subscriptionType}, + {"MetricReportDefinitions", subValue->metricReportDefinitions}, ++ {"SubscriptionOwner", subValue->subscriptionOwner}, + }); + } + persistentFile << data; +diff --git a/redfish-core/include/event_service_manager.hpp b/redfish-core/include/event_service_manager.hpp +index 1ba9f21..a1b8921 100644 +--- a/redfish-core/include/event_service_manager.hpp ++++ b/redfish-core/include/event_service_manager.hpp +@@ -692,6 +692,7 @@ class EventServiceManager + subValue->resourceTypes = newSub->resourceTypes; + subValue->httpHeaders = newSub->httpHeaders; + subValue->metricReportDefinitions = newSub->metricReportDefinitions; ++ subValue->subscriptionOwner = newSub->subscriptionOwner; + + if (subValue->id.empty()) + { +@@ -1008,6 +1009,7 @@ class EventServiceManager + newSub->resourceTypes = subValue->resourceTypes; + newSub->httpHeaders = subValue->httpHeaders; + newSub->metricReportDefinitions = subValue->metricReportDefinitions; ++ newSub->subscriptionOwner = subValue->subscriptionOwner; + persistent_data::EventServiceStore::getInstance() + .subscriptionsConfigMap.emplace(newSub->id, newSub); + +diff --git a/redfish-core/lib/event_service.hpp b/redfish-core/lib/event_service.hpp +index 9eb845c..2fb2ab1 100644 +--- a/redfish-core/lib/event_service.hpp ++++ b/redfish-core/lib/event_service.hpp +@@ -296,6 +296,7 @@ inline void requestRoutesEventDestinationCollection(App& app) + std::make_shared<Subscription>(host, port, path, uriProto); + + subValue->destinationUrl = destUrl; ++ subValue->subscriptionOwner = req.session->username; + + if (subscriptionType) + { +@@ -577,11 +578,7 @@ inline void requestRoutesEventDestination(App& app) + mrdJsonArray; + }); + BMCWEB_ROUTE(app, "/redfish/v1/EventService/Subscriptions/<str>/") +- // The below privilege is wrong, it should be ConfigureManager OR +- // ConfigureSelf +- // https://github.com/openbmc/bmcweb/issues/220 +- //.privileges(redfish::privileges::patchEventDestination) +- .privileges({{"ConfigureManager"}}) ++ .privileges(redfish::privileges::patchEventDestination) + .methods(boost::beast::http::verb::patch)( + [](const crow::Request& req, + const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, +@@ -595,6 +592,36 @@ inline void requestRoutesEventDestination(App& app) + return; + } + ++ Privileges effectiveUserPrivileges = ++ redfish::getUserPrivileges(req.userRole); ++ bool isConfigureManager = ++ effectiveUserPrivileges.isSupersetOf({"ConfigureManager"}); ++ ++ if (!isConfigureManager) ++ { ++ // If the user does not have Configure manager privilege ++ // then the user must be an Operator (i.e. Configure ++ // Components and Self) ++ // We need to ensure that the User is the actual owner of the ++ // Subscription being patched ++ // This also supports backward compatibility as subscription ++ // owner would be empty which would not be equal to current ++ // user, enabling only Admin to be able to patch the ++ // Subscription ++ ++ if (subValue->subscriptionOwner == "") ++ { ++ messages::insufficientPrivilege(asyncResp->res); ++ return; ++ } ++ ++ if (subValue->subscriptionOwner != req.session->username) ++ { ++ messages::insufficientPrivilege(asyncResp->res); ++ return; ++ } ++ } ++ + std::optional<std::string> context; + std::optional<std::string> retryPolicy; + std::optional<std::vector<nlohmann::json>> headers; +@@ -653,22 +680,49 @@ inline void requestRoutesEventDestination(App& app) + EventServiceManager::getInstance().updateSubscription(param); + }); + BMCWEB_ROUTE(app, "/redfish/v1/EventService/Subscriptions/<str>/") +- // The below privilege is wrong, it should be ConfigureManager OR +- // ConfigureSelf +- // https://github.com/openbmc/bmcweb/issues/220 +- //.privileges(redfish::privileges::deleteEventDestination) +- .privileges({{"ConfigureManager"}}) ++ .privileges(redfish::privileges::deleteEventDestination) + .methods(boost::beast::http::verb::delete_)( +- [](const crow::Request&, ++ [](const crow::Request& req, + const std::shared_ptr<bmcweb::AsyncResp>& asyncResp, + const std::string& param) { +- if (!EventServiceManager::getInstance().isSubscriptionExist( +- param)) ++ std::shared_ptr<Subscription> subValue = ++ EventServiceManager::getInstance().getSubscription(param); ++ if (subValue == nullptr) + { + asyncResp->res.result( + boost::beast::http::status::not_found); + return; + } ++ ++ Privileges effectiveUserPrivileges = ++ redfish::getUserPrivileges(req.userRole); ++ bool isConfigureManager = ++ effectiveUserPrivileges.isSupersetOf({"ConfigureManager"}); ++ ++ if (!isConfigureManager) ++ { ++ // If the user does not have Configure manager privilege ++ // then the user must be an Operator (i.e. Configure ++ // Components and Self) ++ // We need to ensure that the User is the actual owner of the ++ // Subscription being deleted ++ // This also supports backward compatibility as subscription ++ // owner would be empty which would not be equal to current ++ // user, enabling only Admin to be able to patch the ++ // Subscription ++ ++ if (subValue->subscriptionOwner == "") ++ { ++ messages::insufficientPrivilege(asyncResp->res); ++ return; ++ } ++ ++ if (subValue->subscriptionOwner != req.session->username) ++ { ++ messages::insufficientPrivilege(asyncResp->res); ++ return; ++ } ++ } + EventServiceManager::getInstance().deleteSubscription(param); + }); + } +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend index f7154bda1..45622be30 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -27,6 +27,10 @@ SRC_URI += "file://0001-Firmware-update-configuration-changes.patch \ file://0029-Fix-Property-PhysicalContext-is-invalid-none.patch \ file://0030-Change-Severity-for-ServiceFailure-redfish-event.patch \ file://0031-Change-PcieType-to-PCIeType.patch \ + file://0032-Remove-chassis-from-the-odata-id-of-the-PSU.patch \ + file://0033-Add-message-registry-entry-for-Memhot-event.patch \ + file://0034-Update-odata.type-version-of-redfish-v1-AccountService.patch \ + file://0035-Add-MemoryMetrics-schema-file.patch \ " # OOB Bios Config: @@ -37,6 +41,7 @@ SRC_URI += "file://biosconfig/0001-Define-Redfish-interface-Registries-Bios.patc file://biosconfig/0005-Fix-remove-bios-user-pwd-change-option-via-Redfish.patch \ file://biosconfig/0006-Add-fix-for-broken-feature-Pending-Attributes.patch \ file://biosconfig/0007-Add-BiosAttributeRegistry-node-under-Registries.patch \ + file://biosconfig/0008-Add-BIOSAttributesChanged-message-entry.patch \ " # Virtual Media: Backend code is not upstreamed so downstream only patches. @@ -64,6 +69,7 @@ SRC_URI += "file://eventservice/0001-Add-unmerged-changes-for-http-retry-support file://eventservice/0012-Add-support-for-deleting-terminated-subscriptions.patch \ file://eventservice/0013-event-service-fix-added-Context-field-to-response.patch \ file://eventservice/0014-Fix-Event-Subscription-URI.patch \ + file://eventservice/0015-Add-Configure-Self-support-for-Event-Subscriptions.patch \ " diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb index 687a71caf..bdc85913f 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpd.bb @@ -4,8 +4,8 @@ DESCRIPTION = "Implementation of MCTP (DTMF DSP0236)" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e" -SRC_URI = "git://git@github.com/Intel-BMC/mctpd.git;protocol=ssh;branch=main" -SRCREV = "1d8974fda04b2888032b99fdcc8022353cab52f3" +SRC_URI = "git://git@github.com/Intel-BMC/mctpd.git;protocol=ssh;branch=1-release" +SRCREV = "4aa697fba21a2d0d0770358a8c9493bf5d8d5741" S = "${WORKDIR}/git" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpwplus.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpwplus.bb index 2c84eb697..10435f6f0 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpwplus.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/mctpwplus.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=615045c30a05cde5c0e924854d43c327" SRC_URI = "git://git@github.com/Intel-BMC/mctpwplus.git;protocol=ssh;branch=main" -SRCREV = "7a7425ce324497d1199af2cc9ce0e948cc226307" +SRCREV = "4a59172db42e6bc55ea00b8c41adb54894a4f9b5" S = "${WORKDIR}/git" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/nvmemi-daemon.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/nvmemi-daemon.bb index 97168e8a9..1573b5347 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/nvmemi-daemon.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/nvmemi-daemon.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRC_URI = "git://git@github.com/Intel-BMC/nvme-mi.git;protocol=ssh;branch=master" -SRCREV = "f33407cec7dd1f5702402d9dea05d6a141f34d4d" +SRCREV = "8bcc5ef307ac4445d9589d0c866d13455c46b811" S = "${WORKDIR}/git" PV = "1.0+git${SRCPV}" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pldmd.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pldmd.bb index c641132be..fccf18cb9 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pldmd.bb +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/pmci/pldmd.bb @@ -4,8 +4,8 @@ DESCRIPTION = "Implementation of PLDM specifications" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI += "git://git@github.com/Intel-BMC/pldmd.git;protocol=ssh;branch=main" -SRCREV = "5a698ca08b8159d935f8ccbc09a84960cf201896" +SRC_URI += "git://git@github.com/Intel-BMC/pldmd.git;protocol=ssh;branch=1-release" +SRCREV = "dd493b97dd7b243738e2d00c983a82a8a6d05db0" S = "${WORKDIR}/git" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0008-CPUSensor-additional-debug-message.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0008-CPUSensor-additional-debug-message.patch deleted file mode 100644 index be2f7fa9a..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0008-CPUSensor-additional-debug-message.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 805ae6679f49d0d7a3a6448af97f3cb639b9634f Mon Sep 17 00:00:00 2001 -From: Zhikui Ren <zhikui.ren@intel.com> -Date: Tue, 22 Jun 2021 14:49:44 -0700 -Subject: [PATCH] CPUSensor: additional debug message - -Add debug message to capture more information on threshold changes. - -Example output - DTS threshold changes when Tcontrol was first read - Jan 01 00:06:06 intel-obmc cpusensor[461]: Core_16_CPU1: Tcontrol changed from nan to 92 - Jan 01 00:06:06 intel-obmc cpusensor[461]: Core_22_CPU1: Tcontrol changed from nan to 92 - Jan 01 00:06:06 intel-obmc cpusensor[461]: Core_24_CPU1: Tcontrol changed from nan to 92 - Jan 01 00:06:06 intel-obmc cpusensor[461]: DTS_CPU1: Tcontrol changed from nan to 92 - Jan 01 00:06:06 intel-obmc cpusensor[461]: Threshold: /sys/bus/peci/devices/peci-0/0-30/peci-cputemp.0/hwmon/hwmon12/temp2_max: 92 - Jan 01 00:06:06 intel-obmc cpusensor[461]: Threshold: /sys/bus/peci/devices/peci-0/0-30/peci-cputemp.0/hwmon/hwmon12/temp2_crit: 100 - Jan 01 00:06:06 intel-obmc cpusensor[461]: DTS_CPU1: new threshold value 92 - Jan 01 00:06:06 intel-obmc cpusensor[461]: DTS_CPU1: new threshold value 100 - -The above message will be logged when BMC reset or host resets. - -Signed-off-by: Zhikui Ren <zhikui.ren@intel.com> ---- - src/CPUSensor.cpp | 5 +++++ - src/Thresholds.cpp | 7 ++----- - 2 files changed, 7 insertions(+), 5 deletions(-) - -diff --git a/src/CPUSensor.cpp b/src/CPUSensor.cpp -index fefd89a..de33f9b 100644 ---- a/src/CPUSensor.cpp -+++ b/src/CPUSensor.cpp -@@ -315,6 +315,7 @@ void CPUSensor::handleResponse(const boost::system::error_code& err) - : std::numeric_limits<double>::quiet_NaN(); - if (gTcontrol != privTcontrol) - { -+ std::cout << name << ": Tcontrol changed from " << privTcontrol << " to " << gTcontrol << "\n"; - privTcontrol = gTcontrol; - - if (!thresholds.empty()) -@@ -333,6 +334,10 @@ void CPUSensor::handleResponse(const boost::system::error_code& err) - thresholds::updateThresholds(this); - } - } -+ for (auto& threshold : thresholds) -+ { -+ std::cout << name << ": new threshold value " << threshold.value << "\n"; -+ } - } - else - { -diff --git a/src/Thresholds.cpp b/src/Thresholds.cpp -index 84df7cf..d1e04eb 100644 ---- a/src/Thresholds.cpp -+++ b/src/Thresholds.cpp -@@ -592,11 +592,8 @@ bool parseThresholdsFromAttr( - if (auto val = readFile(attrPath, scaleFactor)) - { - *val += offset; -- if (debug) -- { -- std::cout << "Threshold: " << attrPath << ": " << *val -- << "\n"; -- } -+ std::cout << "Threshold: " << attrPath << ": " << *val -+ << "\n"; - thresholdVector.emplace_back(level, direction, *val); - } - } --- -2.17.1 - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0008-CPUSensor-update-threshold-when-Tcontrol-changes.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0008-CPUSensor-update-threshold-when-Tcontrol-changes.patch new file mode 100644 index 000000000..17fd0436e --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors/0008-CPUSensor-update-threshold-when-Tcontrol-changes.patch @@ -0,0 +1,170 @@ +From 0f38d31ab5812e3791b4394b7e8adae44a2c2fb1 Mon Sep 17 00:00:00 2001 +From: Zhikui Ren <zhikui.ren@intel.com> +Date: Tue, 22 Jun 2021 14:49:44 -0700 +Subject: [PATCH] CPUSensor: update threshold when Tcontrol changes + +CPUSensor threshold values are derived from thermal target Tcontrol. +When a new Tcontrol value is returned from PECI, thresholds values are +updated by reading from tempx_crit and tempx_max in hwmon directory. +The issue is that if the read fails, thresholds can get deleted and +they don't get added back. Fix the issue by only update the thresholds +when new threshold values are read successfully. + +Another issue is that, currently, thresholds interfaces do not get +created if the read from the limit file fails because resource is +unavailable at the init time. Thresholds interfaces do not get added +even after resource become available. Create the thresholds interfaces +with NaN as the value if the limit files exist. Values get updated when +resources gets available. This is a workaround until dbus-sensors is +refactored to support dynamically create threshold interfaces. + +Add debug message to capture more information on threshold changes. + +Example output - DTS threshold changes when Tcontrol was first read + Jan 01 00:06:06 intel-obmc cpusensor[461]: DTS_CPU1: Tcontrol changed from nan to 92 + Jan 01 00:06:06 intel-obmc cpusensor[461]: Threshold: /sys/bus/peci/devices/peci-0/0-30/peci-cputemp.0/hwmon/hwmon12/temp2_max: 92 + Jan 01 00:06:06 intel-obmc cpusensor[461]: Threshold: /sys/bus/peci/devices/peci-0/0-30/peci-cputemp.0/hwmon/hwmon12/temp2_crit: 100 + Jan 01 00:06:06 intel-obmc cpusensor[461]: DTS_CPU1: new threshold value 92 + Jan 01 00:06:06 intel-obmc cpusensor[461]: DTS_CPU1: new threshold value 100 + +The above message will be logged when BMC reset or host resets. + +Signed-off-by: Zhikui Ren <zhikui.ren@intel.com> +Change-Id: I24ade7751a6b2802c8eaef9a52d2578fff11da75 + +--- + include/Utils.hpp | 2 +- + src/CPUSensor.cpp | 39 +++++++++++++++++++++++++-------------- + src/Thresholds.cpp | 13 +++++++------ + src/Utils.cpp | 7 ++++++- + 4 files changed, 39 insertions(+), 22 deletions(-) + +diff --git a/include/Utils.hpp b/include/Utils.hpp +index 0a89d13..f5939c7 100644 +--- a/include/Utils.hpp ++++ b/include/Utils.hpp +@@ -324,6 +324,6 @@ struct GetSensorConfiguration : + std::optional<std::tuple<std::string, std::string, std::string>> + splitFileName(const std::filesystem::path& filePath); + std::optional<double> readFile(const std::string& thresholdFile, +- const double& scaleFactor); ++ const double& scaleFactor, bool nanOk = false); + void setupManufacturingModeMatch(sdbusplus::asio::connection& conn); + bool getManufacturingMode(); +diff --git a/src/CPUSensor.cpp b/src/CPUSensor.cpp +index fefd89a..4671e6a 100644 +--- a/src/CPUSensor.cpp ++++ b/src/CPUSensor.cpp +@@ -313,19 +313,21 @@ void CPUSensor::handleResponse(const boost::system::error_code& err) + double gTcontrol = gCpuSensors[nameTcontrol] + ? gCpuSensors[nameTcontrol]->value + : std::numeric_limits<double>::quiet_NaN(); +- if (gTcontrol != privTcontrol) ++ if (std::isfinite(gTcontrol) && (gTcontrol != privTcontrol)) + { +- privTcontrol = gTcontrol; +- +- if (!thresholds.empty()) ++ // update thresholds when ++ // 1) A different valid Tcontrol value is received ++ // 2) New threshold values have been read successfully ++ // Note: current thresholds can be empty if hwmon attr was not ++ // ready when sensor was first created ++ std::vector<thresholds::Threshold> newThresholds; ++ if (parseThresholdsFromAttr(newThresholds, path, scaleFactor, ++ dtsOffset)) + { +- std::vector<thresholds::Threshold> newThresholds; +- if (parseThresholdsFromAttr(newThresholds, path, +- scaleFactor, dtsOffset)) ++ if (!std::equal(thresholds.begin(), thresholds.end(), ++ newThresholds.begin(), newThresholds.end())) + { +- if (!std::equal(thresholds.begin(), thresholds.end(), +- newThresholds.begin(), +- newThresholds.end())) ++ if (!newThresholds.empty()) + { + thresholds = newThresholds; + if (show) +@@ -333,13 +335,22 @@ void CPUSensor::handleResponse(const boost::system::error_code& err) + thresholds::updateThresholds(this); + } + } +- } +- else +- { +- std::cerr << "Failure to update thresholds for " << name ++ std::cout << name << ": Tcontrol changed from " ++ << privTcontrol << " to " << gTcontrol + << "\n"; ++ for (auto& threshold : thresholds) ++ { ++ std::cout << name << ": new threshold value " ++ << threshold.value << "\n"; ++ } + } + } ++ else ++ { ++ std::cerr << "Failure to update thresholds for " << name ++ << "\n"; ++ } ++ privTcontrol = gTcontrol; + } + } + catch (const std::invalid_argument&) +diff --git a/src/Thresholds.cpp b/src/Thresholds.cpp +index 84df7cf..aef084e 100644 +--- a/src/Thresholds.cpp ++++ b/src/Thresholds.cpp +@@ -589,14 +589,15 @@ bool parseThresholdsFromAttr( + auto& [suffix, level, direction, offset] = t; + auto attrPath = + boost::replace_all_copy(inputPath, item, suffix); +- if (auto val = readFile(attrPath, scaleFactor)) ++ //create threshold with value NaN if file exists ++ //read can fail because resource is busy ++ //This allows thresholds interfaces created during init ++ //values will be updated when resource is available later. ++ if (auto val = readFile(attrPath, scaleFactor, true)) + { + *val += offset; +- if (debug) +- { +- std::cout << "Threshold: " << attrPath << ": " << *val +- << "\n"; +- } ++ std::cout << "Threshold: " << attrPath << ": " << *val ++ << "\n"; + thresholdVector.emplace_back(level, direction, *val); + } + } +diff --git a/src/Utils.cpp b/src/Utils.cpp +index 6d017ec..ef709f6 100644 +--- a/src/Utils.cpp ++++ b/src/Utils.cpp +@@ -554,7 +554,7 @@ void createInventoryAssoc( + } + + std::optional<double> readFile(const std::string& thresholdFile, +- const double& scaleFactor) ++ const double& scaleFactor, bool nanOk) + { + std::string line; + std::ifstream labelFile(thresholdFile); +@@ -569,6 +569,11 @@ std::optional<double> readFile(const std::string& thresholdFile, + } + catch (const std::invalid_argument&) + { ++ if (nanOk) ++ { ++ //indicate file exists, but read failed ++ return std::numeric_limits<double>::quiet_NaN(); ++ } + return std::nullopt; + } + } +-- +2.17.1 + diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend index 09a2a50ed..8f7440120 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend @@ -13,7 +13,7 @@ SRC_URI += "\ file://0005-Fix-PECI-ioctl-number.patch \ file://0006-CPUSensor-create-RequirediTempSensor-if-defined.patch \ file://0007-Add-support-for-the-energy-hwmon-type.patch \ - file://0008-CPUSensor-additional-debug-message.patch \ + file://0008-CPUSensor-update-threshold-when-Tcontrol-changes.patch \ file://0009-CPUSensor-Create-CPUConfig-for-each-PECI-adapter.patch \ file://0010-Add-support-for-Get-PMBUS-Readings-method.patch \ file://0011-Fix-for-cpusensor-going-into-D-state.patch \ |