IntelSiliconPkg VTdPmrPei: Return SUCCESS when Mapping == NULL in Unmap

[edk2] [PATCH] IntelSiliconPkg VTdPmrPei: Return SUCCESS when Mapping == NULL in Unmap

Posted by Star Zeng 6 years, 1 month ago

NULL is returned to Mapping when Operation is BusMasterCommonBuffer or
EdkiiIoMmuOperationBusMasterCommonBuffer64 in PeiIoMmuMap().
So Mapping == NULL is valid when calling PeiIoMmuUnmap().

940dbd071e9f01717236af236740aa0da716805f wrongly changed EFI_SUCCESS
to EFI_INVALID_PARAMETER when Mapping == NULL in PeiIoMmuUnmap().
This patch is to correct it.

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

diff --git a/IntelSiliconPkg/Feature/VTd/IntelVTdPmrPei/IntelVTdPmrPei.c b/IntelSiliconPkg/Feature/VTd/IntelVTdPmrPei/IntelVTdPmrPei.c
index ea3091ef911c..6289834fcb38 100644
--- a/IntelSiliconPkg/Feature/VTd/IntelVTdPmrPei/IntelVTdPmrPei.c
+++ b/IntelSiliconPkg/Feature/VTd/IntelVTdPmrPei/IntelVTdPmrPei.c
@@ -189,7 +189,7 @@ PeiIoMmuMap (
   if (Operation == EdkiiIoMmuOperationBusMasterCommonBuffer ||
       Operation == EdkiiIoMmuOperationBusMasterCommonBuffer64) {
     *DeviceAddress = (UINTN)HostAddress;
-    *Mapping = 0;
+    *Mapping = NULL;
     return EFI_SUCCESS;
   }
 
@@ -266,7 +266,7 @@ PeiIoMmuUnmap (
   }
 
   if (Mapping == NULL) {
-    return EFI_INVALID_PARAMETER;
+    return EFI_SUCCESS;
   }
 
   MapInfo = Mapping;
-- 
2.13.3.windows.1

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

Re: [edk2] [PATCH] IntelSiliconPkg VTdPmrPei: Return SUCCESS when Mapping == NULL in Unmap

Posted by Yao, Jiewen 6 years, 1 month ago

Reviewed-by: jiewen.yao@intel.com

> -----Original Message-----
> From: Zeng, Star
> Sent: Monday, March 5, 2018 9:34 PM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star <star.zeng@intel.com>; Yao, Jiewen <jiewen.yao@intel.com>
> Subject: [PATCH] IntelSiliconPkg VTdPmrPei: Return SUCCESS when Mapping ==
> NULL in Unmap
> 
> NULL is returned to Mapping when Operation is BusMasterCommonBuffer or
> EdkiiIoMmuOperationBusMasterCommonBuffer64 in PeiIoMmuMap().
> So Mapping == NULL is valid when calling PeiIoMmuUnmap().
> 
> 940dbd071e9f01717236af236740aa0da716805f wrongly changed
> EFI_SUCCESS
> to EFI_INVALID_PARAMETER when Mapping == NULL in PeiIoMmuUnmap().
> This patch is to correct it.
> 
> Cc: Jiewen Yao <jiewen.yao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  IntelSiliconPkg/Feature/VTd/IntelVTdPmrPei/IntelVTdPmrPei.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/IntelSiliconPkg/Feature/VTd/IntelVTdPmrPei/IntelVTdPmrPei.c
> b/IntelSiliconPkg/Feature/VTd/IntelVTdPmrPei/IntelVTdPmrPei.c
> index ea3091ef911c..6289834fcb38 100644
> --- a/IntelSiliconPkg/Feature/VTd/IntelVTdPmrPei/IntelVTdPmrPei.c
> +++ b/IntelSiliconPkg/Feature/VTd/IntelVTdPmrPei/IntelVTdPmrPei.c
> @@ -189,7 +189,7 @@ PeiIoMmuMap (
>    if (Operation == EdkiiIoMmuOperationBusMasterCommonBuffer ||
>        Operation == EdkiiIoMmuOperationBusMasterCommonBuffer64) {
>      *DeviceAddress = (UINTN)HostAddress;
> -    *Mapping = 0;
> +    *Mapping = NULL;
>      return EFI_SUCCESS;
>    }
> 
> @@ -266,7 +266,7 @@ PeiIoMmuUnmap (
>    }
> 
>    if (Mapping == NULL) {
> -    return EFI_INVALID_PARAMETER;
> +    return EFI_SUCCESS;
>    }
> 
>    MapInfo = Mapping;
> --
> 2.13.3.windows.1

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