diff options
10 files changed, 158 insertions, 0 deletions
diff --git a/meta-ibs/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0037-add-new-dimm-fields.patch b/meta-ibs/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0037-add-new-dimm-fields.patch new file mode 100644 index 0000000000..34dc1ab854 --- /dev/null +++ b/meta-ibs/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0037-add-new-dimm-fields.patch @@ -0,0 +1,36 @@ +From 29f5e21a995d79789fb28cef1c2b459fe9df9276 Mon Sep 17 00:00:00 2001 +From: eportnov <eportnov@ibs.ru> +Date: Fri, 8 Jul 2022 16:34:52 +0300 +Subject: [PATCH] add new dimm fields + +--- + .../openbmc_project/Inventory/Item/Dimm.interface.yaml | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/yaml/xyz/openbmc_project/Inventory/Item/Dimm.interface.yaml b/yaml/xyz/openbmc_project/Inventory/Item/Dimm.interface.yaml +index d3a7df7..ba326b0 100644 +--- a/yaml/xyz/openbmc_project/Inventory/Item/Dimm.interface.yaml ++++ b/yaml/xyz/openbmc_project/Inventory/Item/Dimm.interface.yaml +@@ -15,6 +15,7 @@ properties: + Socket on base board where Memory located, for example CPU1_DIMM_B1. + - name: MemoryType + type: enum[self.DeviceType] ++ default: DRAM + description: > + Type of memory. + - name: MemoryTypeDetail +@@ -66,6 +67,14 @@ properties: + default: Unknown + description: > + Memory Technology of this memory. ++ - name: Description ++ type: string ++ description: > ++ Description ++ - name: Model ++ type: string ++ description: > ++ Model + + enumerations: + - name: Ecc diff --git a/meta-ibs/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend b/meta-ibs/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend index 34fb790278..999739997e 100644 --- a/meta-ibs/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend +++ b/meta-ibs/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces_%.bbappend @@ -22,4 +22,5 @@ SRC_URI += "file://0007-ipmi-set-BIOS-id.patch \ file://0035-Remove-read-only-flag-from-NTPServers.patch \ file://0036-add-fields.patch \ file://0003-Add-new-fields-to-cpu.patch \ + file://0037-add-new-dimm-fields.patch \ " diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0004-add-new-dimm-fields.patch b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0004-add-new-dimm-fields.patch new file mode 100644 index 0000000000..9061fc34d9 --- /dev/null +++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb/0004-add-new-dimm-fields.patch @@ -0,0 +1,66 @@ +From c834e8916d482a20e2f322dbd772ddd8a3f2b65b Mon Sep 17 00:00:00 2001 +From: eportnov <eportnov@ibs.ru> +Date: Fri, 8 Jul 2022 16:30:51 +0300 +Subject: [PATCH] add new dimm fields + +--- + redfish-core/lib/memory.hpp | 25 ++++++++++++++++++++++++- + 1 file changed, 24 insertions(+), 1 deletion(-) + +diff --git a/redfish-core/lib/memory.hpp b/redfish-core/lib/memory.hpp +index 6e4ab67..31dd3c7 100644 +--- a/redfish-core/lib/memory.hpp ++++ b/redfish-core/lib/memory.hpp +@@ -30,6 +30,10 @@ namespace redfish + + inline std::string translateMemoryTypeToRedfish(const std::string& memoryType) + { ++ if (memoryType == "xyz.openbmc_project.Inventory.Item.Dimm.DeviceType.DRAM") ++ { ++ return "DRAM"; ++ } + if (memoryType == "xyz.openbmc_project.Inventory.Item.Dimm.DeviceType.DDR") + { + return "DDR"; +@@ -473,6 +477,7 @@ inline void getDimmDataByService(std::shared_ptr<bmcweb::AsyncResp> aResp, + messages::internalError(aResp->res); + return; + } ++ aResp->res.jsonValue["MemorySize"] = (*memorySize); + aResp->res.jsonValue["CapacityMiB"] = (*memorySize >> 10); + } + else if (property.first == "PartNumber") +@@ -647,7 +652,7 @@ inline void getDimmDataByService(std::shared_ptr<bmcweb::AsyncResp> aResp, + // so just leave off + if (!memoryDeviceType.empty()) + { +- aResp->res.jsonValue["MemoryDeviceType"] = ++ aResp->res.jsonValue["MemoryType"] = + memoryDeviceType; + } + if (value->find("DDR") != std::string::npos) +@@ -660,6 +665,24 @@ inline void getDimmDataByService(std::shared_ptr<bmcweb::AsyncResp> aResp, + } + } + } ++ else if (property.first == "Model") ++ { ++ const auto* value = ++ std::get_if<std::string>(&property.second); ++ if (value != nullptr) ++ { ++ aResp->res.jsonValue["Model"] = *value; ++ } ++ } ++ else if (property.first == "Description") ++ { ++ const auto* value = ++ std::get_if<std::string>(&property.second); ++ if (value != nullptr) ++ { ++ aResp->res.jsonValue["Description"] = *value; ++ } ++ } + // memory location interface + else if (property.first == "Channel" || + property.first == "MemoryController" || diff --git a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend index 9ce95cfe84..098d12559c 100644 --- a/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend +++ b/meta-ibs/meta-common/recipes-phosphor/interfaces/bmcweb_%.bbappend @@ -6,6 +6,7 @@ SRC_URI += "\ file://0001-Enable-vm-nbdproxy-option.patch \ file://0002-Add-http-ftp-nfs-protocols-to-un-filter-them-FT-58-T.patch \ file://0003-add-new-cpu-fields.patch \ + file://0004-add-new-dimm-fields.patch \ " EXTRA_OEMESON += "\ diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm0.yaml b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm0.yaml index 6331d50b00..531c6686b0 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm0.yaml +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm0.yaml @@ -14,6 +14,12 @@ events: MemoryTypeDetail: value: "Synchronous, Static column" type: string + Description: + value: "This is description" + type: string + Model: + value: "Kingston FURY Beast Black" + type: string - name: createObjects objs: diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm1.yaml b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm1.yaml index 8f245821ca..0ea51971cf 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm1.yaml +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm1.yaml @@ -14,6 +14,12 @@ events: MemoryTypeDetail: value: "Synchronous, Static column" type: string + Description: + value: "This is description" + type: string + Model: + value: "Kingston FURY Beast Black" + type: string - name: createObjects objs: diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm2.yaml b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm2.yaml index 1bf7d867a0..e9e8e15802 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm2.yaml +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm2.yaml @@ -14,6 +14,12 @@ events: MemoryTypeDetail: value: "Synchronous, Static column" type: string + Description: + value: "This is description" + type: string + Model: + value: "Kingston FURY Beast Black" + type: string - name: createObjects objs: diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm3.yaml b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm3.yaml index e1dfb1e4d9..48eca62db3 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm3.yaml +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/inventory/phosphor-inventory-manager-dimm/dimm3.yaml @@ -14,6 +14,12 @@ events: MemoryTypeDetail: value: "Synchronous, Static column" type: string + Description: + value: "This is description" + type: string + Model: + value: "Kingston FURY Beast Black" + type: string - name: createObjects objs: diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0002-add-new-dimm-fields.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0002-add-new-dimm-fields.patch new file mode 100644 index 0000000000..0b3cdd6475 --- /dev/null +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue/0002-add-new-dimm-fields.patch @@ -0,0 +1,29 @@ +From b2fed2b2735851248931753a70e8135318b51661 Mon Sep 17 00:00:00 2001 +From: eportnov <eportnov@ibs.ru> +Date: Fri, 8 Jul 2022 16:40:06 +0300 +Subject: [PATCH] add new dimm fields + +--- + src/store/modules/HardwareStatus/MemoryStore.js | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/store/modules/HardwareStatus/MemoryStore.js b/src/store/modules/HardwareStatus/MemoryStore.js +index fd8f0a9..ff0b00f 100644 +--- a/src/store/modules/HardwareStatus/MemoryStore.js ++++ b/src/store/modules/HardwareStatus/MemoryStore.js +@@ -26,6 +26,7 @@ const MemoryStore = { + SparePartNumber, + Description, + MemoryType, ++ Model, + MemorySize, + LocationIndicatorActive, + Location, +@@ -45,6 +46,7 @@ const MemoryStore = { + sparePartNumber: SparePartNumber, + description: Description, + memoryType: MemoryType, ++ model: Model, + memorySize: MemorySize, + identifyLed: LocationIndicatorActive, + uri: data['@odata.id'], diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend index 6f219c4e21..5d4737c597 100644 --- a/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend +++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/webui/webui-vue_%.bbappend @@ -14,6 +14,7 @@ SRCREV = "72b0bc1e6cbec314f6c6298a61e03b9db343e47e" SRC_URI += "\ file://favicon.ico \ file://0001-IBS-html-head-title.patch \ + file://0002-add-new-dimm-fields.patch \ " do_update_logo () { |