Changed mention from DCPM to DCPMM for consistency and for show topol…

…ogy change DCPM to Logical Non-Volatile Device to match documentation Signed-off-by: Amy Wang <[email protected]>
intel · Nov 12, 2018 · bf70757 · bf70757
1 parent 65c7b70
commit bf70757
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 10 deletions.
diff --git a/DcpmPkg/common/Printer.h b/DcpmPkg/common/Printer.h
@@ -38,7 +38,7 @@
 #define PMEM_TYPE_MAX_STR_WIDTH             24
 #define FREE_CAPACITY_MAX_STR_WIDTH         13
 #define MEMORY_SIZE_MAX_STR_WIDTH           18
-#define MEMORY_TYPE_MAX_STR_WIDTH           10
+#define MEMORY_TYPE_MAX_STR_WIDTH           30
 #define DEVICE_LOCATOR_MAX_STR_WIDTH        15
 
 

diff --git a/DcpmPkg/common/Types.h b/DcpmPkg/common/Types.h
@@ -22,8 +22,8 @@
 
 #define COUNT_OF(x) ((sizeof(x)/sizeof(0[x])) / ((size_t)(!(sizeof(x) % sizeof(0[x])))))
 
-#define PMEM_MODULE_NAME L"Intel(R) DCPM "  //short version for drivers list
-#define PMEM_MODULE_NAME_SEARCH L"Intel(R),DCPM" //comma separated search string
+#define PMEM_MODULE_NAME L"Intel(R) DCPMM "  //short version for drivers list
+#define PMEM_MODULE_NAME_SEARCH L"Intel(R),DCPMM" //comma separated search string
 
 #define PMEM_DIMM_NAME  L"Intel Persistent Memory DIMM %d Controller"
 

diff --git a/DcpmPkg/common/Utility.h b/DcpmPkg/common/Utility.h
@@ -143,7 +143,7 @@ typedef union {
 #define OVERWRITE_DIMM_STATUS_COMPLETED_STR    L"Completed"
 
 // Memory type string values
-#define MEMORY_TYPE_DCPM_STR     L"DCPM"
+#define MEMORY_TYPE_DCPM_STR     L"Logical Non-Volatile Device"
 #define MEMORY_TYPE_DDR4_STR     L"DDR4"
 #define MEMORY_TYPE_UNKNOWN_STR  L"Unknown"
 

diff --git a/DcpmPkg/driver/Utils/AcpiParsing.c b/DcpmPkg/driver/Utils/AcpiParsing.c
@@ -368,7 +368,7 @@ CheckIsMemoryModeAllowed(
             PMTT_MODULE *pModule = (PMTT_MODULE *)(((UINT8 *)pCommonHeader) + sizeof(pCommonHeader));
             // if IsDCPM is already set then continue to loop to find the offset of the next aggregated device
             if (!IsDCPM) {
-              // bit 2 is set then DCPM
+              // bit 2 is set then DCPMM
               if ((pCommonHeader->Flags & PMTT_DDR_DCPM_FLAG) && pModule->SizeOfDimm > 0) {
                 IsDCPM = TRUE;
               } else if (!(pCommonHeader->Flags & PMTT_DDR_DCPM_FLAG) && pModule->SizeOfDimm > 0) {

diff --git a/Documentation/ipmctl/DIMM_Discovery/ipmctl-show-device.txt b/Documentation/ipmctl/DIMM_Discovery/ipmctl-show-device.txt
@@ -1,4 +1,4 @@
-// Copyright (c) 2018, Intel Corporation.
+// Copyright (c) 2018, Intel Corporation.
 // SPDX-License-Identifier: BSD-3-Clause
 
 ifdef::manpage[]
@@ -179,7 +179,7 @@ MemoryType::
   The memory type. One of:
   - Unknown
   - DDR4
-  - DCPMM
+  - Logical Non-Volatile Device
 
 VendorID::
   The vendor identifier of the DCPMM

diff --git a/Documentation/ipmctl/DIMM_Discovery/ipmctl-show-topology.txt b/Documentation/ipmctl/DIMM_Discovery/ipmctl-show-topology.txt
@@ -80,7 +80,7 @@ MemoryType::
   (Default) The DIMM type. One of:
   - Unknown
   - DDR4
-  - DCPM
+  - Logical Non-volatile Device
 
 Capacity::
   (Default) The raw capacity of the DIMM as reported in the SMBIOS Type 17

diff --git a/src/os/nvm_api/nvm_management.c b/src/os/nvm_api/nvm_management.c
@@ -236,7 +236,7 @@ NVM_API int nvm_run_cli(int argc, char *argv[])
 
   if (gOsShellParametersProtocol.StdOut == stdout)
   {
-    //WA to ensure wprintf work throughout invocation of DCPM mgmt stack.
+    //WA to ensure wprintf work throughout invocation of DCPMM mgmt stack.
     wprintf(L"\n");
   }
 

diff --git a/src/os/nvm_api/nvm_management.h b/src/os/nvm_api/nvm_management.h
@@ -859,7 +859,7 @@ struct memory_capabilities {
  * Supported features and capabilities BIOS supports
  */
 struct platform_capabilities {
-  NVM_BOOL			bios_config_support;            ///< available BIOS support for DCPM config changes
+  NVM_BOOL			bios_config_support;            ///< available BIOS support for DCPMM config changes
   NVM_BOOL			bios_runtime_support;           ///< runtime interface used to validate management configuration
   NVM_BOOL			memory_mirror_supported;        ///< indicates if DCPMM mirror is supported
   NVM_BOOL			storage_mode_supported;         ///< is storage mode supported