[edk2-devel] [PATCH] IntelSiliconPkg/VTd: Remove ASSERT in VTdSetAttribute

[edk2-devel] [PATCH] IntelSiliconPkg/VTd: Remove ASSERT in VTdSetAttribute

[Sheng Wei]

When PcdVTdPolicyPropertyMask BIT2 is set and ACPI DMAR table is not ready,
It is no need to hit an assert, and just returns EFI_NOT_READY.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Cc: Jenny Huang <jenny.huang@intel.com>
Cc: Chiang Chris <chris.chiang@intel.com>
Signed-off-by: Sheng Wei <w.sheng@intel.com>
---
 .../Feature/VTd/IntelVTdCoreDxe/IntelVTdCoreDxe.c                | 1 -
 .../Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.c  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCoreDxe/IntelVTdCoreDxe.c b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCoreDxe/IntelVTdCoreDxe.c
index 8449b288..27821782 100644
--- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCoreDxe/IntelVTdCoreDxe.c
+++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCoreDxe/IntelVTdCoreDxe.c
@@ -253,7 +253,6 @@ VTdSetAttribute (
       //
       // Force no IOMMU access attribute request recording before DMAR table is installed.
       //
-      ASSERT_EFI_ERROR (EFI_NOT_READY);
       return EFI_NOT_READY;
     }
     Status = RequestAccessAttribute (Segment, SourceId, DeviceAddress, Length, IoMmuAccess);
diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.c b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.c
index a6287be2..d7aa106f 100644
--- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.c
+++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.c
@@ -252,7 +252,6 @@ VTdSetAttribute (
       //
       // Force no IOMMU access attribute request recording before DMAR table is installed.
       //
-      ASSERT_EFI_ERROR (EFI_NOT_READY);
       return EFI_NOT_READY;
     }
     Status = RequestAccessAttribute (Segment, SourceId, DeviceAddress, Length, IoMmuAccess);
-- 
2.26.2.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#114676): https://edk2.groups.io/g/devel/message/114676
Mute This Topic: https://groups.io/mt/104026555/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [PATCH] IntelSiliconPkg/VTd: Remove ASSERT in VTdSetAttribute

[Huang, Jenny]

Reviewed-by : Jenny Huang <jenny.huang@intel.com>

-----Original Message-----
From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Sheng, W
Sent: Monday, January 29, 2024 1:43 PM
To: devel@edk2.groups.io
Cc: Ni, Ray <ray.ni@intel.com>; Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Huang, Jenny <jenny.huang@intel.com>; Chiang, Chris <chris.chiang@intel.com>
Subject: [edk2-devel] [PATCH] IntelSiliconPkg/VTd: Remove ASSERT in VTdSetAttribute

When PcdVTdPolicyPropertyMask BIT2 is set and ACPI DMAR table is not ready, It is no need to hit an assert, and just returns EFI_NOT_READY.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Cc: Jenny Huang <jenny.huang@intel.com>
Cc: Chiang Chris <chris.chiang@intel.com>
Signed-off-by: Sheng Wei <w.sheng@intel.com>
---
 .../Feature/VTd/IntelVTdCoreDxe/IntelVTdCoreDxe.c                | 1 -
 .../Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.c  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCoreDxe/IntelVTdCoreDxe.c b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCoreDxe/IntelVTdCoreDxe.c
index 8449b288..27821782 100644
--- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCoreDxe/IntelVTdCoreDxe.c
+++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdCoreDxe/IntelVTd
+++ CoreDxe.c
@@ -253,7 +253,6 @@ VTdSetAttribute (
       //

       // Force no IOMMU access attribute request recording before DMAR table is installed.

       //

-      ASSERT_EFI_ERROR (EFI_NOT_READY);

       return EFI_NOT_READY;

     }

     Status = RequestAccessAttribute (Segment, SourceId, DeviceAddress, Length, IoMmuAccess);

diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.c b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.c
index a6287be2..d7aa106f 100644
--- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.c
+++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDxe/IntelVTdDxe.
+++ c
@@ -252,7 +252,6 @@ VTdSetAttribute (
       //

       // Force no IOMMU access attribute request recording before DMAR table is installed.

       //

-      ASSERT_EFI_ERROR (EFI_NOT_READY);

       return EFI_NOT_READY;

     }

     Status = RequestAccessAttribute (Segment, SourceId, DeviceAddress, Length, IoMmuAccess);

--
2.26.2.windows.1



-=-=-=-=-=-=
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#114676): https://edk2.groups.io/g/devel/message/114676
Mute This Topic: https://groups.io/mt/104026555/2558558
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [w.sheng@intel.com]
-=-=-=-=-=-=




-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#114934): https://edk2.groups.io/g/devel/message/114934
Mute This Topic: https://groups.io/mt/104026555/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-