[PATCH edk2-platforms v2 00/11] Fix build breaks and update IORT revision macro

[PATCH edk2-platforms v2 00/11] Fix build breaks and update IORT revision macro

[Sami Mujawar]

The patch series fixes the build break in Ampere/Jade and
Pythium/FT2000-4 due to missing VariableFlashInfoLib dependency
and also updates the IORT revision macro.

The IORT Rev E.d specification updates the IORT table revision
to 5. Following this the IORT table revision macro 
EFI_ACPI_IO_REMAPPING_TABLE_REVISION which was at Rev 0 has
been renamed to EFI_ACPI_IO_REMAPPING_TABLE_REV0. Therefore,
this series updates the following platforms to reflect this
renaming:
 - FVP
 - Morello FVP
 - SGI
 - AMD/Styx
 - Socionext/SynQuacer
 - RaspberryPi
 - N1SDP
 - Ampere/Jade
 - Pythium/FT2000-4

Note: This patch series is dependent on the edk2 patch series:
  "[PATCH v4 0/8] IORT Rev E.d specification updates"
  (https://edk2.groups.io/g/devel/message/91091), which must
be merged in edk2 before this patch series can be integrated.

The changes can be seen at:
https://github.com/samimujawar/edk2-platforms/tree/1527_iort_rev_ed_platforms_v2

Sami Mujawar (11):
  Platform/ARM: FVP: Update for IORT revision macro renaming
  Platform/ARM: Morello: Update for IORT revision macro renaming
  Platform/ARM: SGI: Update for IORT revision macro renaming
  Silicon/AMD/Styx: Update for IORT revision macro renaming
  Silicon/Socionext/SynQuacer: Update for IORT revision macro renaming
  Platform/RaspberryPi: Update for IORT revision macro renaming
  Platform/ARM: N1SDP: Update for IORT revision macro renaming
  Silicon/Ampere: Add VariableFlashInfoLib
  Platform/Ampere: JadePkg: Update for IORT revision macro renaming
  Silicon/Phytium: Add VariableFlashInfoLib
  Silicon/Phytium: FT2000-4Pkg: Update for IORT revision macro renaming

 Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c  | 2 +-
 Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c       | 2 +-
 Platform/ARM/SgiPkg/AcpiTables/Iort.aslc                                                     | 2 +-
 Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c | 2 +-
 Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiIort.c                                   | 2 +-
 Platform/RaspberryPi/AcpiTables/Iort.aslc                                                    | 2 +-
 Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc                                           | 2 +-
 Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc                                         | 1 +
 Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Iort.aslc                                     | 2 +-
 Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc                                    | 1 +
 Silicon/Socionext/SynQuacer/AcpiTables/Iort.aslc                                             | 2 +-
 11 files changed, 11 insertions(+), 9 deletions(-)

-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v2 01/11] Platform/ARM: FVP: Update for IORT revision macro renaming

[Sami Mujawar]

The IORT Specification E.d updates the IORT table revision to 5. To
reflect this change the IORT header file has been updated to rename
the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
macro in the Configuration Manager for FVP platform to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 0ba854610becff7d2544e26ec67a331783bbe75f..f5bac1d0243e9bdad38bf2cfba67197e0b3667c4 100644
--- a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -82,7 +82,7 @@ EDKII_PLATFORM_REPOSITORY_INFO VExpressPlatRepositoryInfo = {
     // IORT Table - FVP RevC
     {
       EFI_ACPI_6_3_IO_REMAPPING_TABLE_SIGNATURE,
-      EFI_ACPI_IO_REMAPPING_TABLE_REVISION,
+      EFI_ACPI_IO_REMAPPING_TABLE_REV0,
       CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdIort),
       NULL
     },
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v2 02/11] Platform/ARM: Morello: Update for IORT revision macro renaming

[Sami Mujawar]

