fixed DMA not be stopped issue when gBS->ExitBootServices called.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@8058 6f19259b-4bc3-4df7-8a09-765794883524

10 files changed, 180 insertions, 9 deletions

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
index c8de7052bb..d45bdf630c 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.c
@@ -1449,6 +1449,33 @@ EhcCreateUsb2Hc (
   return Ehc;

 }

 

+/**

+  One notified function to stop the Host Controller when gBS->ExitBootServices() called.

+

+  @param  Event                   Pointer to this event

+  @param  Context                 Event hanlder private data

+

+**/

+VOID

+EFIAPI

+EhcExitBootService (

+  EFI_EVENT                      Event,

+  VOID                           *Context

+  )

+

+{

+  USB2_HC_DEV   *Ehc;

+

+  Ehc = (USB2_HC_DEV *) Context;

+

+  //

+  // Stop the Host Controller

+  //

+  EhcHaltHC (Ehc, EHC_GENERIC_TIMEOUT);

+

+  return;

+}

+

 

 /**

   Starting the Usb EHCI Driver.

@@ -1585,6 +1612,21 @@ EhcDriverBindingStart (
   }

 

   //

+  // Create event to stop the HC when exit boot service.

+  //

+  Status = gBS->CreateEventEx (

+                  EVT_NOTIFY_SIGNAL,

+                  TPL_NOTIFY,

+                  EhcExitBootService,

+                  Ehc,

+                  &gEfiEventExitBootServicesGuid,

+                  &Ehc->ExitBootServiceEvent

+                  );

+  if (EFI_ERROR (Status)) {

+    goto UNINSTALL_USBHC;

+  }

+

+  //

   // Install the component name protocol, don't fail the start

   // because of something for display.

   //

@@ -1712,6 +1754,10 @@ EhcDriverBindingStop (
     gBS->CloseEvent (Ehc->PollTimer);

   }

 

+  if (Ehc->ExitBootServiceEvent != NULL) {

+    gBS->CloseEvent (Ehc->ExitBootServiceEvent);

+  }

+

   EhcFreeSched (Ehc);

 

   if (Ehc->ControllerNameTable != NULL) {

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
index 85772fb30d..2137d1cfba 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/Ehci.h
@@ -22,6 +22,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/Usb2HostController.h>

 #include <Protocol/PciIo.h>

 

+#include <Guid/EventGroup.h>

+

 #include <Library/DebugLib.h>

 #include <Library/BaseMemoryLib.h>

 #include <Library/UefiDriverEntryPoint.h>

@@ -121,6 +123,12 @@ struct _USB2_HC_DEV {
   EFI_EVENT                 PollTimer;

 

   //

+  // ExitBootServicesEvent is used to stop the EHC DMA operation 

+  // after exit boot service.

+  //

+  EFI_EVENT                 ExitBootServiceEvent;

+

+  //

   // Asynchronous(bulk and control) transfer schedule data:

   // ReclaimHead is used as the head of the asynchronous transfer

   // list. It acts as the reclamation header.

diff --git a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
index deb540524f..fd98e4200f 100644
--- a/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
+++ b/MdeModulePkg/Bus/Pci/EhciDxe/EhciDxe.inf
@@ -71,6 +71,9 @@
   DebugLib

   PcdLib

 

+[Guids]

+  gEfiEventExitBootServicesGuid                 ## PRODUCES ## Event

+

 [Protocols]

   gEfiPciIoProtocolGuid                         ## TO_START

   gEfiUsb2HcProtocolGuid                        ## BY_START

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
index a4110b75a2..abc5c27817 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.c
@@ -2,7 +2,7 @@
 

   The UHCI driver model and HC protocol routines.

 

-Copyright (c) 2004 - 2008, Intel Corporation

+Copyright (c) 2004 - 2009, Intel Corporation

 All rights reserved. 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

@@ -1517,6 +1517,10 @@ UhciFreeDev (
     gBS->CloseEvent (Uhc->AsyncIntMonitor);

   }

 

+  if (Uhc->ExitBootServiceEvent != NULL) {

+    gBS->CloseEvent (Uhc->ExitBootServiceEvent);

+  }

+  

   if (Uhc->MemPool != NULL) {

     UsbHcFreeMemPool (Uhc->MemPool);

   }

@@ -1572,6 +1576,31 @@ UhciCleanDevUp (
   UhciFreeDev (Uhc);

 }

 

+/**

+  One notified function to stop the Host Controller when gBS->ExitBootServices() called.

+

+  @param  Event                   Pointer to this event

+  @param  Context                 Event hanlder private data

+

+**/

