[edk2-devel] [PATCH v2] IntelSiliconPkg/VTd: Fix to support IntelVTdDmarPei in 64bit

Kuo, Ted posted 1 patch 2 years, 2 months ago
Failed in applying to current master (apply log)
.../IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmarPei.c     | 4 ++--
.../IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmarPei.h     | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
[edk2-devel] [PATCH v2] IntelSiliconPkg/VTd: Fix to support IntelVTdDmarPei in 64bit
Posted by Kuo, Ted 2 years, 2 months ago
REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3836
Changed VtdIndex defined in PROCESS_DRHD_CALLBACK_FUNC from UINT32 to UINTN
to avoid type incompatible error when enable PEI in 64bit.

Cc: Sheng Wei <w.sheng@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Cc: Jenny Huang <jenny.huang@intel.com>
Cc: Robert Kowalewski <robert.kowalewski@intel.com>
Signed-off-by: Ted Kuo <ted.kuo@intel.com>
---
 .../IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmarPei.c     | 4 ++--
 .../IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmarPei.h     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmarPei.c b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmarPei.c
index f97d627eca..2844f366bb 100644
--- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmarPei.c
+++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmarPei.c
@@ -434,7 +434,7 @@ GetVTdInfoHob (
 VOID
 ProcessDhrdPreMemory (
   IN OUT VOID                       *Context,
-  IN     UINT32                     VTdIndex,
+  IN     UINTN                      VTdIndex,
   IN     EFI_ACPI_DMAR_DRHD_HEADER  *DmarDrhd
   )
 {
@@ -454,7 +454,7 @@ ProcessDhrdPreMemory (
 VOID
 ProcessDrhdPostMemory (
   IN OUT VOID                       *Context,
-  IN     UINT32                     VTdIndex,
+  IN     UINTN                      VTdIndex,
   IN     EFI_ACPI_DMAR_DRHD_HEADER  *DmarDrhd
   )
 {
diff --git a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmarPei.h b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmarPei.h
index 351a7810d8..7bed0a5363 100644
--- a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmarPei.h
+++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmarPei.h
@@ -49,7 +49,7 @@ typedef
 VOID
 (*PROCESS_DRHD_CALLBACK_FUNC) (
   IN OUT VOID                       *Context,
-  IN     UINT32                     VTdIndex,
+  IN     UINTN                      VTdIndex,
   IN     EFI_ACPI_DMAR_DRHD_HEADER  *DmarDrhd
   );
 
-- 
2.16.2.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#86672): https://edk2.groups.io/g/devel/message/86672
Mute This Topic: https://groups.io/mt/89156060/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [PATCH v2] IntelSiliconPkg/VTd: Fix to support IntelVTdDmarPei in 64bit
Posted by Sheng Wei 2 years, 2 months ago
Hi Ted,
Since we use UINTN as the return type of ParseDmarAcpiTableDrhd (), Could we keep UINTN here and change define of PROCESS_DRHD_CALLBACK_FUNC ?
typedef
VOID
(*PROCESS_DRHD_CALLBACK_FUNC) (
  IN OUT VOID                       *Context,
  IN     UINT32                     VTdIndex, // change to UINTN
  IN     EFI_ACPI_DMAR_DRHD_HEADER  *DmarDrhd
  );
And it also related to below 2 functions.
ProcessDrhdPostMemory ()
ProcessDhrdPreMemory ()
Need change the second parameter.
  IN     UINT32                     VTdIndex, // change to UINTN

Thank you
BR
Sheng Wei

> -----Original Message-----
> From: Kuo, Ted <ted.kuo@intel.com>
> Sent: 2022年2月15日 14:47
> To: devel@edk2.groups.io
> Cc: Sheng, W <w.sheng@intel.com>; Ni, Ray <ray.ni@intel.com>; Chaganty,
> Rangasai V <rangasai.v.chaganty@intel.com>; Huang, Jenny
> <jenny.huang@intel.com>; Kowalewski, Robert
> <robert.kowalewski@intel.com>
> Subject: [PATCH v2] IntelSiliconPkg/VTd: Fix to support IntelVTdDmarPei in
> 64bit
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3836
> Changed VtdIndex defined in PROCESS_DRHD_CALLBACK_FUNC from
> UINT32 to UINTN to avoid type incompatible error when enable PEI in 64bit.
> 
> Cc: Sheng Wei <w.sheng@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
> Cc: Jenny Huang <jenny.huang@intel.com>
> Cc: Robert Kowalewski <robert.kowalewski@intel.com>
> Signed-off-by: Ted Kuo <ted.kuo@intel.com>
> ---
>  .../IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmarPei.c     | 4
> ++--
>  .../IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmarPei.h     | 2
> +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git
> a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmar
> Pei.c
> b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmar
> Pei.c
> index f97d627eca..2844f366bb 100644
> ---
> a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmar
> Pei.c
> +++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTd
> +++ DmarPei.c
> @@ -434,7 +434,7 @@ GetVTdInfoHob (
>  VOID
>  ProcessDhrdPreMemory (
>    IN OUT VOID                       *Context,
> -  IN     UINT32                     VTdIndex,
> +  IN     UINTN                      VTdIndex,
>    IN     EFI_ACPI_DMAR_DRHD_HEADER  *DmarDrhd
>    )
>  {
> @@ -454,7 +454,7 @@ ProcessDhrdPreMemory (  VOID
> ProcessDrhdPostMemory (
>    IN OUT VOID                       *Context,
> -  IN     UINT32                     VTdIndex,
> +  IN     UINTN                      VTdIndex,
>    IN     EFI_ACPI_DMAR_DRHD_HEADER  *DmarDrhd
>    )
>  {
> diff --git
> a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmar
> Pei.h
> b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmar
> Pei.h
> index 351a7810d8..7bed0a5363 100644
> ---
> a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmar
> Pei.h
> +++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTd
> +++ DmarPei.h
> @@ -49,7 +49,7 @@ typedef
>  VOID
>  (*PROCESS_DRHD_CALLBACK_FUNC) (
>    IN OUT VOID                       *Context,
> -  IN     UINT32                     VTdIndex,
> +  IN     UINTN                      VTdIndex,
>    IN     EFI_ACPI_DMAR_DRHD_HEADER  *DmarDrhd
>    );
> 
> --
> 2.16.2.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#86673): https://edk2.groups.io/g/devel/message/86673
Mute This Topic: https://groups.io/mt/89156060/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [PATCH v2] IntelSiliconPkg/VTd: Fix to support IntelVTdDmarPei in 64bit
Posted by Sheng Wei 2 years, 2 months ago
The change is good to me.
Reviewed-by: Sheng Wei <w.sheng@intel.com>


> -----Original Message-----
> From: Kuo, Ted <ted.kuo@intel.com>
> Sent: 2022年2月15日 14:47
> To: devel@edk2.groups.io
> Cc: Sheng, W <w.sheng@intel.com>; Ni, Ray <ray.ni@intel.com>; Chaganty,
> Rangasai V <rangasai.v.chaganty@intel.com>; Huang, Jenny
> <jenny.huang@intel.com>; Kowalewski, Robert
> <robert.kowalewski@intel.com>
> Subject: [PATCH v2] IntelSiliconPkg/VTd: Fix to support IntelVTdDmarPei in
> 64bit
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3836
> Changed VtdIndex defined in PROCESS_DRHD_CALLBACK_FUNC from
> UINT32 to UINTN to avoid type incompatible error when enable PEI in 64bit.
> 
> Cc: Sheng Wei <w.sheng@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
> Cc: Jenny Huang <jenny.huang@intel.com>
> Cc: Robert Kowalewski <robert.kowalewski@intel.com>
> Signed-off-by: Ted Kuo <ted.kuo@intel.com>
> ---
>  .../IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmarPei.c     | 4
> ++--
>  .../IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmarPei.h     | 2
> +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git
> a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmar
> Pei.c
> b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmar
> Pei.c
> index f97d627eca..2844f366bb 100644
> ---
> a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmar
> Pei.c
> +++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTd
> +++ DmarPei.c
> @@ -434,7 +434,7 @@ GetVTdInfoHob (
>  VOID
>  ProcessDhrdPreMemory (
>    IN OUT VOID                       *Context,
> -  IN     UINT32                     VTdIndex,
> +  IN     UINTN                      VTdIndex,
>    IN     EFI_ACPI_DMAR_DRHD_HEADER  *DmarDrhd
>    )
>  {
> @@ -454,7 +454,7 @@ ProcessDhrdPreMemory (  VOID
> ProcessDrhdPostMemory (
>    IN OUT VOID                       *Context,
> -  IN     UINT32                     VTdIndex,
> +  IN     UINTN                      VTdIndex,
>    IN     EFI_ACPI_DMAR_DRHD_HEADER  *DmarDrhd
>    )
>  {
> diff --git
> a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmar
> Pei.h
> b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmar
> Pei.h
> index 351a7810d8..7bed0a5363 100644
> ---
> a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmar
> Pei.h
> +++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTd
> +++ DmarPei.h
> @@ -49,7 +49,7 @@ typedef
>  VOID
>  (*PROCESS_DRHD_CALLBACK_FUNC) (
>    IN OUT VOID                       *Context,
> -  IN     UINT32                     VTdIndex,
> +  IN     UINTN                      VTdIndex,
>    IN     EFI_ACPI_DMAR_DRHD_HEADER  *DmarDrhd
>    );
> 
> --
> 2.16.2.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#86674): https://edk2.groups.io/g/devel/message/86674
Mute This Topic: https://groups.io/mt/89156060/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] [PATCH v2] IntelSiliconPkg/VTd: Fix to support IntelVTdDmarPei in 64bit
Posted by Kowalewski, Robert 2 years, 2 months ago
Reviewed-by: Robert Kowalewski <robert.kowalewski@intel.com>

-----Original Message-----
From: Sheng, W <w.sheng@intel.com> 
Sent: Tuesday, February 15, 2022 7:58 AM
To: Kuo, Ted <ted.kuo@intel.com>; 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>; Kowalewski, Robert <robert.kowalewski@intel.com>
Subject: RE: [PATCH v2] IntelSiliconPkg/VTd: Fix to support IntelVTdDmarPei in 64bit

The change is good to me.
Reviewed-by: Sheng Wei <w.sheng@intel.com>


> -----Original Message-----
> From: Kuo, Ted <ted.kuo@intel.com>
> Sent: 2022年2月15日 14:47
> To: devel@edk2.groups.io
> Cc: Sheng, W <w.sheng@intel.com>; Ni, Ray <ray.ni@intel.com>; 
> Chaganty, Rangasai V <rangasai.v.chaganty@intel.com>; Huang, Jenny 
> <jenny.huang@intel.com>; Kowalewski, Robert 
> <robert.kowalewski@intel.com>
> Subject: [PATCH v2] IntelSiliconPkg/VTd: Fix to support 
> IntelVTdDmarPei in 64bit
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3836
> Changed VtdIndex defined in PROCESS_DRHD_CALLBACK_FUNC from
> UINT32 to UINTN to avoid type incompatible error when enable PEI in 64bit.
> 
> Cc: Sheng Wei <w.sheng@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
> Cc: Jenny Huang <jenny.huang@intel.com>
> Cc: Robert Kowalewski <robert.kowalewski@intel.com>
> Signed-off-by: Ted Kuo <ted.kuo@intel.com>
> ---
>  .../IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmarPei.c     | 4
> ++--
>  .../IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDmarPei.h     | 2
> +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git
> a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDm
> ar
> Pei.c
> b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDm
> ar
> Pei.c
> index f97d627eca..2844f366bb 100644
> ---
> a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDm
> ar
> Pei.c
> +++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelV
> +++ Td
> +++ DmarPei.c
> @@ -434,7 +434,7 @@ GetVTdInfoHob (
>  VOID
>  ProcessDhrdPreMemory (
>    IN OUT VOID                       *Context,
> -  IN     UINT32                     VTdIndex,
> +  IN     UINTN                      VTdIndex,
>    IN     EFI_ACPI_DMAR_DRHD_HEADER  *DmarDrhd
>    )
>  {
> @@ -454,7 +454,7 @@ ProcessDhrdPreMemory (  VOID ProcessDrhdPostMemory 
> (
>    IN OUT VOID                       *Context,
> -  IN     UINT32                     VTdIndex,
> +  IN     UINTN                      VTdIndex,
>    IN     EFI_ACPI_DMAR_DRHD_HEADER  *DmarDrhd
>    )
>  {
> diff --git
> a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDm
> ar
> Pei.h
> b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDm
> ar
> Pei.h
> index 351a7810d8..7bed0a5363 100644
> ---
> a/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelVTdDm
> ar
> Pei.h
> +++ b/Silicon/Intel/IntelSiliconPkg/Feature/VTd/IntelVTdDmarPei/IntelV
> +++ Td
> +++ DmarPei.h
> @@ -49,7 +49,7 @@ typedef
>  VOID
>  (*PROCESS_DRHD_CALLBACK_FUNC) (
>    IN OUT VOID                       *Context,
> -  IN     UINT32                     VTdIndex,
> +  IN     UINTN                      VTdIndex,
>    IN     EFI_ACPI_DMAR_DRHD_HEADER  *DmarDrhd
>    );
> 
> --
> 2.16.2.windows.1

---------------------------------------------------------------------
Intel Technology Poland sp. z o.o.
ul. Slowackiego 173 | 80-298 Gdansk | Sad Rejonowy Gdansk Polnoc | VII Wydzial Gospodarczy Krajowego Rejestru Sadowego - KRS 101882 | NIP 957-07-52-316 | Kapital zakladowy 200.000 PLN.
Ta wiadomosc wraz z zalacznikami jest przeznaczona dla okreslonego adresata i moze zawierac informacje poufne. W razie przypadkowego otrzymania tej wiadomosci, prosimy o powiadomienie nadawcy oraz trwale jej usuniecie; jakiekolwiek przegladanie lub rozpowszechnianie jest zabronione.
This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). If you are not the intended recipient, please contact the sender and delete all copies; any review or distribution by others is strictly prohibited.



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#86676): https://edk2.groups.io/g/devel/message/86676
Mute This Topic: https://groups.io/mt/89156060/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-