The IORT Specification E.d updates the IORT table revision to 5. To
reflect this change the IORT header file has been updated to rename
the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
macro in the Configuration Manager for Morello FVP to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c
index ed2fdfeff9a02b13729cdd5d6f334f7bcabe679f..c23e284f24ff73aa2e40111863041d2a46c09b7e 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerFvp.c
@@ -76,7 +76,7 @@ EDKII_FVP_PLATFORM_REPOSITORY_INFO MorelloFvpRepositoryInfo = {
     // IORT Table
     {
       EFI_ACPI_6_3_IO_REMAPPING_TABLE_SIGNATURE,
-      EFI_ACPI_IO_REMAPPING_TABLE_REVISION,
+      EFI_ACPI_IO_REMAPPING_TABLE_REV0,
       CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdIort),
       NULL
     },
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v2 03/11] Platform/ARM: SGI: Update for IORT revision macro renaming

[Sami Mujawar]

The IORT Specification E.d updates the IORT table revision to 5. To
reflect this change the IORT header file has been updated to rename
the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
macro in the IORT table for SGI platforms to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Platform/ARM/SgiPkg/AcpiTables/Iort.aslc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc b/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
index fcc28a71c82eb0c78c96d60c9d9eb1554adb41a3..415403e8e8e5946d3a2319d83b76d6182a8a1e74 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
+++ b/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
@@ -50,7 +50,7 @@ ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE Iort =
      (
        EFI_ACPI_6_2_IO_REMAPPING_TABLE_SIGNATURE,
        ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE,
-       EFI_ACPI_IO_REMAPPING_TABLE_REVISION
+       EFI_ACPI_IO_REMAPPING_TABLE_REV0
      ),
      3,  // NumNodes
      sizeof (EFI_ACPI_6_0_IO_REMAPPING_TABLE),  // NodeOffset
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

Re: [PATCH edk2-platforms v2 03/11] Platform/ARM: SGI: Update for IORT revision macro renaming

[Thomas Abraham]

On 06/07/2022 11:39, Sami Mujawar wrote:
> The IORT Specification E.d updates the IORT table revision to 5. To
> reflect this change the IORT header file has been updated to rename
> the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
> EFI_ACPI_IO_REMAPPING_TABLE_REV0.
> 
> Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
> macro in the IORT table for SGI platforms to
> EFI_ACPI_IO_REMAPPING_TABLE_REV0.
> 
> Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
> ---
>   Platform/ARM/SgiPkg/AcpiTables/Iort.aslc | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc b/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
> index fcc28a71c82eb0c78c96d60c9d9eb1554adb41a3..415403e8e8e5946d3a2319d83b76d6182a8a1e74 100644
> --- a/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
> +++ b/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
> @@ -50,7 +50,7 @@ ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE Iort =
>        (
>          EFI_ACPI_6_2_IO_REMAPPING_TABLE_SIGNATURE,
>          ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE,
> -       EFI_ACPI_IO_REMAPPING_TABLE_REVISION
> +       EFI_ACPI_IO_REMAPPING_TABLE_REV0

nit: Should this have been EFI_ACPI_IO_REMAPPING_TABLE_REVISION_0 to 
better align with all the other table revision macros?

>        ),
>        3,  // NumNodes
>        sizeof (EFI_ACPI_6_0_IO_REMAPPING_TABLE),  // NodeOffset


Reviewed-by: Thomas Abraham <thomas.abraham@arm.com>

Thanks.

Re: [PATCH edk2-platforms v2 03/11] Platform/ARM: SGI: Update for IORT revision macro renaming

[Sami Mujawar]

Hi Thomas,

Please find my response inline marked [SAMI].

Regards,

Sami Mujawar