+VOID

+EFIAPI

+UhcExitBootService (

+  EFI_EVENT                      Event,

+  VOID                           *Context

+  )

+{

+  USB_HC_DEV   *Uhc;

+

+  Uhc = (USB_HC_DEV *) Context;

+

+  //

+  // Stop the Host Controller

+  //

+  UhciStopHc (Uhc, UHC_GENERIC_TIMEOUT);

+

+  return;

+}

 

 /**

   Starting the Usb UHCI Driver.

@@ -1704,6 +1733,21 @@ UhciDriverBindingStart (
   }

 

   //

+  // Create event to stop the HC when exit boot service.

+  //

+  Status = gBS->CreateEventEx (

+                  EVT_NOTIFY_SIGNAL,

+                  TPL_NOTIFY,

+                  UhcExitBootService,

+                  Uhc,

+                  &gEfiEventExitBootServicesGuid,

+                  &Uhc->ExitBootServiceEvent

+                  );

+  if (EFI_ERROR (Status)) {

+    goto UNINSTALL_USBHC;

+  }

+

+  //

   // Install the component name protocol

   //

   Uhc->CtrlNameTable = NULL;

@@ -1730,6 +1774,14 @@ UhciDriverBindingStart (
   UhciWriteReg (Uhc->PciIo, USBCMD_OFFSET, USBCMD_RS | USBCMD_MAXP);

 

   return EFI_SUCCESS;

+  

+UNINSTALL_USBHC:

+  gBS->UninstallMultipleProtocolInterfaces (

+         Controller,

+         &gEfiUsb2HcProtocolGuid,

+         &Uhc->Usb2Hc,

+         NULL

+         );

 

 FREE_UHC:

   UhciFreeDev (Uhc);

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
index 3f6d42f370..58be29e444 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/Uhci.h
@@ -2,7 +2,7 @@
 

   The definition for UHCI driver model and HC protocol routines.

 

-Copyright (c) 2004 - 2007, Intel Corporation

+Copyright (c) 2004 - 2009, Intel Corporation

 All rights reserved. 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

@@ -23,6 +23,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/UsbHostController.h>

 #include <Protocol/PciIo.h>

 

+#include <Guid/EventGroup.h>

+

 #include <Library/DebugLib.h>

 #include <Library/BaseMemoryLib.h>

 #include <Library/UefiDriverEntryPoint.h>

@@ -137,6 +139,12 @@ struct _USB_HC_DEV {
   USBHC_MEM_POOL            *MemPool;

   EFI_UNICODE_STRING_TABLE  *CtrlNameTable;

   VOID                      *FrameMapping;

+

+  //

+  // ExitBootServicesEvent is used to stop the EHC DMA operation 

+  // after exit boot service.

+  //

+  EFI_EVENT                 ExitBootServiceEvent;

 };

 

 extern EFI_DRIVER_BINDING_PROTOCOL   gUhciDriverBinding;

diff --git a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
index cf91655244..2b7953cd35 100644
--- a/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
+++ b/MdeModulePkg/Bus/Pci/UhciDxe/UhciDxe.inf
@@ -72,6 +72,8 @@
   DebugLib

   PcdLib

 

+[Guids]

+  gEfiEventExitBootServicesGuid                 ## PRODUCES ## Event

 

 [Protocols]

   gEfiPciIoProtocolGuid                         ## TO_START

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index 6ca7eb515b..6e535b5d93 100644
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -631,14 +631,14 @@ CoreExitBootServices (
   }

 

   //

-  // Notify other drivers that we are exiting boot services.

+  // Disable Timer

   //

-  CoreNotifySignalList (&gEfiEventExitBootServicesGuid);

+  gTimer->SetTimerPeriod (gTimer, 0);

 

   //

-  // Disable Timer

+  // Notify other drivers that we are exiting boot services.

   //

-  gTimer->SetTimerPeriod (gTimer, 0);

+  CoreNotifySignalList (&gEfiEventExitBootServicesGuid);

 

   //

   // Disable CPU Interrupts

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
index 0006c447a6..dde0d6021f 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Snp.c
@@ -1,7 +1,7 @@
 /** @file

     Implementation of driver entry point and driver binding protocol.

  

-Copyright (c) 2004 - 2008, Intel Corporation. <BR> 

+Copyright (c) 2004 - 2009, Intel Corporation. <BR> 

 All rights reserved. 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 

@@ -22,6 +22,30 @@ V2P                         *mV2p = NULL; // undi3.0 map_list head
 // End Global variables

 //

 

+/**

+  One notified function to stop UNDI device when gBS->ExitBootServices() called.

+

+  @param  Event                   Pointer to this event

+  @param  Context                 Event hanlder private data

+

+**/

