X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=MdeModulePkg%2FBus%2FSd%2FSdDxe%2FSdDxe.c;h=e341b4cc1c8d376aceac69c68e5e63545a4edeed;hp=7c70c60a502562c158f5f5e9a9dfe4e87dece070;hb=9d510e61fceee7b92955ef9a3c20343752d8ce3f;hpb=b68ccac17c7e6340ab7b3654ea51c86ad6b4201d

diff --git a/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c b/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c
index 7c70c60a50..e341b4cc1c 100644
--- a/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c
+++ b/MdeModulePkg/Bus/Sd/SdDxe/SdDxe.c
@@ -4,14 +4,8 @@
   It produces BlockIo and BlockIo2 protocols to allow upper layer
   access the SD memory card device.
 
-  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.<BR>
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  Copyright (c) 2015 - 2018, Intel Corporation. All rights reserved.<BR>
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
@@ -69,6 +63,13 @@ SD_DEVICE mSdDeviceTemplate = {
     1,
     SdEraseBlocks
   },
+  {                            // DiskInfo
+    EFI_DISK_INFO_SD_MMC_INTERFACE_GUID,
+    SdDiskInfoInquiry,
+    SdDiskInfoIdentify,
+    SdDiskInfoSenseData,
+    SdDiskInfoWhichIde
+  },
   {                            // Queue
     NULL,
     NULL
@@ -366,7 +367,7 @@ DiscoverSdDevice (
     );
   AddUnicodeString2 (
     "en",
-    gSdDxeComponentName.SupportedLanguages,
+    gSdDxeComponentName2.SupportedLanguages,
     &Device->ControllerNameTable,
     Device->ModelName,
     FALSE
@@ -382,6 +383,8 @@ DiscoverSdDevice (
                   &Device->BlockIo2,
                   &gEfiEraseBlockProtocolGuid,
                   &Device->EraseBlock,
+                  &gEfiDiskInfoProtocolGuid,
+                  &Device->DiskInfo,
                   NULL
                   );
 
@@ -800,7 +803,7 @@ SdDxeDriverBindingStop (
     //
     // Free all on-going async tasks.
     //
-    OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
+    OldTpl = gBS->RaiseTPL (TPL_NOTIFY);
     for (Link = GetFirstNode (&Device->Queue);
          !IsNull (&Device->Queue, Link);
          Link = NextLink) {
@@ -840,6 +843,8 @@ SdDxeDriverBindingStop (
                     &Device->BlockIo2,
                     &gEfiEraseBlockProtocolGuid,
                     &Device->EraseBlock,
+                    &gEfiDiskInfoProtocolGuid,
+                    &Device->DiskInfo,
                     NULL
                     );
     if (EFI_ERROR (Status)) {