diff options
author | Ruiyu Ni <ruiyu.ni@intel.com> | 2017-12-07 17:54:41 +0800 |
---|---|---|
committer | Ruiyu Ni <ruiyu.ni@intel.com> | 2017-12-09 12:32:42 +0800 |
commit | 3c12f346a148d0adbd3d3cbcae7bf8d543c34462 (patch) | |
tree | 447ff625ee97f775f482764e0fb024b5022053e4 /MdeModulePkg | |
parent | a5be96819fb66b5ce7a5251b6680c71b2dd459c1 (diff) | |
download | edk2-3c12f346a148d0adbd3d3cbcae7bf8d543c34462.zip edk2-3c12f346a148d0adbd3d3cbcae7bf8d543c34462.tar.gz edk2-3c12f346a148d0adbd3d3cbcae7bf8d543c34462.tar.bz2 |
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>
Diffstat (limited to 'MdeModulePkg')
-rw-r--r-- | MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c | 41 |
1 files changed, 30 insertions, 11 deletions
diff --git a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c index 2289f20..6a0a193 100644 --- a/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c +++ b/MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDisk.c @@ -568,6 +568,7 @@ ScsiDiskReadBlocks ( MediaChange = FALSE;
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO (This);
+ Media = ScsiDiskDevice->BlkIo.Media;
if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {
@@ -598,14 +599,17 @@ ScsiDiskReadBlocks ( &ScsiDiskDevice->EraseBlock
);
}
- Status = EFI_MEDIA_CHANGED;
+ if (Media->MediaPresent) {
+ Status = EFI_MEDIA_CHANGED;
+ } else {
+ Status = EFI_NO_MEDIA;
+ }
goto Done;
}
}
//
// Get the intrinsic block size
//
- Media = ScsiDiskDevice->BlkIo.Media;
BlockSize = Media->BlockSize;
NumberOfBlocks = BufferSize / BlockSize;
@@ -700,6 +704,7 @@ ScsiDiskWriteBlocks ( MediaChange = FALSE;
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO (This);
+ Media = ScsiDiskDevice->BlkIo.Media;
if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {
@@ -730,14 +735,17 @@ ScsiDiskWriteBlocks ( &ScsiDiskDevice->EraseBlock
);
}
- Status = EFI_MEDIA_CHANGED;
+ if (Media->MediaPresent) {
+ Status = EFI_MEDIA_CHANGED;
+ } else {
+ Status = EFI_NO_MEDIA;
+ }
goto Done;
}
}
//
// Get the intrinsic block size
//
- Media = ScsiDiskDevice->BlkIo.Media;
BlockSize = Media->BlockSize;
NumberOfBlocks = BufferSize / BlockSize;
@@ -922,6 +930,7 @@ ScsiDiskReadBlocksEx ( MediaChange = FALSE;
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO2 (This);
+ Media = ScsiDiskDevice->BlkIo.Media;
if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {
@@ -952,14 +961,17 @@ ScsiDiskReadBlocksEx ( &ScsiDiskDevice->EraseBlock
);
}
- Status = EFI_MEDIA_CHANGED;
+ if (Media->MediaPresent) {
+ Status = EFI_MEDIA_CHANGED;
+ } else {
+ Status = EFI_NO_MEDIA;
+ }
goto Done;
}
}
//
// Get the intrinsic block size
//
- Media = ScsiDiskDevice->BlkIo2.Media;
BlockSize = Media->BlockSize;
NumberOfBlocks = BufferSize / BlockSize;
@@ -1081,6 +1093,7 @@ ScsiDiskWriteBlocksEx ( MediaChange = FALSE;
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO2 (This);
+ Media = ScsiDiskDevice->BlkIo.Media;
if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {
@@ -1111,14 +1124,17 @@ ScsiDiskWriteBlocksEx ( &ScsiDiskDevice->EraseBlock
);
}
- Status = EFI_MEDIA_CHANGED;
+ if (Media->MediaPresent) {
+ Status = EFI_MEDIA_CHANGED;
+ } else {
+ Status = EFI_NO_MEDIA;
+ }
goto Done;
}
}
//
// Get the intrinsic block size
//
- Media = ScsiDiskDevice->BlkIo2.Media;
BlockSize = Media->BlockSize;
NumberOfBlocks = BufferSize / BlockSize;
@@ -1230,6 +1246,7 @@ ScsiDiskFlushBlocksEx ( MediaChange = FALSE;
OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
ScsiDiskDevice = SCSI_DISK_DEV_FROM_BLKIO2 (This);
+ Media = ScsiDiskDevice->BlkIo.Media;
if (!IS_DEVICE_FIXED(ScsiDiskDevice)) {
@@ -1260,13 +1277,15 @@ ScsiDiskFlushBlocksEx ( &ScsiDiskDevice->EraseBlock
);
}
- Status = EFI_MEDIA_CHANGED;
+ if (Media->MediaPresent) {
+ Status = EFI_MEDIA_CHANGED;
+ } else {
+ Status = EFI_NO_MEDIA;
+ }
goto Done;
}
}
- Media = ScsiDiskDevice->BlkIo2.Media;
-
if (!(Media->MediaPresent)) {
Status = EFI_NO_MEDIA;
goto Done;
|