+VOID

+EFIAPI

+SnpNotifyExitBootServices (

+  EFI_EVENT Event,

+  VOID      *Context

+  )

+{

+  SNP_DRIVER             *Snp;

+

+  Snp  = (SNP_DRIVER *)Context;

+

+  //

+  // Shutdown and stop UNDI driver

+  //

+  PxeShutdown (Snp);

+  PxeStop (Snp);

+}

 

 /**

   Send command to UNDI. It does nothing currently.

@@ -635,6 +659,21 @@ SimpleNetworkDriverStart (
   PxeStop (Snp);

 

   //

+  // Create EXIT_BOOT_SERIVES Event

+  //

+  Status = gBS->CreateEventEx (

+                  EVT_NOTIFY_SIGNAL,

+                  TPL_NOTIFY,

+                  SnpNotifyExitBootServices,

+                  Snp,

+                  &gEfiEventExitBootServicesGuid,

+                  &Snp->ExitBootServicesEvent

+                  );

+  if (EFI_ERROR (Status)) {

+    goto Error_DeleteSNP;

+  }

+

+  //

   //  add SNP to the undi handle

   //

   Status = gBS->InstallProtocolInterface (

@@ -738,6 +777,11 @@ SimpleNetworkDriverStop (
     return Status;

   }

 

+  //

+  // Close EXIT_BOOT_SERIVES Event

+  //

+  gBS->CloseEvent (Snp->ExitBootServicesEvent);

+

   Status = gBS->CloseProtocol (

                   Controller,

                   &gEfiNetworkInterfaceIdentifierProtocolGuid_31,

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/Snp.h b/MdeModulePkg/Universal/Network/SnpDxe/Snp.h
index ff7ad7b444..389cbee91d 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/Snp.h
+++ b/MdeModulePkg/Universal/Network/SnpDxe/Snp.h
@@ -1,7 +1,7 @@
 /** @file

     Declaration of strctures and functions for SnpDxe driver.

 

-Copyright (c) 2004 - 2008, Intel Corporation. <BR> 

+Copyright (c) 2004 - 2009, Intel Corporation. <BR> 

 All rights reserved. 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 

@@ -22,6 +22,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/NetworkInterfaceIdentifier.h>

 #include <Protocol/DevicePath.h>

 

+#include <Guid/EventGroup.h>

+

 #include <Library/DebugLib.h>

 #include <Library/BaseMemoryLib.h>

 #include <Library/UefiDriverEntryPoint.h>

@@ -118,6 +120,8 @@ typedef struct {
     EFI_PHYSICAL_ADDRESS  VirtualAddress;

     VOID                  *MapCookie;

   } MapList[MAX_MAP_LENGTH];

+

+  EFI_EVENT              ExitBootServicesEvent;

 } SNP_DRIVER;

 

 #define EFI_SIMPLE_NETWORK_DEV_FROM_THIS(a) CR (a, SNP_DRIVER, Snp, SNP_DRIVER_SIGNATURE)

diff --git a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
index c876605f19..0d53e33a65 100644
--- a/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
+++ b/MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf
@@ -1,7 +1,7 @@
 #/** @file

 #    Component description file for SNP module.

 #

-# Copyright (c) 2006, Intel Corporation. <BR> 

+# Copyright (c) 2006 - 2009, Intel Corporation. <BR> 

 # All rights reserved. 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 

@@ -65,6 +65,10 @@
   DebugLib

 

 

+[Guids]

+  gEfiEventExitBootServicesGuid                 ## CONSUMES

+

+

 [Protocols]

   gEfiPciIoProtocolGuid                         # PROTOCOL ALWAYS_CONSUMED

   gEfiSimpleNetworkProtocolGuid                 # PROTOCOL ALWAYS_CONSUMED