On 06/07/2022 03:18 pm, Thomas Abraham wrote:
>
>
> On 06/07/2022 11:39, Sami Mujawar wrote:
>> The IORT Specification E.d updates the IORT table revision to 5. To
>> reflect this change the IORT header file has been updated to rename
>> the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
>> EFI_ACPI_IO_REMAPPING_TABLE_REV0.
>>
>> Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
>> macro in the IORT table for SGI platforms to
>> EFI_ACPI_IO_REMAPPING_TABLE_REV0.
>>
>> Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
>> ---
>>   Platform/ARM/SgiPkg/AcpiTables/Iort.aslc | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc 
>> b/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
>> index 
>> fcc28a71c82eb0c78c96d60c9d9eb1554adb41a3..415403e8e8e5946d3a2319d83b76d6182a8a1e74 
>> 100644
>> --- a/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
>> +++ b/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
>> @@ -50,7 +50,7 @@ ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE Iort =
>>        (
>>          EFI_ACPI_6_2_IO_REMAPPING_TABLE_SIGNATURE,
>>          ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE,
>> -       EFI_ACPI_IO_REMAPPING_TABLE_REVISION
>> +       EFI_ACPI_IO_REMAPPING_TABLE_REV0
>
> nit: Should this have been EFI_ACPI_IO_REMAPPING_TABLE_REVISION_0 to 
> better align with all the other table revision macros?

[SAMI] I checked the edk2 code base and apparenlty the protocol 
versioning follows the scheme you mention above. As for ACPI tables the 
revision is derived from the _ACPI_x_y_ prefix in the macro name. e.g. 
EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION.

However, I have no objection to your suggestion with the only change 
that I would then prefer to make it 
EFI_ACPI_IO_REMAPPING_TABLE_REVISION_00.

Kindly let me know if this is acceptable and I will respin this patch 
series along with the edk2 series.

[/SAMI]

>
>>        ),
>>        3,  // NumNodes
>>        sizeof (EFI_ACPI_6_0_IO_REMAPPING_TABLE),  // NodeOffset
>
>
> Reviewed-by: Thomas Abraham <thomas.abraham@arm.com>
>
> Thanks.

Re: [PATCH edk2-platforms v2 03/11] Platform/ARM: SGI: Update for IORT revision macro renaming

[Thomas Abraham]

Hi Sami,

On 06/07/2022 16:15, Sami Mujawar wrote:
> Hi Thomas,
> 
> Please find my response inline marked [SAMI].
> 
> Regards,
> 
> Sami Mujawar
> 
> On 06/07/2022 03:18 pm, Thomas Abraham wrote:
>>
>>
>> On 06/07/2022 11:39, Sami Mujawar wrote:
>>> The IORT Specification E.d updates the IORT table revision to 5. To
>>> reflect this change the IORT header file has been updated to rename
>>> the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
>>> EFI_ACPI_IO_REMAPPING_TABLE_REV0.
>>>
>>> Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
>>> macro in the IORT table for SGI platforms to
>>> EFI_ACPI_IO_REMAPPING_TABLE_REV0.
>>>
>>> Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
>>> ---
>>>   Platform/ARM/SgiPkg/AcpiTables/Iort.aslc | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc 
>>> b/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
>>> index 
>>> fcc28a71c82eb0c78c96d60c9d9eb1554adb41a3..415403e8e8e5946d3a2319d83b76d6182a8a1e74 
>>> 100644
>>> --- a/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
>>> +++ b/Platform/ARM/SgiPkg/AcpiTables/Iort.aslc
>>> @@ -50,7 +50,7 @@ ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE Iort =
>>>        (
>>>          EFI_ACPI_6_2_IO_REMAPPING_TABLE_SIGNATURE,
>>>          ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE,
>>> -       EFI_ACPI_IO_REMAPPING_TABLE_REVISION
>>> +       EFI_ACPI_IO_REMAPPING_TABLE_REV0
>>
>> nit: Should this have been EFI_ACPI_IO_REMAPPING_TABLE_REVISION_0 to 
>> better align with all the other table revision macros?
> 
> [SAMI] I checked the edk2 code base and apparenlty the protocol 
> versioning follows the scheme you mention above. As for ACPI tables the 
> revision is derived from the _ACPI_x_y_ prefix in the macro name. e.g. 
> EFI_ACPI_6_4_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION.
> 
> However, I have no objection to your suggestion with the only change 
> that I would then prefer to make it 
> EFI_ACPI_IO_REMAPPING_TABLE_REVISION_00.
> 
> Kindly let me know if this is acceptable and I will respin this patch 
> series along with the edk2 series.
> 
> [/SAMI]

Yes, that would also be okay.

Thanks.

> 
>>
>>>        ),
>>>        3,  // NumNodes
>>>        sizeof (EFI_ACPI_6_0_IO_REMAPPING_TABLE),  // NodeOffset
>>
>>
>> Reviewed-by: Thomas Abraham <thomas.abraham@arm.com>
>>
>> Thanks.

