MdeModulePkg/SdMmcPciHcDxe: Add an optional parameter in NotifyPhase

[mirror_edk2.git] / MdeModulePkg / Bus / Pci / SdMmcPciHcDxe / SdMmcPciHci.c

diff --git a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
index 3b9a184bc4efcdd504a70ed1bd579fc8f14e368d..923c55bbbe877832185b8329083cbdba643e0c8f 100644 (file)
--- a/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
+++ b/MdeModulePkg/Bus/Pci/SdMmcPciHcDxe/SdMmcPciHci.c
@@ -444,7 +444,8 @@ SdMmcHcReset (
     Status = mOverride->NotifyPhase (\r
                           Private->ControllerHandle,\r
                           Slot,\r
-                          EdkiiSdMmcResetPre);\r
+                          EdkiiSdMmcResetPre,\r
+                          NULL);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_WARN,\r
         "%a: SD/MMC pre reset notifier callback failed - %r\n",\r
@@ -494,7 +495,8 @@ SdMmcHcReset (
     Status = mOverride->NotifyPhase (\r
                           Private->ControllerHandle,\r
                           Slot,\r
-                          EdkiiSdMmcResetPost);\r
+                          EdkiiSdMmcResetPost,\r
+                          NULL);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_WARN,\r
         "%a: SD/MMC post reset notifier callback failed - %r\n",\r
@@ -782,7 +784,8 @@ SdMmcHcClockSupply (
   //\r
   // Set SDCLK Frequency Select and Internal Clock Enable fields in Clock Control register.\r
   //\r
-  if ((ControllerVer & 0xFF) == SD_MMC_HC_CTRL_VER_300) {\r
+  if (((ControllerVer & 0xFF) >= SD_MMC_HC_CTRL_VER_300) &&\r
+      ((ControllerVer & 0xFF) <= SD_MMC_HC_CTRL_VER_420)) {\r
     ASSERT (Divisor <= 0x3FF);\r
     ClockCtrl = ((Divisor & 0xFF) << 8) | ((Divisor & 0x300) >> 2);\r
   } else if (((ControllerVer & 0xFF) == 0) || ((ControllerVer & 0xFF) == 1)) {\r
@@ -1087,7 +1090,8 @@ SdMmcHcInitHost (
     Status = mOverride->NotifyPhase (\r
                           Private->ControllerHandle,\r
                           Slot,\r
-                          EdkiiSdMmcInitHostPre);\r
+                          EdkiiSdMmcInitHostPre,\r
+                          NULL);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_WARN,\r
         "%a: SD/MMC pre init notifier callback failed - %r\n",\r
@@ -1122,7 +1126,8 @@ SdMmcHcInitHost (
     Status = mOverride->NotifyPhase (\r
                           Private->ControllerHandle,\r
                           Slot,\r
-                          EdkiiSdMmcInitHostPost);\r
+                          EdkiiSdMmcInitHostPost,\r
+                          NULL);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((DEBUG_WARN,\r
         "%a: SD/MMC post init notifier callback failed - %r\n",\r