Re: [PATCH] ShellPkg/map: Recognize CDROM change

["Gao, Liming" <liming.gao@intel.com>]

Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: Ni, Ruiyu
>Sent: Tuesday, July 25, 2017 3:45 PM
>To: edk2-devel@lists.01.org
>Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming
><liming.gao@intel.com>
>Subject: [PATCH] ShellPkg/map: Recognize CDROM change
>
>The patch adds logic to probe the media change for physical
>block devices. So that when media change happens, the BlockIo
>is re-installed again.
>
>It fixes the issue when CDROM is removed UEFI Shell still shows
>the BlockIo in the output of "map -r".
>
>Contributed-under: TianoCore Contribution Agreement 1.0
>Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
>Cc: Michael D Kinney <michael.d.kinney@intel.com>
>Cc: Liming Gao <liming.gao@intel.com>
>---
> ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c | 54
>++++++++++++++++++++++-
> 1 file changed, 53 insertions(+), 1 deletion(-)
>
>diff --git a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
>b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
>index 20eb528fa3..3f5925f507 100644
>--- a/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
>+++ b/ShellPkg/Library/UefiShellLevel2CommandsLib/Map.c
>@@ -1,7 +1,7 @@
> /** @file
>   Main file for map shell level 2 command.
>
>-  Copyright (c) 2009 - 2015, Intel Corporation. All rights reserved.<BR>
>+  Copyright (c) 2009 - 2017, Intel Corporation. All rights reserved.<BR>
>   (C) Copyright 2013-2015 Hewlett-Packard Development Company, L.P.<BR>
>   (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
>
>@@ -980,6 +980,57 @@ STATIC CONST SHELL_PARAM_ITEM MapParamList[]
>= {
>   };
>
> /**
>+  The routine issues dummy read for every physical block device to cause
>+  the BlockIo re-installed if media change happened.
>+**/
>+VOID
>+ProbeForMediaChange (
>+  VOID
>+  )
>+{
>+  EFI_STATUS                            Status;
>+  UINTN                                 HandleCount;
>+  EFI_HANDLE                            *Handles;
>+  EFI_BLOCK_IO_PROTOCOL                 *BlockIo;
>+  UINTN                                 Index;
>+
>+  gBS->LocateHandleBuffer (
>+         ByProtocol,
>+         &gEfiBlockIoProtocolGuid,
>+         NULL,
>+         &HandleCount,
>+         &Handles
>+         );
>+  //
>+  // Probe for media change for every physical block io
>+  //
>+  for (Index = 0; Index < HandleCount; Index++) {
>+    Status = gBS->HandleProtocol (
>+                    Handles[Index],
>+                    &gEfiBlockIoProtocolGuid,
>+                    (VOID **) &BlockIo
>+                    );
>+    if (!EFI_ERROR (Status)) {
>+      if (!BlockIo->Media->LogicalPartition) {
>+        //
>+        // Per spec:
>+        //   The function (ReadBlocks) must return EFI_NO_MEDIA or
>+        //   EFI_MEDIA_CHANGED even if LBA, BufferSize, or Buffer are invalid so
>the caller can probe
>+        //   for changes in media state.
>+        //
>+        BlockIo->ReadBlocks (
>+                   BlockIo,
>+                   BlockIo->Media->MediaId,
>+                   0,
>+                   0,
>+                   NULL
>+                   );
>+      }
>+    }
>+  }
>+}
>+
>+/**
>   Function for 'map' command.
>
>   @param[in] ImageHandle  Handle to the Image (NULL if Internal).
>@@ -1087,6 +1138,7 @@ ShellCommandRunMap (
>                || ShellCommandLineGetFlag(Package, L"-u")
>                || ShellCommandLineGetFlag(Package, L"-t")
>               ){
>+        ProbeForMediaChange ();
>         if ( ShellCommandLineGetFlag(Package, L"-r")) {
>           //
>           // Do the reset
>--
>2.12.2.windows.2