sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a lock to protect the critical region in Service APIs for gEfiBlockIoProtocolGuid Protocol to prevent re-entrance of the same API from from different TPL level.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2443 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
qwang12
2007-03-12 07:47:33 +00:00
parent 90a98f29c5
commit c094abe585
3 changed files with 103 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
EdkModulePkg/Bus/Pci/IdeBus/Dxe/idebus.c
View File

@@ -1035,6 +1035,9 @@ IDEBlkIoReset (
{
IDE_BLK_IO_DEV *IdeBlkIoDevice;
EFI_STATUS Status;
EFI_TPL OldTpl;
OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);
IdeBlkIoDevice = IDE_BLOCK_IO_DEV_FROM_THIS (This);
//
@@ -1047,11 +1050,13 @@ IDEBlkIoReset (
//
if (IdeBlkIoDevice->Type == IdeHardDisk ||
IdeBlkIoDevice->Type == Ide48bitAddressingHardDisk) {
return AtaSoftReset (IdeBlkIoDevice);
Status = AtaSoftReset (IdeBlkIoDevice);
goto Done;
}
if (IdeBlkIoDevice->Type == IdeUnknown) {
return EFI_DEVICE_ERROR;
Status = EFI_DEVICE_ERROR;
goto Done;
}
//
@@ -1062,6 +1067,8 @@ IDEBlkIoReset (
Status = AtaSoftReset (IdeBlkIoDevice);
}
Done:
gBS->RestoreTPL (OldTpl);
return Status;
}
@@ -1089,6 +1096,10 @@ IDEBlkIoReadBlocks (
// TODO: EFI_DEVICE_ERROR - add return value to function comment
{
IDE_BLK_IO_DEV *IdeBlkIoDevice;
EFI_STATUS Status;
EFI_TPL OldTpl;
OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);
IdeBlkIoDevice = IDE_BLOCK_IO_DEV_FROM_THIS (This);
@@ -1102,23 +1113,25 @@ IDEBlkIoReadBlocks (
//
if (IdeBlkIoDevice->Type == IdeHardDisk ||
IdeBlkIoDevice->Type == Ide48bitAddressingHardDisk) {
return AtaBlkIoReadBlocks (
Status = AtaBlkIoReadBlocks (
IdeBlkIoDevice,
MediaId,
LBA,
BufferSize,
Buffer
);
goto Done;
}
if (IdeBlkIoDevice->Type == IdeUnknown) {
return EFI_DEVICE_ERROR;
Status = EFI_DEVICE_ERROR;
goto Done;
}
//
// for ATAPI device, using ATAPI read block's mechanism
//
return AtapiBlkIoReadBlocks (
Status = AtapiBlkIoReadBlocks (
IdeBlkIoDevice,
MediaId,
LBA,
@@ -1126,6 +1139,10 @@ IDEBlkIoReadBlocks (
Buffer
);
Done:
gBS->RestoreTPL (OldTpl);
return Status;
}
/**
@@ -1152,7 +1169,11 @@ IDEBlkIoWriteBlocks (
// TODO: EFI_DEVICE_ERROR - add return value to function comment
{
IDE_BLK_IO_DEV *IdeBlkIoDevice;
EFI_STATUS Status;
EFI_TPL OldTpl;
OldTpl = gBS->RaiseTPL (EFI_TPL_CALLBACK);
IdeBlkIoDevice = IDE_BLOCK_IO_DEV_FROM_THIS (This);
//
// Requery IDE IO resources in case of the switch of native and legacy modes
@@ -1165,29 +1186,35 @@ IDEBlkIoWriteBlocks (
if (IdeBlkIoDevice->Type == IdeHardDisk ||
IdeBlkIoDevice->Type == Ide48bitAddressingHardDisk) {
return AtaBlkIoWriteBlocks (
Status = AtaBlkIoWriteBlocks (
IdeBlkIoDevice,
MediaId,
LBA,
BufferSize,
Buffer
);
goto Done;
}
if (IdeBlkIoDevice->Type == IdeUnknown) {
return EFI_DEVICE_ERROR;
Status = EFI_DEVICE_ERROR;
goto Done;
}
//
// for ATAPI device, using ATAPI write block's mechanism
//
return AtapiBlkIoWriteBlocks (
Status = AtapiBlkIoWriteBlocks (
IdeBlkIoDevice,
MediaId,
LBA,
BufferSize,
Buffer
);
Done:
gBS->RestoreTPL (OldTpl);
return Status;
}
//