MdeModulePkg XhciPei: Minor refinement about IoMmu

[edk2] [PATCH] MdeModulePkg XhciPei: Minor refinement about IoMmu

Posted by Star Zeng 7 years, 5 months ago

1. Call IoMmuInit() after locating gPeiUsbControllerPpiGuid.
2. Call XhcPeiFreeSched() to do cleanup in XhcEndOfPei.

Cc: Jiewen Yao <jiewen.yao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
---
 MdeModulePkg/Bus/Pci/XhciPei/XhcPeim.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/MdeModulePkg/Bus/Pci/XhciPei/XhcPeim.c b/MdeModulePkg/Bus/Pci/XhciPei/XhcPeim.c
index 99f69f730b3f..c5631e87cacc 100644
--- a/MdeModulePkg/Bus/Pci/XhciPei/XhcPeim.c
+++ b/MdeModulePkg/Bus/Pci/XhciPei/XhcPeim.c
@@ -1427,6 +1427,8 @@ XhcEndOfPei (
 
   XhcPeiHaltHC (Xhc, XHC_GENERIC_TIMEOUT);
 
+  XhcPeiFreeSched (Xhc);
+
   return EFI_SUCCESS;
 }
 
@@ -1461,8 +1463,6 @@ XhcPeimEntry (
     return EFI_SUCCESS;
   }
 
-  IoMmuInit ();
-
   Status = PeiServicesLocatePpi (
              &gPeiUsbControllerPpiGuid,
              0,
@@ -1473,6 +1473,8 @@ XhcPeimEntry (
     return EFI_UNSUPPORTED;
   }
 
+  IoMmuInit ();
+
   Index = 0;
   while (TRUE) {
     Status = UsbControllerPpi->GetUsbController (
-- 
2.7.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Re: [edk2] [PATCH] MdeModulePkg XhciPei: Minor refinement about IoMmu

Posted by Yao, Jiewen 7 years, 5 months ago

Reviewed-by: Jiewen.yao@intel.com

> -----Original Message-----
> From: Zeng, Star
> Sent: Thursday, November 16, 2017 6:45 PM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>
> Subject: [PATCH] MdeModulePkg XhciPei: Minor refinement about IoMmu
> 
> 1. Call IoMmuInit() after locating gPeiUsbControllerPpiGuid.
> 2. Call XhcPeiFreeSched() to do cleanup in XhcEndOfPei.
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  MdeModulePkg/Bus/Pci/XhciPei/XhcPeim.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/MdeModulePkg/Bus/Pci/XhciPei/XhcPeim.c
> b/MdeModulePkg/Bus/Pci/XhciPei/XhcPeim.c
> index 99f69f730b3f..c5631e87cacc 100644
> --- a/MdeModulePkg/Bus/Pci/XhciPei/XhcPeim.c
> +++ b/MdeModulePkg/Bus/Pci/XhciPei/XhcPeim.c
> @@ -1427,6 +1427,8 @@ XhcEndOfPei (
> 
>    XhcPeiHaltHC (Xhc, XHC_GENERIC_TIMEOUT);
> 
> +  XhcPeiFreeSched (Xhc);
> +
>    return EFI_SUCCESS;
>  }
> 
> @@ -1461,8 +1463,6 @@ XhcPeimEntry (
>      return EFI_SUCCESS;
>    }
> 
> -  IoMmuInit ();
> -
>    Status = PeiServicesLocatePpi (
>               &gPeiUsbControllerPpiGuid,
>               0,
> @@ -1473,6 +1473,8 @@ XhcPeimEntry (
>      return EFI_UNSUPPORTED;
>    }
> 
> +  IoMmuInit ();
> +
>    Index = 0;
>    while (TRUE) {
>      Status = UsbControllerPpi->GetUsbController (
> --
> 2.7.0.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel