MdeModulePkg/RamDiskDxe: Add Memory Type selection support in Ramdisk HII

Adding an option in HII menu so user can choose memory type to use when
creating a RAM Disk in system.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Tapan Shah <tapandshah@hpe.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
Reviewed-by: Samer El-Haj-Mahmoud <elhaj@hpe.com>

diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskHii.vfr b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskHii.vfr
index 270f791007d7126dc52375bb240c587964f1859e..5f3d0fa7df5ac7dbd7421142238822f0ead9d417 100644 (file)
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskHii.vfr
+++ b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskHii.vfr
@@ -2,6 +2,7 @@
 //  VFR file used by the RamDiskDxe driver.\r
 //\r
 //  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
+//  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 //  This program and the accompanying materials\r
 //  are licensed and made available under the terms and conditions of the BSD License\r
 //  which accompanies this distribution.  The full text of the license may be found at\r
@@ -26,6 +27,17 @@ formset
   form formid = MAIN_FORM_ID,\r
     title  = STRING_TOKEN(STR_MAIN_FORM_TITLE);\r
 \r
+    oneof\r
+      questionid  = CREATE_RAW_MEMORY_TYPE_QUESTION_ID,\r
+        prompt      = STRING_TOKEN(STR_MEMORY_TYPE_PROMPT),\r
+        help        = STRING_TOKEN(STR_MEMORY_TYPE_HELP),\r
+        flags       = NUMERIC_SIZE_1 | INTERACTIVE,\r
+        option text = STRING_TOKEN(STR_RAM_DISK_BOOT_SERVICE_DATA_MEMORY), value = RAM_DISK_BOOT_SERVICE_DATA_MEMORY, flags = DEFAULT;\r
+        option text = STRING_TOKEN(STR_RAM_DISK_RESERVED_MEMORY), value = RAM_DISK_RESERVED_MEMORY, flags = 0;\r
+    endoneof;\r
+\r
+    subtitle text = STRING_TOKEN(STR_RAM_DISK_NULL_STRING);\r
+\r
     goto CREATE_RAW_RAM_DISK_FORM_ID,\r
       prompt = STRING_TOKEN(STR_GOTO_ADD_RAW_FORM),\r
       help   = STRING_TOKEN(STR_GOTO_ADD_RAW_FORM_HELP);\r

diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskHiiStrings.uni b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskHiiStrings.uni
index ee5f6e6ea16ec68ca50bd9aaf55cc8acffa0e284..9cc0b08441f3a265d24fdbbe700fe6713a58fc7e 100644 (file)
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskHiiStrings.uni
+++ b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskHiiStrings.uni
@@ -2,7 +2,7 @@
 // String definitions for RamDiskDxe driver form.\r
 //\r
 // Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
-//\r
+// (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 // This program and the accompanying materials\r
 // are licensed and made available under the terms and conditions of the BSD License\r
 // which accompanies this distribution. The full text of the license may be found at\r
@@ -36,6 +36,11 @@
 #string STR_SIZE_PROMPT                #language en-US "Size (Hex):"\r
 #string STR_SIZE_HELP                  #language en-US "The valid RAM disk size should be multiples of the RAM disk block size."\r
 \r
+#string STR_MEMORY_TYPE_PROMPT                #language en-US "Disk Memory Type:"\r
+#string STR_MEMORY_TYPE_HELP                  #language en-US "Specifies type of memory to use from available memory pool in system to create a disk."\r
+#string STR_RAM_DISK_BOOT_SERVICE_DATA_MEMORY #language en-US "Boot Service Data"\r
+#string STR_RAM_DISK_RESERVED_MEMORY          #language en-US "Reserved"\r
+\r
 #string STR_CREATE_AND_EXIT_HELP       #language en-US "Create a new RAM disk with the given starting and ending address."\r
 #string STR_CREATE_AND_EXIT_PROMPT     #language en-US "Create & Exit"\r
 #string STR_DISCARD_AND_EXIT_HELP      #language en-US "Discard and exit."\r

diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c
index 304d5d75cbc6c9bf472664787876336eec861f6b..b562bc1025827c936ab6c86a07b120e3b98cbfee 100644 (file)
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c
+++ b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c
@@ -2,6 +2,7 @@
   HII Config Access protocol implementation of RamDiskDxe driver.\r
 \r
   Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -19,7 +20,8 @@ CHAR16  mRamDiskStorageName[] = L"RAM_DISK_CONFIGURATION";
 RAM_DISK_CONFIG_PRIVATE_DATA mRamDiskConfigPrivateDataTemplate = {\r
   RAM_DISK_CONFIG_PRIVATE_DATA_SIGNATURE,\r
   {\r
-    EFI_PAGE_SIZE\r
+    EFI_PAGE_SIZE,\r
+    RAM_DISK_BOOT_SERVICE_DATA_MEMORY\r
   },\r
   {\r
     RamDiskExtractConfig,\r
@@ -287,6 +289,7 @@ RamDiskRouteConfig (
                              If creating from file, zero.\r
   @param[in] FileHandle      If creating raw, NULL. If creating from file, the\r
                              file handle.\r
+  @param[in] MemoryType      Type of memory to be used to create RAM Disk.\r
 \r
   @retval EFI_SUCCESS             RAM disk is created and registered.\r
   @retval EFI_OUT_OF_RESOURCES    Not enough storage is available to match the\r
@@ -296,18 +299,20 @@ RamDiskRouteConfig (
 EFI_STATUS\r
 HiiCreateRamDisk (\r
   IN UINT64                                 Size,\r
-  IN EFI_FILE_HANDLE                        FileHandle\r
+  IN EFI_FILE_HANDLE                        FileHandle,\r
+  IN UINT8                                  MemoryType\r
   )\r
 {\r
   EFI_STATUS                      Status;\r
   UINTN                           BufferSize;\r
-  UINT64                          StartingAddr;\r
+  UINT64                          *StartingAddr;\r
   EFI_INPUT_KEY                   Key;\r
   EFI_DEVICE_PATH_PROTOCOL        *DevicePath;\r
   RAM_DISK_PRIVATE_DATA           *PrivateData;\r
   EFI_FILE_INFO                   *FileInformation;\r
 \r
   FileInformation = NULL;\r
+  StartingAddr    = NULL;\r
 \r
   if (FileHandle != NULL) {\r
     //\r
@@ -352,8 +357,23 @@ HiiCreateRamDisk (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  StartingAddr = (UINTN) AllocatePool ((UINTN) Size);\r
-  if (0 == StartingAddr) {\r
+  if (MemoryType == RAM_DISK_BOOT_SERVICE_DATA_MEMORY) {\r
+    Status = gBS->AllocatePool (\r
+                    EfiBootServicesData,\r
+                    (UINTN)Size,\r
+                    (VOID**)&StartingAddr\r
+                    );\r
+  } else if (MemoryType == RAM_DISK_RESERVED_MEMORY) {\r
+    Status = gBS->AllocatePool (\r
+                    EfiReservedMemoryType,\r
+                    (UINTN)Size,\r
+                    (VOID**)&StartingAddr\r
+                    );\r
+  } else {\r
+    Status = EFI_INVALID_PARAMETER;\r
+  }\r
+\r
+  if ((StartingAddr == NULL) || EFI_ERROR(Status)) {\r
     do {\r
       CreatePopUp (\r
         EFI_LIGHTGRAY | EFI_BACKGROUND_BLUE,\r
@@ -400,7 +420,7 @@ HiiCreateRamDisk (
   // Register the newly created RAM disk.\r
   //\r
   Status = RamDiskRegister (\r
-             StartingAddr,\r
+             ((UINT64)(UINTN) StartingAddr),\r
              Size,\r
              &gEfiVirtualDiskGuid,\r
              NULL,\r
@@ -594,6 +614,10 @@ RamDiskCallback (
       Value->u64 = EFI_PAGE_SIZE;\r
       ConfigPrivate->ConfigStore.Size = EFI_PAGE_SIZE;\r
       Status = EFI_SUCCESS;\r
+    } else if (QuestionId == CREATE_RAW_MEMORY_TYPE_QUESTION_ID) {\r
+      Value->u8 = RAM_DISK_BOOT_SERVICE_DATA_MEMORY;\r
+      ConfigPrivate->ConfigStore.MemType = RAM_DISK_BOOT_SERVICE_DATA_MEMORY;\r
+      Status = EFI_SUCCESS;\r
     }\r
     return Status;\r
   }\r
@@ -644,7 +668,11 @@ RamDiskCallback (
         // Create from file, RAM disk size is zero. It will be updated\r
         // according to the file size.\r
         //\r
-        Status = HiiCreateRamDisk (0, FileHandle);\r
+        Status = HiiCreateRamDisk (\r
+                   0,\r
+                   FileHandle,\r
+                   ConfigPrivate->ConfigStore.MemType\r
+                   );\r
         if (EFI_ERROR (Status)) {\r
           break;\r
         }\r
@@ -683,11 +711,19 @@ RamDiskCallback (
       ConfigPrivate->ConfigStore.Size = Value->u64;\r
       break;\r
 \r
+    case CREATE_RAW_MEMORY_TYPE_QUESTION_ID:\r
+      ConfigPrivate->ConfigStore.MemType = Value->u8;\r
+      break;\r
+\r
     case CREATE_RAW_SUBMIT_QUESTION_ID:\r
       //\r
       // Create raw, FileHandle is NULL.\r
       //\r
-      Status = HiiCreateRamDisk (ConfigPrivate->ConfigStore.Size, NULL);\r
+      Status = HiiCreateRamDisk (\r
+                 ConfigPrivate->ConfigStore.Size,\r
+                 NULL,\r
+                 ConfigPrivate->ConfigStore.MemType\r
+                 );\r
       if (EFI_ERROR (Status)) {\r
         break;\r
       }\r

diff --git a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskNVData.h b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskNVData.h
index 89d1d5a786e0267052b5b2a6d75b38556a4cb21e..2c1fd0ee5cadf0118d5fc5798d522138798d5969 100644 (file)
--- a/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskNVData.h
+++ b/MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskNVData.h
@@ -2,6 +2,7 @@
   Header file for NV data structure definition.\r
 \r
   Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
+  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -29,12 +30,21 @@
 #define CREATE_RAW_SIZE_QUESTION_ID         0x2001\r
 #define CREATE_RAW_SUBMIT_QUESTION_ID       0x2002\r
 #define CREATE_RAW_DISCARD_QUESTION_ID      0x2003\r
+#define CREATE_RAW_MEMORY_TYPE_QUESTION_ID  0x2004\r
+\r
+#define RAM_DISK_BOOT_SERVICE_DATA_MEMORY   0x00\r
+#define RAM_DISK_RESERVED_MEMORY            0x01\r
+#define RAM_DISK_MEMORY_TYPE_MAX            0x02\r
 \r
 typedef struct {\r
   //\r
   // The size of the RAM disk to be created.\r
   //\r
   UINT64                          Size;\r
+  //\r
+  // Selected RAM Disk Memory Type\r
+  //\r
+  UINT8                           MemType;\r
 } RAM_DISK_CONFIGURATION;\r
 \r
 #endif\r