Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MdeModulePkg/ScsiDisk: Return EFI_NO_MEDIA when no media presents 

Current code always return EFI_MEDIA_CHANGED no matter the media
is removed from CD/DVD drive or the media is changed.
It doesn't strictly follow the UEFI Spec.
Update code to return EFI_NO_MEDIA when media is removed.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
This commit is contained in:
Ruiyu Ni 2017-12-07 17:54:41 +08:00
parent a5be96819f
commit 3c12f346a1
1 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c
View File

@ -568,6 +568,7 @@ ScsiDiskReadBlocks (
MediaChange = FALSE; MediaChange = FALSE;
OldTpl = gBS->RaiseTPL (TPL_CALLBACK); OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO (This); ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO (This);
Media = ScsiDiskDevice->BlkIo.Media;
if (!IS_DEVICE_FIXED(ScsiDiskDevice)) { if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {
@ -598,14 +599,17 @@ ScsiDiskReadBlocks (
&ScsiDiskDevice->EraseBlock &ScsiDiskDevice->EraseBlock
); );
} }
Status = EFI_MEDIA_CHANGED; if (Media->MediaPresent) {
Status = EFI_MEDIA_CHANGED;
} else {
Status = EFI_NO_MEDIA;
}
goto Done; goto Done;
} }
} }
// //
// Get the intrinsic block size // Get the intrinsic block size
// //
Media = ScsiDiskDevice->BlkIo.Media;
BlockSize = Media->BlockSize; BlockSize = Media->BlockSize;
NumberOfBlocks = BufferSize / BlockSize; NumberOfBlocks = BufferSize / BlockSize;
@ -700,6 +704,7 @@ ScsiDiskWriteBlocks (
MediaChange = FALSE; MediaChange = FALSE;
OldTpl = gBS->RaiseTPL (TPL_CALLBACK); OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO (This); ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO (This);
Media = ScsiDiskDevice->BlkIo.Media;
if (!IS_DEVICE_FIXED(ScsiDiskDevice)) { if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {
@ -730,14 +735,17 @@ ScsiDiskWriteBlocks (
&ScsiDiskDevice->EraseBlock &ScsiDiskDevice->EraseBlock
); );
} }
Status = EFI_MEDIA_CHANGED; if (Media->MediaPresent) {
Status = EFI_MEDIA_CHANGED;
} else {
Status = EFI_NO_MEDIA;
}
goto Done; goto Done;
} }
} }
// //
// Get the intrinsic block size // Get the intrinsic block size
// //
Media = ScsiDiskDevice->BlkIo.Media;
BlockSize = Media->BlockSize; BlockSize = Media->BlockSize;
NumberOfBlocks = BufferSize / BlockSize; NumberOfBlocks = BufferSize / BlockSize;
@ -922,6 +930,7 @@ ScsiDiskReadBlocksEx (
MediaChange = FALSE; MediaChange = FALSE;
OldTpl = gBS->RaiseTPL (TPL_CALLBACK); OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO2 (This); ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO2 (This);
Media = ScsiDiskDevice->BlkIo.Media;
if (!IS_DEVICE_FIXED(ScsiDiskDevice)) { if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {
@ -952,14 +961,17 @@ ScsiDiskReadBlocksEx (
&ScsiDiskDevice->EraseBlock &ScsiDiskDevice->EraseBlock
); );
} }
Status = EFI_MEDIA_CHANGED; if (Media->MediaPresent) {
Status = EFI_MEDIA_CHANGED;
} else {
Status = EFI_NO_MEDIA;
}
goto Done; goto Done;
} }
} }
// //
// Get the intrinsic block size // Get the intrinsic block size
// //
Media = ScsiDiskDevice->BlkIo2.Media;
BlockSize = Media->BlockSize; BlockSize = Media->BlockSize;
NumberOfBlocks = BufferSize / BlockSize; NumberOfBlocks = BufferSize / BlockSize;
@ -1081,6 +1093,7 @@ ScsiDiskWriteBlocksEx (
MediaChange = FALSE; MediaChange = FALSE;
OldTpl = gBS->RaiseTPL (TPL_CALLBACK); OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO2 (This); ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO2 (This);
Media = ScsiDiskDevice->BlkIo.Media;
if (!IS_DEVICE_FIXED(ScsiDiskDevice)) { if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {
@ -1111,14 +1124,17 @@ ScsiDiskWriteBlocksEx (
&ScsiDiskDevice->EraseBlock &ScsiDiskDevice->EraseBlock
); );
} }
Status = EFI_MEDIA_CHANGED; if (Media->MediaPresent) {
Status = EFI_MEDIA_CHANGED;
} else {
Status = EFI_NO_MEDIA;
}
goto Done; goto Done;
} }
} }
// //
// Get the intrinsic block size // Get the intrinsic block size
// //
Media = ScsiDiskDevice->BlkIo2.Media;
BlockSize = Media->BlockSize; BlockSize = Media->BlockSize;
NumberOfBlocks = BufferSize / BlockSize; NumberOfBlocks = BufferSize / BlockSize;
@ -1230,6 +1246,7 @@ ScsiDiskFlushBlocksEx (
MediaChange = FALSE; MediaChange = FALSE;
OldTpl = gBS->RaiseTPL (TPL_CALLBACK); OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO2 (This); ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO2 (This);
Media = ScsiDiskDevice->BlkIo.Media;
if (!IS_DEVICE_FIXED(ScsiDiskDevice)) { if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {
@ -1260,13 +1277,15 @@ ScsiDiskFlushBlocksEx (
&ScsiDiskDevice->EraseBlock &ScsiDiskDevice->EraseBlock
); );
} }
Status = EFI_MEDIA_CHANGED; if (Media->MediaPresent) {
Status = EFI_MEDIA_CHANGED;
} else {
Status = EFI_NO_MEDIA;
}
goto Done; goto Done;
} }
} }
Media = ScsiDiskDevice->BlkIo2.Media;
if (!(Media->MediaPresent)) { if (!(Media->MediaPresent)) {
Status = EFI_NO_MEDIA; Status = EFI_NO_MEDIA;
goto Done; goto Done;