1. Patchew
  2. EDK2
  3. [edk2-devel] [PATCH 0/5] Series short description
  4. View patch

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

Masami Hiramatsu posted 5 patches 3 years ago
There is a newer version of this series
[edk2-devel] [PATCH 2/5] [edk2-platforms] Silicon/Socionext/SynQuacer: Fix GenericWatchdog interrupt number
Posted by Masami Hiramatsu 3 years ago 
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.

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),
+    FixedPcdGet32 (PcdGenericWatchdogEl2IntrNum),
     0),
 };
 



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#83377): https://edk2.groups.io/g/devel/message/83377
Mute This Topic: https://groups.io/mt/86836378/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 2/5] [edk2-platforms] Silicon/Socionext/SynQuacer: Fix GenericWatchdog interrupt number
Posted by Leif Lindholm 2 years, 12 months ago 
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),
>  };
>  
> 


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#84101): https://edk2.groups.io/g/devel/message/84101
Mute This Topic: https://groups.io/mt/86836378/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH 2/5] [edk2-platforms] Silicon/Socionext/SynQuacer: Fix GenericWatchdog interrupt number
Posted by Masami Hiramatsu 2 years, 12 months ago 
Hi Leif,

2021年11月27日(土) 2:50 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.

OK, I'll make it a separate patch.

Thank you,

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



-- 
Masami Hiramatsu


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

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.