of the raw block devices media. Currently "El Torito CD-ROM", Legacy\r
MBR, and GPT partition schemes are supported.\r
\r
-Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved.<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
EFI_BLOCK_IO_PROTOCOL *BlockIo;\r
EFI_BLOCK_IO2_PROTOCOL *BlockIo2;\r
EFI_DISK_IO_PROTOCOL *DiskIo;\r
+ EFI_DISK_IO2_PROTOCOL *DiskIo2;\r
EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath;\r
PARTITION_DETECT_ROUTINE *Routine;\r
BOOLEAN MediaPresent;\r
(VOID **) &BlockIo2,\r
This->DriverBindingHandle,\r
ControllerHandle,\r
- EFI_OPEN_PROTOCOL_BY_DRIVER\r
+ EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
);\r
+ if (EFI_ERROR (Status)) {\r
+ BlockIo2 = NULL;\r
+ }\r
\r
//\r
// Get the Device Path Protocol on ControllerHandle's handle.\r
goto Exit;\r
}\r
\r
+ //\r
+ // Get the DiskIo and DiskIo2.\r
+ //\r
Status = gBS->OpenProtocol (\r
ControllerHandle,\r
&gEfiDiskIoProtocolGuid,\r
\r
OpenStatus = Status;\r
\r
+ Status = gBS->OpenProtocol (\r
+ ControllerHandle,\r
+ &gEfiDiskIo2ProtocolGuid,\r
+ (VOID **) &DiskIo2,\r
+ This->DriverBindingHandle,\r
+ ControllerHandle,\r
+ EFI_OPEN_PROTOCOL_BY_DRIVER\r
+ );\r
+ if (EFI_ERROR (Status) && Status != EFI_ALREADY_STARTED) {\r
+ DiskIo2 = NULL;\r
+ }\r
+\r
//\r
// Try to read blocks when there's media or it is removable physical partition.\r
//\r
This,\r
ControllerHandle,\r
DiskIo,\r
+ DiskIo2,\r
BlockIo,\r
BlockIo2,\r
ParentDevicePath\r
// \r
gBS->CloseProtocol (\r
ControllerHandle,\r
- &gEfiBlockIo2ProtocolGuid,\r
+ &gEfiDiskIo2ProtocolGuid,\r
This->DriverBindingHandle,\r
ControllerHandle\r
);\r
Probe the media status and return EFI_NO_MEDIA or EFI_MEDIA_CHANGED\r
for no media or media change case. Otherwise DefaultStatus is returned.\r
\r
- @param BlockIo2 Pointer to the BlockIo2 instance.\r
+ @param DiskIo2 Pointer to the DiskIo2 instance.\r
@param MediaId Id of the media, changes every time the media is replaced.\r
@param DefaultStatus The default status to return when it's not the no media\r
or media change case.\r
**/\r
EFI_STATUS\r
ProbeMediaStatusEx (\r
- IN EFI_BLOCK_IO2_PROTOCOL *BlockIo2,\r
+ IN EFI_DISK_IO2_PROTOCOL *DiskIo2,\r
IN UINT32 MediaId,\r
IN EFI_STATUS DefaultStatus\r
)\r
EFI_STATUS Status;\r
\r
//\r
- // Read from LBA 0 but passing NULL as buffer pointer to detect the media status.\r
+ // Read 1 byte from offset 0 but passing NULL as buffer pointer\r
//\r
- Status = BlockIo2->ReadBlocksEx (\r
- BlockIo2,\r
- MediaId,\r
- 0,\r
- NULL,\r
- 0,\r
- NULL\r
- );\r
+ Status = DiskIo2->ReadDiskEx (DiskIo2, MediaId, 0, NULL, 1, NULL);\r
if ((Status == EFI_NO_MEDIA) || (Status == EFI_MEDIA_CHANGED)) {\r
return Status;\r
}\r
);\r
}\r
\r
+/**\r
+ The general callback for the DiskIo2 interfaces.\r
+ @param Event Event whose notification function is being invoked.\r
+ @param Context The pointer to the notification function's context,\r
+ which points to the PARTITION_ACCESS_TASK instance.\r
+**/\r
+VOID\r
+EFIAPI\r
+PartitionOnAccessComplete (\r
+ IN EFI_EVENT Event,\r
+ IN VOID *Context\r
+ )\r
+{\r
+ PARTITION_ACCESS_TASK *Task;\r
+\r
+ Task = (PARTITION_ACCESS_TASK *) Context;\r
+\r
+ gBS->CloseEvent (Event);\r
+\r
+ Task->BlockIo2Token->TransactionStatus = Task->DiskIo2Token.TransactionStatus;\r
+ gBS->SignalEvent (Task->BlockIo2Token->Event);\r
+\r
+ FreePool (Task);\r
+}\r
+\r
+/**\r
+ Create a new PARTITION_ACCESS_TASK instance.\r
+\r
+ @param Token Pointer to the EFI_BLOCK_IO2_TOKEN.\r
+\r
+ @return Pointer to the created PARTITION_ACCESS_TASK instance or NULL upon failure.\r
+**/\r
+PARTITION_ACCESS_TASK *\r
+PartitionCreateAccessTask (\r
+ IN EFI_BLOCK_IO2_TOKEN *Token\r
+ )\r
+{\r
+ EFI_STATUS Status;\r
+ PARTITION_ACCESS_TASK *Task;\r
+\r
+ Task = AllocatePool (sizeof (*Task));\r
+ if (Task == NULL) {\r
+ return NULL;\r
+ }\r
+\r
+ Status = gBS->CreateEvent (\r
+ EVT_NOTIFY_SIGNAL,\r
+ TPL_CALLBACK,\r
+ PartitionOnAccessComplete,\r
+ Task,\r
+ &Task->DiskIo2Token.Event\r
+ );\r
+ if (EFI_ERROR (Status)) {\r
+ FreePool (Task);\r
+ return NULL;\r
+ }\r
+\r
+ Task->BlockIo2Token = Token;\r
+\r
+ return Task;\r
+}\r
+\r
/**\r
Read BufferSize bytes from Lba into Buffer.\r
\r
OUT VOID *Buffer\r
)\r
{\r
+ EFI_STATUS Status;\r
PARTITION_PRIVATE_DATA *Private;\r
UINT64 Offset;\r
- UINT32 UnderRun;\r
+ PARTITION_ACCESS_TASK *Task;\r
\r
Private = PARTITION_DEVICE_FROM_BLOCK_IO2_THIS (This);\r
\r
- if (Token == NULL) {\r
- return ProbeMediaStatusEx (Private->ParentBlockIo2, MediaId, EFI_INVALID_PARAMETER);\r
- }\r
-\r
if (BufferSize % Private->BlockSize != 0) {\r
- return ProbeMediaStatusEx (Private->ParentBlockIo2, MediaId, EFI_BAD_BUFFER_SIZE);\r
+ return ProbeMediaStatusEx (Private->DiskIo2, MediaId, EFI_BAD_BUFFER_SIZE);\r
}\r
\r
Offset = MultU64x32 (Lba, Private->BlockSize) + Private->Start;\r
if (Offset + BufferSize > Private->End) {\r
- return ProbeMediaStatusEx (Private->ParentBlockIo2, MediaId, EFI_INVALID_PARAMETER);\r
+ return ProbeMediaStatusEx (Private->DiskIo2, MediaId, EFI_INVALID_PARAMETER);\r
}\r
\r
- //\r
- // Since the BlockIO2 call Parent BlockIO2 directly, so here the offset must\r
- // be multiple of BlockSize. If the Spec will be updated the DiskIO to support\r
- // BlockIO2, this limitation will be removed and call DiskIO here.\r
- //\r
- Lba = DivU64x32Remainder (Offset, Private->BlockSize, &UnderRun);\r
- if (UnderRun != 0) {\r
- return ProbeMediaStatusEx (Private->ParentBlockIo2, MediaId, EFI_UNSUPPORTED);\r
- }\r
+ if ((Token != NULL) && (Token->Event != NULL)) {\r
+ Task = PartitionCreateAccessTask (Token);\r
+ if (Task == NULL) {\r
+ return EFI_OUT_OF_RESOURCES;\r
+ }\r
\r
- //\r
- // Because some partitions have different block size from their parent\r
- // device, in that case the Block I/O2 couldn't be called.\r
- //\r
- if (Private->BlockSize != Private->ParentBlockIo->Media->BlockSize) {\r
- return ProbeMediaStatusEx (Private->ParentBlockIo2, MediaId, EFI_UNSUPPORTED);\r
+ Status = Private->DiskIo2->ReadDiskEx (Private->DiskIo2, MediaId, Offset, &Task->DiskIo2Token, BufferSize, Buffer);\r
+ if (EFI_ERROR (Status)) {\r
+ gBS->CloseEvent (Task->DiskIo2Token.Event);\r
+ FreePool (Task);\r
+ }\r
+ } else {\r
+ Status = Private->DiskIo2->ReadDiskEx (Private->DiskIo2, MediaId, Offset, NULL, BufferSize, Buffer);\r
}\r
\r
- return Private->ParentBlockIo2->ReadBlocksEx (Private->ParentBlockIo2, MediaId, Lba, Token, BufferSize, Buffer);\r
+ return Status;\r
}\r
\r
/**\r
IN VOID *Buffer\r
)\r
{\r
+ EFI_STATUS Status;\r
PARTITION_PRIVATE_DATA *Private;\r
UINT64 Offset;\r
- UINT32 UnderRun;\r
+ PARTITION_ACCESS_TASK *Task;\r
\r
Private = PARTITION_DEVICE_FROM_BLOCK_IO2_THIS (This);\r
\r
- if (Token == NULL) {\r
- return ProbeMediaStatusEx (Private->ParentBlockIo2, MediaId, EFI_INVALID_PARAMETER);\r
- }\r
-\r
if (BufferSize % Private->BlockSize != 0) {\r
- return ProbeMediaStatusEx (Private->ParentBlockIo2, MediaId, EFI_BAD_BUFFER_SIZE);\r
+ return ProbeMediaStatusEx (Private->DiskIo2, MediaId, EFI_BAD_BUFFER_SIZE);\r
}\r
\r
Offset = MultU64x32 (Lba, Private->BlockSize) + Private->Start;\r
if (Offset + BufferSize > Private->End) {\r
- return ProbeMediaStatusEx (Private->ParentBlockIo2, MediaId, EFI_INVALID_PARAMETER);\r
- }\r
-\r
- //\r
- // Since the BlockIO2 call Parent BlockIO2 directly, so here the offset must\r
- // be multiple of BlockSize. If the Spec will be updated the DiskIO to support\r
- // BlockIO2, this limitation will be removed and call DiskIO here.\r
- //\r
- Lba = DivU64x32Remainder (Offset, Private->BlockSize, &UnderRun);\r
- if (UnderRun != 0) {\r
- return ProbeMediaStatusEx (Private->ParentBlockIo2, MediaId, EFI_UNSUPPORTED);\r
+ return ProbeMediaStatusEx (Private->DiskIo2, MediaId, EFI_INVALID_PARAMETER);\r
}\r
+ \r
+ if ((Token != NULL) && (Token->Event != NULL)) {\r
+ Task = PartitionCreateAccessTask (Token);\r
+ if (Task == NULL) {\r
+ return EFI_OUT_OF_RESOURCES;\r
+ }\r
\r
- //\r
- // Because some kinds of partition have different block size from their parent,\r
- // in that case it couldn't call parent Block I/O2. \r
- //\r
- if (Private->BlockSize != Private->ParentBlockIo->Media->BlockSize) {\r
- return ProbeMediaStatusEx (Private->ParentBlockIo2, MediaId, EFI_UNSUPPORTED);\r
+ Status = Private->DiskIo2->WriteDiskEx (Private->DiskIo2, MediaId, Offset, &Task->DiskIo2Token, BufferSize, Buffer);\r
+ if (EFI_ERROR (Status)) {\r
+ gBS->CloseEvent (Task->DiskIo2Token.Event);\r
+ FreePool (Task);\r
+ }\r
+ } else {\r
+ Status = Private->DiskIo2->WriteDiskEx (Private->DiskIo2, MediaId, Offset, NULL, BufferSize, Buffer);\r
}\r
-\r
- return Private->ParentBlockIo2->WriteBlocksEx (Private->ParentBlockIo2, MediaId, Lba, Token, BufferSize, Buffer);\r
+ return Status;\r
}\r
\r
/**\r
IN OUT EFI_BLOCK_IO2_TOKEN *Token\r
)\r
{\r
+ EFI_STATUS Status;\r
PARTITION_PRIVATE_DATA *Private;\r
+ PARTITION_ACCESS_TASK *Task;\r
\r
Private = PARTITION_DEVICE_FROM_BLOCK_IO2_THIS (This);\r
\r
- //\r
- // Because some kinds of partition have different block size from their parent,\r
- // in that case it couldn't call parent Block I/O2. \r
- //\r
- if (Private->BlockSize != Private->ParentBlockIo->Media->BlockSize) {\r
- return EFI_UNSUPPORTED;\r
- }\r
+ if ((Token != NULL) && (Token->Event != NULL)) {\r
+ Task = PartitionCreateAccessTask (Token);\r
+ if (Task == NULL) {\r
+ return EFI_OUT_OF_RESOURCES;\r
+ }\r
\r
- return Private->ParentBlockIo2->FlushBlocksEx (Private->ParentBlockIo2, Token);\r
+ Status = Private->DiskIo2->FlushDiskEx (Private->DiskIo2, &Task->DiskIo2Token);\r
+ if (EFI_ERROR (Status)) {\r
+ gBS->CloseEvent (Task->DiskIo2Token.Event);\r
+ FreePool (Task);\r
+ }\r
+ } else {\r
+ Status = Private->DiskIo2->FlushDiskEx (Private->DiskIo2, NULL);\r
+ }\r
+ return Status;\r
}\r
\r
\r
@param[in] This Protocol instance pointer.\r
@param[in] ParentHandle Parent Handle for new child.\r
@param[in] ParentDiskIo Parent DiskIo interface.\r
+ @param[in] ParentDiskIo2 Parent DiskIo2 interface.\r
@param[in] ParentBlockIo Parent BlockIo interface.\r
@param[in] ParentBlockIo2 Parent BlockIo2 interface.\r
@param[in] ParentDevicePath Parent Device Path.\r
IN EFI_DRIVER_BINDING_PROTOCOL *This,\r
IN EFI_HANDLE ParentHandle,\r
IN EFI_DISK_IO_PROTOCOL *ParentDiskIo,\r
+ IN EFI_DISK_IO2_PROTOCOL *ParentDiskIo2,\r
IN EFI_BLOCK_IO_PROTOCOL *ParentBlockIo,\r
IN EFI_BLOCK_IO2_PROTOCOL *ParentBlockIo2,\r
IN EFI_DEVICE_PATH_PROTOCOL *ParentDevicePath,\r
Private->ParentBlockIo = ParentBlockIo;\r
Private->ParentBlockIo2 = ParentBlockIo2;\r
Private->DiskIo = ParentDiskIo;\r
+ Private->DiskIo2 = ParentDiskIo2;\r
\r
//\r
// Set the BlockIO into Private Data.\r
//\r
// Set the BlockIO2 into Private Data.\r
//\r
- if (Private->ParentBlockIo2 != NULL) {\r
+ if (Private->DiskIo2 != NULL) {\r
+ ASSERT (Private->ParentBlockIo2 != NULL);\r
Private->BlockIo2.Media = &Private->Media2;\r
CopyMem (Private->BlockIo2.Media, ParentBlockIo2->Media, sizeof (EFI_BLOCK_IO_MEDIA));\r
\r
\r
Private->Media.BlockSize = (UINT32) BlockSize;\r
\r
- //\r
- // For BlockIO2, it should keep the same alignment with the parent BlockIO2's.\r
- //\r
+ Private->Media2.IoAlign = 0;\r
Private->Media2.LogicalPartition = TRUE;\r
Private->Media2.LastBlock = Private->Media.LastBlock;\r
Private->Media2.BlockSize = (UINT32) BlockSize;\r
\r
//\r
// Create the new handle. \r
- // BlockIO2 will be installed on the condition that the blocksize of parent BlockIO \r
- // is same with the child BlockIO's. Instead of calling the DiskIO, the child BlockIO2 \r
- // directly call the parent BlockIO and doesn't handle the different block size issue.\r
- // If SPEC will update the DiskIO to support the Non-Blocking model, the BlockIO2 will call\r
- // DiskIO to handle the blocksize unequal issue and the limitation will be remove from\r
- // here.\r
//\r
Private->Handle = NULL;\r
- if ((Private->ParentBlockIo2 != NULL) &&\r
- (Private->ParentBlockIo2->Media->BlockSize == BlockSize)\r
- ) {\r
+ if (Private->DiskIo2 != NULL) {\r
Status = gBS->InstallMultipleProtocolInterfaces (\r
&Private->Handle,\r
&gEfiDevicePathProtocolGuid,\r