tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-23 05:34:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg RamDiskDxe: Fix wrong HII behavior for more than 8 RAM disks

Browse Source 
The RamDiskDxe driver originally uses a variable-length HII varstore to
retrieve the HII checkbox status of each registered RAM disk.

However, HII does not support the variable-length varstore feature.
Therefore, only the checkbox status for the first 8 RAM disks are tracked
for the following definition of HII varstore structure considering the
alignment:

typedef struct {
  UINT64    Size;
  UINT8     RamDiskList[0];
  } RAM_DISK_CONFIGURATION;

This commit uses the private data of each registered RAM disks to track
the HII checkbox status instead to resolve the issue.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Hao Wu <hao.a.wu@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
This commit is contained in:
Hao Wu 2016-04-20 13:23:59 +08:00
parent 259d87146b
commit 09abc63675
5 changed files with 38 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDriver.c
View File

@ -32,7 +32,6 @@ EFI_RAM_DISK_PROTOCOL mRamDiskProtocol = {
// RamDiskDxe driver maintains a list of registered RAM disks. // RamDiskDxe driver maintains a list of registered RAM disks.
// //
LIST_ENTRY RegisteredRamDisks; LIST_ENTRY RegisteredRamDisks;
UINTN ListEntryNum;
// //
// Pointers to the EFI_ACPI_TABLE_PROTOCOL and EFI_ACPI_SDT_PROTOCOL. // Pointers to the EFI_ACPI_TABLE_PROTOCOL and EFI_ACPI_SDT_PROTOCOL.

47
MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.c
View File

@ -193,7 +193,6 @@ UnregisterAllRamDisks (
FreePool (PrivateData->DevicePath); FreePool (PrivateData->DevicePath);
FreePool (PrivateData); FreePool (PrivateData);
ListEntryNum--;
} }
} }
} }
@ -263,7 +262,7 @@ RamDiskExtractConfig (
// Convert buffer data to <ConfigResp> by helper function BlockToConfig() // Convert buffer data to <ConfigResp> by helper function BlockToConfig()
// //
ConfigPrivate = RAM_DISK_CONFIG_PRIVATE_FROM_THIS (This); ConfigPrivate = RAM_DISK_CONFIG_PRIVATE_FROM_THIS (This);
BufferSize = sizeof (RAM_DISK_CONFIGURATION) + ListEntryNum; BufferSize = sizeof (RAM_DISK_CONFIGURATION);
Configuration = AllocateZeroPool (BufferSize); Configuration = AllocateZeroPool (BufferSize);
if (Configuration == NULL) { if (Configuration == NULL) {
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
@ -557,8 +556,14 @@ UpdateMainForm (
Index = 0; Index = 0;
EFI_LIST_FOR_EACH (Entry, &RegisteredRamDisks) { EFI_LIST_FOR_EACH (Entry, &RegisteredRamDisks) {
PrivateData = RAM_DISK_PRIVATE_FROM_THIS (Entry); PrivateData = RAM_DISK_PRIVATE_FROM_THIS (Entry);
String = RamDiskStr; PrivateData->CheckBoxId = (EFI_QUESTION_ID)
(MAIN_CHECKBOX_QUESTION_ID_START + Index);
//
// CheckBox is unchecked by default.
//
PrivateData->CheckBoxChecked = FALSE;
String = RamDiskStr;
UnicodeSPrint ( UnicodeSPrint (
String, String,
@ -574,12 +579,12 @@ UpdateMainForm (
HiiCreateCheckBoxOpCode ( HiiCreateCheckBoxOpCode (
StartOpCodeHandle, StartOpCodeHandle,
(EFI_QUESTION_ID) (MAIN_CHECKBOX_QUESTION_ID_START + Index), PrivateData->CheckBoxId,
RAM_DISK_CONFIGURATION_VARSTORE_ID, 0,
(UINT16) (RAM_DISK_LIST_VAR_OFFSET + Index), 0,
StringId, StringId,
STRING_TOKEN (STR_RAM_DISK_LIST_HELP), STRING_TOKEN (STR_RAM_DISK_LIST_HELP),
0, EFI_IFR_FLAG_CALLBACK,
0, 0,
NULL NULL
); );
@ -634,7 +639,6 @@ RamDiskCallback (
) )
{ {
EFI_STATUS Status; EFI_STATUS Status;
UINTN Index;
RAM_DISK_PRIVATE_DATA *PrivateData; RAM_DISK_PRIVATE_DATA *PrivateData;
RAM_DISK_CONFIG_PRIVATE_DATA *ConfigPrivate; RAM_DISK_CONFIG_PRIVATE_DATA *ConfigPrivate;
RAM_DISK_CONFIGURATION *Configuration; RAM_DISK_CONFIGURATION *Configuration;
@ -679,7 +683,7 @@ RamDiskCallback (
// //
// Get Browser data // Get Browser data
// //
Configuration = AllocateZeroPool (sizeof (RAM_DISK_CONFIGURATION) + ListEntryNum); Configuration = AllocateZeroPool (sizeof (RAM_DISK_CONFIGURATION));
if (Configuration == NULL) { if (Configuration == NULL) {
return EFI_OUT_OF_RESOURCES; return EFI_OUT_OF_RESOURCES;
} }
@ -689,7 +693,7 @@ RamDiskCallback (
HiiGetBrowserData ( HiiGetBrowserData (
&gRamDiskFormSetGuid, &gRamDiskFormSetGuid,
mRamDiskStorageName, mRamDiskStorageName,
sizeof (RAM_DISK_CONFIGURATION) + ListEntryNum, sizeof (RAM_DISK_CONFIGURATION),
(UINT8 *) Configuration (UINT8 *) Configuration
); );
@ -742,11 +746,9 @@ RamDiskCallback (
// //
// Remove the selected RAM disks // Remove the selected RAM disks
// //
Index = 0;
EFI_LIST_FOR_EACH_SAFE (Entry, NextEntry, &RegisteredRamDisks) { EFI_LIST_FOR_EACH_SAFE (Entry, NextEntry, &RegisteredRamDisks) {
if (Configuration->RamDiskList[Index++] != 0) { PrivateData = RAM_DISK_PRIVATE_FROM_THIS (Entry);
PrivateData = RAM_DISK_PRIVATE_FROM_THIS (Entry); if (PrivateData->CheckBoxChecked) {
RamDiskUnregister ( RamDiskUnregister (
(EFI_DEVICE_PATH_PROTOCOL *) PrivateData->DevicePath (EFI_DEVICE_PATH_PROTOCOL *) PrivateData->DevicePath
); );
@ -756,7 +758,6 @@ RamDiskCallback (
UpdateMainForm (ConfigPrivate); UpdateMainForm (ConfigPrivate);
*ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY; *ActionRequest = EFI_BROWSER_ACTION_REQUEST_FORM_APPLY;
ZeroMem (Configuration->RamDiskList, ListEntryNum);
break; break;
case CREATE_RAW_SUBMIT_QUESTION_ID: case CREATE_RAW_SUBMIT_QUESTION_ID:
@ -781,6 +782,18 @@ RamDiskCallback (
break; break;
default: default:
//
// QuestionIds for checkboxes
//
if ((QuestionId >= MAIN_CHECKBOX_QUESTION_ID_START) &&
(QuestionId < CREATE_RAW_RAM_DISK_FORM_ID)) {
EFI_LIST_FOR_EACH (Entry, &RegisteredRamDisks) {
PrivateData = RAM_DISK_PRIVATE_FROM_THIS (Entry);
if (PrivateData->CheckBoxId == QuestionId) {
PrivateData->CheckBoxChecked = (BOOLEAN) (Value->u8 != 0);
}
}
}
break; break;
} }
} }
@ -789,7 +802,7 @@ RamDiskCallback (
HiiSetBrowserData ( HiiSetBrowserData (
&gRamDiskFormSetGuid, &gRamDiskFormSetGuid,
mRamDiskStorageName, mRamDiskStorageName,
sizeof (RAM_DISK_CONFIGURATION) + ListEntryNum, sizeof (RAM_DISK_CONFIGURATION),
(UINT8 *) Configuration, (UINT8 *) Configuration,
NULL NULL
); );

5
MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskImpl.h
View File

@ -71,7 +71,6 @@
// RamDiskDxe driver maintains a list of registered RAM disks. // RamDiskDxe driver maintains a list of registered RAM disks.
// //
extern LIST_ENTRY RegisteredRamDisks; extern LIST_ENTRY RegisteredRamDisks;
extern UINTN ListEntryNum;
// //
// Pointers to the EFI_ACPI_TABLE_PROTOCOL and EFI_ACPI_SDT_PROTOCOL. // Pointers to the EFI_ACPI_TABLE_PROTOCOL and EFI_ACPI_SDT_PROTOCOL.
@ -108,6 +107,8 @@ typedef struct {
UINT16 InstanceNumber; UINT16 InstanceNumber;
RAM_DISK_CREATE_METHOD CreateMethod; RAM_DISK_CREATE_METHOD CreateMethod;
BOOLEAN InNfit; BOOLEAN InNfit;
EFI_QUESTION_ID CheckBoxId;
BOOLEAN CheckBoxChecked;
LIST_ENTRY ThisInstance; LIST_ENTRY ThisInstance;
} RAM_DISK_PRIVATE_DATA; } RAM_DISK_PRIVATE_DATA;
@ -145,8 +146,6 @@ extern RAM_DISK_CONFIG_PRIVATE_DATA mRamDiskConfigPrivateDataTemplate;
#define RAM_DISK_CONFIG_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('R', 'C', 'F', 'G') #define RAM_DISK_CONFIG_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('R', 'C', 'F', 'G')
#define RAM_DISK_CONFIG_PRIVATE_FROM_THIS(a) CR (a, RAM_DISK_CONFIG_PRIVATE_DATA, ConfigAccess, RAM_DISK_CONFIG_PRIVATE_DATA_SIGNATURE) #define RAM_DISK_CONFIG_PRIVATE_FROM_THIS(a) CR (a, RAM_DISK_CONFIG_PRIVATE_DATA, ConfigAccess, RAM_DISK_CONFIG_PRIVATE_DATA_SIGNATURE)
#define RAM_DISK_LIST_VAR_OFFSET ((UINT16) OFFSET_OF (RAM_DISK_CONFIGURATION, RamDiskList))
/** /**
Register a RAM disk with specified address, size and type. Register a RAM disk with specified address, size and type.

13
MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskNVData.h
View File

@ -23,9 +23,9 @@
#define MAIN_FORM_ID 0x1000 #define MAIN_FORM_ID 0x1000
#define MAIN_GOTO_FILE_EXPLORER_ID 0x1001 #define MAIN_GOTO_FILE_EXPLORER_ID 0x1001
#define MAIN_REMOVE_RD_QUESTION_ID 0x1002 #define MAIN_REMOVE_RD_QUESTION_ID 0x1002
#define MAIN_CHECKBOX_QUESTION_ID_START 0x1003 #define MAIN_LABEL_LIST_START 0x1003
#define MAIN_LABEL_LIST_START 0x1004 #define MAIN_LABEL_LIST_END 0x1004
#define MAIN_LABEL_LIST_END 0x1005 #define MAIN_CHECKBOX_QUESTION_ID_START 0x1100
#define CREATE_RAW_RAM_DISK_FORM_ID 0x2000 #define CREATE_RAW_RAM_DISK_FORM_ID 0x2000
#define CREATE_RAW_SIZE_QUESTION_ID 0x2001 #define CREATE_RAW_SIZE_QUESTION_ID 0x2001
@ -33,11 +33,10 @@
#define CREATE_RAW_DISCARD_QUESTION_ID 0x2003 #define CREATE_RAW_DISCARD_QUESTION_ID 0x2003
typedef struct { typedef struct {
//
// The size of the RAM disk to be created.
//
UINT64 Size; UINT64 Size;
//
// CheckBox status for created RAM disks
//
UINT8 RamDiskList[0];
} RAM_DISK_CONFIGURATION; } RAM_DISK_CONFIGURATION;
#endif #endif

2
MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskProtocol.c
View File

@ -694,7 +694,6 @@ RamDiskRegister (
// Insert the newly created one to the registered RAM disk list // Insert the newly created one to the registered RAM disk list
// //
InsertTailList (&RegisteredRamDisks, &PrivateData->ThisInstance); InsertTailList (&RegisteredRamDisks, &PrivateData->ThisInstance);
ListEntryNum++;
gBS->ConnectController (PrivateData->Handle, NULL, NULL, TRUE); gBS->ConnectController (PrivateData->Handle, NULL, NULL, TRUE);
@ -829,7 +828,6 @@ RamDiskUnregister (
FreePool (PrivateData->DevicePath); FreePool (PrivateData->DevicePath);
FreePool (PrivateData); FreePool (PrivateData);
ListEntryNum--;
Found = TRUE; Found = TRUE;
break; break;