[PATCH edk2-platforms v2 04/11] Silicon/AMD/Styx: Update for IORT revision macro renaming

[Sami Mujawar]

The IORT Specification E.d updates the IORT table revision to 5. To
reflect this change the IORT header file has been updated to rename
the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
macro in the IORT table for Styx platform to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc
index b81f87b7794eec47042910d77efcb609563991a8..9df5ce4037c5765a8f789733b8130bfe0be7b810 100644
--- a/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc
+++ b/Silicon/AMD/Styx/Drivers/AcpiPlatformDxe/Iort.aslc
@@ -139,7 +139,7 @@ STATIC STYX_IO_REMAPPING_STRUCTURE AcpiIort = {
   {
     AMD_ACPI_HEADER(EFI_ACPI_6_0_IO_REMAPPING_TABLE_SIGNATURE,
                     STYX_IO_REMAPPING_STRUCTURE,
-                    EFI_ACPI_IO_REMAPPING_TABLE_REVISION),
+                    EFI_ACPI_IO_REMAPPING_TABLE_REV0),
     11,                                             // NumNodes
     sizeof(EFI_ACPI_6_0_IO_REMAPPING_TABLE),        // NodeOffset
     0                                               // Reserved
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v2 05/11] Silicon/Socionext/SynQuacer: Update for IORT revision macro renaming

[Sami Mujawar]

The IORT Specification E.d updates the IORT table revision to 5. To
reflect this change the IORT header file has been updated to rename
the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
macro in the IORT table for SynQuacer platform to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Silicon/Socionext/SynQuacer/AcpiTables/Iort.aslc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Silicon/Socionext/SynQuacer/AcpiTables/Iort.aslc b/Silicon/Socionext/SynQuacer/AcpiTables/Iort.aslc
index 4627347028132395de757ff7c81b00848057632d..8854b0063f61a3ff347d87b1033bb9d77597e320 100644
--- a/Silicon/Socionext/SynQuacer/AcpiTables/Iort.aslc
+++ b/Silicon/Socionext/SynQuacer/AcpiTables/Iort.aslc
@@ -56,7 +56,7 @@ STATIC SYNQUACER_IO_REMAPPING_STRUCTURE Iort = {
   {
     __ACPI_HEADER(EFI_ACPI_6_0_IO_REMAPPING_TABLE_SIGNATURE,
                   SYNQUACER_IO_REMAPPING_STRUCTURE,
-                  EFI_ACPI_IO_REMAPPING_TABLE_REVISION),
+                  EFI_ACPI_IO_REMAPPING_TABLE_REV0),
     6,                                              // NumNodes
     sizeof(EFI_ACPI_6_0_IO_REMAPPING_TABLE),        // NodeOffset
     0                                               // Reserved
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v2 06/11] Platform/RaspberryPi: Update for IORT revision macro renaming

[Sami Mujawar]

