Re: [PATCH 2/5] [edk2-platforms] Silicon/Socionext/SynQuacer: Fix GenericWatchdog interrupt number

["Leif Lindholm" <leif@nuviainc.com>]

On Fri, Nov 05, 2021 at 18:23:36 +0900, Masami Hiramatsu wrote:
> This fixes Socionext DeveloperBox GenericWatchdog interrupt
> number to 93 instead of 94. Since the 93 is the default interrupt
> number defined in ArmPkg/ArmPkg.dec, this doesn't redefine
> gArmTokenSpaceGuid.PcdGenericWatchdogEl2IntrNum.
>

That is one thing this patch does.

> Signed-off-by: Masami Hiramatsu <masami.hiramatsu@linaro.org>
> Reported-by: Kazuhiko Sakamoto <sakamoto.kazuhiko@socionext.com>
> ---
>  .../Socionext/SynQuacer/AcpiTables/AcpiTables.inf  |    1 +
>  Silicon/Socionext/SynQuacer/AcpiTables/Gtdt.aslc   |    6 +++---
>  2 files changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.inf b/Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.inf
> index 96efb2d38e..886777a0fa 100644
> --- a/Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.inf
> +++ b/Silicon/Socionext/SynQuacer/AcpiTables/AcpiTables.inf
> @@ -50,6 +50,7 @@
>  
>    gArmTokenSpaceGuid.PcdGenericWatchdogControlBase
>    gArmTokenSpaceGuid.PcdGenericWatchdogRefreshBase
> +  gArmTokenSpaceGuid.PcdGenericWatchdogEl2IntrNum
>  
>    gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultOemRevision
>    gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiDefaultCreatorRevision
> diff --git a/Silicon/Socionext/SynQuacer/AcpiTables/Gtdt.aslc b/Silicon/Socionext/SynQuacer/AcpiTables/Gtdt.aslc
> index c811fc5a0c..b045a49efa 100644
> --- a/Silicon/Socionext/SynQuacer/AcpiTables/Gtdt.aslc
> +++ b/Silicon/Socionext/SynQuacer/AcpiTables/Gtdt.aslc
> @@ -74,9 +74,9 @@ EFI_ACPI_6_0_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {
>                                                    // UINT32 GTxCommonFlags
>    },
>    EFI_ACPI_6_0_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT (
> -    FixedPcdGet32 (PcdGenericWatchdogRefreshBase),
> -    FixedPcdGet32 (PcdGenericWatchdogControlBase),
> -    94,
> +    FixedPcdGet64 (PcdGenericWatchdogRefreshBase),
> +    FixedPcdGet64 (PcdGenericWatchdogControlBase),

But it also changes these two FixedPcdGet32 calls to FixedPcdGet64.
That should be a separate patch.

/
    Leif

> +    FixedPcdGet32 (PcdGenericWatchdogEl2IntrNum),
>      0),
>  };
>  
>