The IORT Specification E.d updates the IORT table revision to 5. To
reflect this change the IORT header file has been updated to rename
the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
macro in the IORT table for RaspberryPi platform to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Platform/RaspberryPi/AcpiTables/Iort.aslc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/RaspberryPi/AcpiTables/Iort.aslc b/Platform/RaspberryPi/AcpiTables/Iort.aslc
index 810307ae376f7d24790775f499daa09e3137fe6c..3ca5471081f2b43e624b35fc7b9bda856b15daa9 100644
--- a/Platform/RaspberryPi/AcpiTables/Iort.aslc
+++ b/Platform/RaspberryPi/AcpiTables/Iort.aslc
@@ -28,7 +28,7 @@ STATIC RPI4_IO_REMAPPING_STRUCTURE Iort = {
   {
     ACPI_HEADER (EFI_ACPI_6_0_IO_REMAPPING_TABLE_SIGNATURE,
                  RPI4_IO_REMAPPING_STRUCTURE,
-                 EFI_ACPI_IO_REMAPPING_TABLE_REVISION),
+                 EFI_ACPI_IO_REMAPPING_TABLE_REV0),
     3,                                              // NumNodes
     sizeof (EFI_ACPI_6_0_IO_REMAPPING_TABLE),       // NodeOffset
     0                                               // Reserved
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

Re: [PATCH edk2-platforms v2 06/11] Platform/RaspberryPi: Update for IORT revision macro renaming

[Jeremy Linton]

Hi,

On 7/6/22 05:39, Sami Mujawar wrote:
> The IORT Specification E.d updates the IORT table revision to 5. To
> reflect this change the IORT header file has been updated to rename
> the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
> EFI_ACPI_IO_REMAPPING_TABLE_REV0.
> 
> Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
> macro in the IORT table for RaspberryPi platform to
> EFI_ACPI_IO_REMAPPING_TABLE_REV0.
> 
> Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
> ---
>   Platform/RaspberryPi/AcpiTables/Iort.aslc | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/Platform/RaspberryPi/AcpiTables/Iort.aslc b/Platform/RaspberryPi/AcpiTables/Iort.aslc
> index 810307ae376f7d24790775f499daa09e3137fe6c..3ca5471081f2b43e624b35fc7b9bda856b15daa9 100644
> --- a/Platform/RaspberryPi/AcpiTables/Iort.aslc
> +++ b/Platform/RaspberryPi/AcpiTables/Iort.aslc
> @@ -28,7 +28,7 @@ STATIC RPI4_IO_REMAPPING_STRUCTURE Iort = {
>     {
>       ACPI_HEADER (EFI_ACPI_6_0_IO_REMAPPING_TABLE_SIGNATURE,
>                    RPI4_IO_REMAPPING_STRUCTURE,
> -                 EFI_ACPI_IO_REMAPPING_TABLE_REVISION),
> +                 EFI_ACPI_IO_REMAPPING_TABLE_REV0),
>       3,                                              // NumNodes
>       sizeof (EFI_ACPI_6_0_IO_REMAPPING_TABLE),       // NodeOffset
>       0                                               // Reserved


So, this looks fine to me.

Thanks,

Reviewed-by: Jeremy Linton <jeremy.linton@arm.com>

[PATCH edk2-platforms v2 07/11] Platform/ARM: N1SDP: Update for IORT revision macro renaming

[Sami Mujawar]

The IORT Specification E.d updates the IORT table revision to 5. To
reflect this change the IORT header file has been updated to rename
the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
macro in the IORT table for N1SDP platform to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index f50623ae3faccc862eef1968674dee8bd33fbdd6..99d6fd7cfb05efd7e97545b4574295ec5c01bd32 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -90,7 +90,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
     // IORT Table
     {
       EFI_ACPI_6_3_IO_REMAPPING_TABLE_SIGNATURE,
-      EFI_ACPI_IO_REMAPPING_TABLE_REVISION,
+      EFI_ACPI_IO_REMAPPING_TABLE_REV0,
       CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdIort),
       NULL
     },
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v2 08/11] Silicon/Ampere: Add VariableFlashInfoLib

[Sami Mujawar]

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3479

Add an instance for the library class VariableFlashInfoLib that
was recently introduced in MdeModulePkg. This allows the variable
driver to build successfully as it has a dependency on this
library class.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
index f4007d654ec81297d4bbe002b2671c211129d819..d4c29c3c338cc8abefd84cbb3ff14d1727bd4fe4 100644
--- a/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
+++ b/Silicon/Ampere/AmpereAltraPkg/AmpereAltraPkg.dsc.inc
@@ -154,6 +154,7 @@ [LibraryClasses.common]
   AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf
 !endif
   VariablePolicyLib|MdeModulePkg/Library/VariablePolicyLib/VariablePolicyLib.inf
+  VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf
   VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
 
   #
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v2 09/11] Platform/Ampere: JadePkg: Update for IORT revision macro renaming

[Sami Mujawar]

The IORT Specification E.d updates the IORT table revision to 5. To
reflect this change the IORT header file has been updated to rename
the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
macro in the IORT table for SynQuacer platform to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiIort.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiIort.c b/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiIort.c
index 97be85c51f253422851ba139ee60bc8fc681aa87..d456a8b0c7cd59bdb36f77bc3b40fd36c60b4e1c 100644
--- a/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiIort.c
+++ b/Platform/Ampere/JadePkg/Drivers/AcpiPlatformDxe/AcpiIort.c
@@ -87,7 +87,7 @@ EFI_ACPI_6_0_IO_REMAPPING_TABLE mIortHeader = {
   .Header = __ACPI_HEADER (
               EFI_ACPI_6_0_IO_REMAPPING_TABLE_SIGNATURE,
               AC01_IO_REMAPPING_STRUCTURE,
-              EFI_ACPI_IO_REMAPPING_TABLE_REVISION
+              EFI_ACPI_IO_REMAPPING_TABLE_REV0
               ),
   .NumNodes = 0,  // To be filled
   .NodeOffset = sizeof (EFI_ACPI_6_0_IO_REMAPPING_TABLE),
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v2 10/11] Silicon/Phytium: Add VariableFlashInfoLib

[Sami Mujawar]

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3479

Add an instance for the library class VariableFlashInfoLib that
was recently introduced in MdeModulePkg. This allows the variable
driver to build successfully as it has a dependency on this
library class.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc b/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc
index 2565b8ac626abc2073d201ad43e057f2fbbf4cbc..a7ca630be7b98e784261bc9a7543fdcc71151337 100644
--- a/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc
+++ b/Silicon/Phytium/PhytiumCommonPkg/PhytiumCommonPkg.dsc.inc
@@ -98,6 +98,7 @@ [LibraryClasses.common]
   UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf
 
   VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf
+  VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf
   VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/VariablePolicyHelperLib.inf
 
   #
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'

[PATCH edk2-platforms v2 11/11] Silicon/Phytium: FT2000-4Pkg: Update for IORT revision macro renaming

[Sami Mujawar]

The IORT Specification E.d updates the IORT table revision to 5. To
reflect this change the IORT header file has been updated to rename
the EFI_ACPI_IO_REMAPPING_TABLE_REVISION macro which was at Rev 0 to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Therefore, update the usage of EFI_ACPI_IO_REMAPPING_TABLE_REVISION
macro in the IORT table for SynQuacer platform to
EFI_ACPI_IO_REMAPPING_TABLE_REV0.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
---
 Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Iort.aslc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Iort.aslc b/Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Iort.aslc
index 4239499b68e5923604625e05a0425fc11ab6664e..216871337f81f9fd9da75db4149fb2d7ad1f5210 100644
--- a/Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Iort.aslc
+++ b/Silicon/Phytium/FT2000-4Pkg/Drivers/AcpiTables/Iort.aslc
@@ -42,7 +42,7 @@ STATIC PHYTIUM_IO_REMAPPING_STRUCTURE Iort = {
   {
     PHYTIUM_ACPI_HEADER (EFI_ACPI_6_0_IO_REMAPPING_TABLE_SIGNATURE,
                   PHYTIUM_IO_REMAPPING_STRUCTURE,
-                  EFI_ACPI_IO_REMAPPING_TABLE_REVISION),
+                  EFI_ACPI_IO_REMAPPING_TABLE_REV0),
     2,                                              // NumNodes
     sizeof (EFI_ACPI_6_0_IO_REMAPPING_TABLE),       // NodeOffset
     0                                               // Reserved
-- 
'Guid(CE165669-3EF3-493F-B85D-6190EE5B9759)'