[Linaro-uefi,v2] Platforms/ARM: fix gtdt.asl for VExpressPkg

From: Fu Wei <fu.wei@linaro.org>

Add Memory-mapped GT and SBSA Generic Watchdog timer info
base on Foundation Model.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Fu Wei <fu.wei@linaro.org>
---
Changelog:
v2: Fix a inappropriate definition:
    GTDT_TIMER_SECURE --> GTDT_TIMER_SAVE_CONTEXT

v1: The first upstreaming version: https://lists.linaro.org/pipermail/linaro-uefi/2016-July/002230.html

 Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc | 128 ++++++++++++++++++++++------
 1 file changed, 101 insertions(+), 27 deletions(-)

Hi Leif,
When I tried to find some info about the arch_timer of foundation
model, I just found out this patch seems be missed ? :-)
Since the Foundation model still a main test platform for MMIO timer,
does it make sense to apply it?

Thanks :-)

On 23 August 2016 at 19:36,  <fu.wei@linaro.org> wrote:
> From: Fu Wei <fu.wei@linaro.org>
>
> Add Memory-mapped GT and SBSA Generic Watchdog timer info
> base on Foundation Model.
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Fu Wei <fu.wei@linaro.org>
> ---
> Changelog:
> v2: Fix a inappropriate definition:
>     GTDT_TIMER_SECURE --> GTDT_TIMER_SAVE_CONTEXT
>
> v1: The first upstreaming version: https://lists.linaro.org/pipermail/linaro-uefi/2016-July/002230.html
>
>  Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc | 128 ++++++++++++++++++++++------
>  1 file changed, 101 insertions(+), 27 deletions(-)
>
> diff --git a/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc b/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
> index 142249f..fc8f91f 100644
> --- a/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
> +++ b/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
> @@ -19,21 +19,70 @@
>  #include <Library/PcdLib.h>
>  #include <IndustryStandard/Acpi61.h>
>
> -#define SECURE_TIMER_EL1_GSIV       0x1D
> -#define NON_SECURE_TIMER_EL1_GSIV   0x1E
> -#define VIRTUAL_TIMER_GSIV          0x1B
> -#define NON_SECURE_EL2_GSIV         0x1A
> +#define FVP_SYSTEM_TIMER_BASE_ADDRESS   0x000000002a430000
> +#define FVP_CNT_READ_BASE_ADDRESS       0x000000002a800000
>
> -#define GT_BLOCK_CTL_BASE           0x000000002A810000
> -#define GT_BLOCK_FRAME1_CTL_BASE    0x000000002A820000
> -#define GT_BLOCK_FRAME1_GSIV        0x29
> +#define FVP_SECURE_TIMER_EL1_GSIV       0x1D
> +#define FVP_NON_SECURE_TIMER_EL1_GSIV   0x1E
> +#define FVP_VIRTUAL_TIMER_GSIV          0x1B
> +#define FVP_NON_SECURE_EL2_GSIV         0x1A
> +
> +#define GTDT_TIMER_EDGE_TRIGGERED   EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE
> +#define GTDT_TIMER_LEVEL_TRIGGERED  0
> +#define GTDT_TIMER_ACTIVE_LOW       EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
> +#define GTDT_TIMER_ACTIVE_HIGH      0
> +#define GTDT_TIMER_SAVE_CONTEXT     EFI_ACPI_6_1_GTDT_TIMER_FLAG_ALWAYS_ON_CAPABILITY
> +#define GTDT_TIMER_LOSE_CONTEXT     0
> +
> +#define FVP_GTDT_GTIMER_FLAGS       (GTDT_TIMER_LOSE_CONTEXT | GTDT_TIMER_ACTIVE_HIGH | GTDT_TIMER_EDGE_TRIGGERED)
> +
> +#define FVP_PLATFORM_TIMER_COUNT    2
> +#define FVP_TIMER_FRAMES_COUNT      2
> +#define FVP_WATCHDOG_COUNT          1
> +
> +#define FVP_GT_BLOCK_CTL_BASE           0x000000002A810000
> +#define FVP_GT_BLOCK_FRAME0_CTL_BASE    0x000000002A820000
> +#define FVP_GT_BLOCK_FRAME0_CTL_EL0_BASE  0xFFFFFFFFFFFFFFFF
> +#define FVP_GT_BLOCK_FRAME0_GSIV        0x39
> +
> +#define FVP_GT_BLOCK_FRAME1_CTL_BASE    0x000000002A830000
> +#define FVP_GT_BLOCK_FRAME1_CTL_EL0_BASE  0xFFFFFFFFFFFFFFFF
> +#define FVP_GT_BLOCK_FRAME1_GSIV        0x3A
> +
> +#define GTX_TIMER_EDGE_TRIGGERED    EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_FLAG_TIMER_INTERRUPT_MODE
> +#define GTX_TIMER_LEVEL_TRIGGERED   0
> +#define GTX_TIMER_ACTIVE_LOW        EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
> +#define GTX_TIMER_ACTIVE_HIGH       0
> +
> +#define FVP_GTX_TIMER_FLAGS         (GTX_TIMER_ACTIVE_HIGH | GTX_TIMER_LEVEL_TRIGGERED)
> +
> +#define GTX_TIMER_SECURE            EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_SECURE_TIMER
> +#define GTX_TIMER_NON_SECURE        0
> +#define GTX_TIMER_SAVE_CONTEXT      EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_ALWAYS_ON_CAPABILITY
> +#define GTX_TIMER_LOSE_CONTEXT      0
> +
> +#define FVP_GTX_COMMON_FLAGS        (GTX_TIMER_SAVE_CONTEXT | GTX_TIMER_SECURE)
> +
> +#define FVP_SBSA_WATCHDOG_REFRESH_BASE     0x000000002a450000
> +#define FVP_SBSA_WATCHDOG_CONTROL_BASE     0x000000002a440000
> +#define FVP_SBSA_WATCHDOG_GSIV             0x3B
> +
> +#define SBSA_WATCHDOG_EDGE_TRIGGERED   EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_MODE
> +#define SBSA_WATCHDOG_LEVEL_TRIGGERED  0
> +#define SBSA_WATCHDOG_ACTIVE_LOW       EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_POLARITY
> +#define SBSA_WATCHDOG_ACTIVE_HIGH      0
> +#define SBSA_WATCHDOG_SECURE           EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER
> +#define SBSA_WATCHDOG_NON_SECURE       0
> +
> +#define FVP_SBSA_WATCHDOG_FLAGS            (SBSA_WATCHDOG_NON_SECURE | SBSA_WATCHDOG_ACTIVE_HIGH | SBSA_WATCHDOG_LEVEL_TRIGGERED)
>
>  #pragma pack (1)
>
>  typedef struct {
>    EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE          Gtdt;
>    EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE                  GtBlock;
> -  EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE            Frames[1];
> +  EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE            Frames[FVP_TIMER_FRAMES_COUNT];
> +  EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE     Watchdogs[FVP_WATCHDOG_COUNT];
>  } FVP_GENERIC_TIMER_DESCRIPTION_TABLES;
>
>  #pragma pack ()
> @@ -45,27 +94,28 @@ FVP_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {
>        FVP_GENERIC_TIMER_DESCRIPTION_TABLES,
>        EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION
>      ),
> -    0xFFFFFFFFFFFFFFFF,                                   // UINT64  PhysicalAddress
> +    FVP_SYSTEM_TIMER_BASE_ADDRESS,                        // UINT64  PhysicalAddress
>      EFI_ACPI_RESERVED_DWORD,                              // UINT32  Reserved
> -    SECURE_TIMER_EL1_GSIV,                                // UINT32  SecurePL1TimerGSIV
> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  SecurePL1TimerFlags
> -    NON_SECURE_TIMER_EL1_GSIV,                            // UINT32  NonSecurePL1TimerGSIV
> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  NonSecurePL1TimerFlags
> -    VIRTUAL_TIMER_GSIV,                                   // UINT32  VirtualTimerGSIV
> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  VirtualTimerFlags
> -    NON_SECURE_EL2_GSIV,                                  // UINT32  NonSecurePL2TimerGSIV
> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  NonSecurePL2TimerFlags
> -    0xFFFFFFFFFFFFFFFF,                                   // UINT64  CntReadBasePhysicalAddress
> -    1,                                                    // UINT32  PlatformTimerCount
> +    FVP_SECURE_TIMER_EL1_GSIV,                            // UINT32  SecurePL1TimerGSIV
> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  SecurePL1TimerFlags
> +    FVP_NON_SECURE_TIMER_EL1_GSIV,                        // UINT32  NonSecurePL1TimerGSIV
> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  NonSecurePL1TimerFlags
> +    FVP_VIRTUAL_TIMER_GSIV,                               // UINT32  VirtualTimerGSIV
> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  VirtualTimerFlags
> +    FVP_NON_SECURE_EL2_GSIV,                              // UINT32  NonSecurePL2TimerGSIV
> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  NonSecurePL2TimerFlags
> +    FVP_CNT_READ_BASE_ADDRESS,                            // UINT64  CntReadBasePhysicalAddress
> +    FVP_PLATFORM_TIMER_COUNT,                             // UINT32  PlatformTimerCount
>      sizeof (EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE) // UINT32  PlatfromTimerOffset
>    },
>    {
>      EFI_ACPI_6_1_GTDT_GT_BLOCK,                           // UINT8 Type
>      sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE)          // UINT16 Length
> -      + sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE),
> +      + sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE) *
> +        FVP_TIMER_FRAMES_COUNT,
>      EFI_ACPI_RESERVED_BYTE,                               // UINT8 Reserved
> -    GT_BLOCK_CTL_BASE,                                   // UINT64 CntCtlBase
> -    1,                                                    // UINT32 GTBlockTimerCount
> +    FVP_GT_BLOCK_CTL_BASE,                                // UINT64 CntCtlBase
> +    FVP_TIMER_FRAMES_COUNT,                               // UINT32 GTBlockTimerCount
>      sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE)          // UINT32 GTBlockTimerOffset
>    },
>    {
> @@ -74,13 +124,37 @@ FVP_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {
>        {EFI_ACPI_RESERVED_BYTE,
>         EFI_ACPI_RESERVED_BYTE,
>         EFI_ACPI_RESERVED_BYTE},                             // UINT8 Reserved[3]
> -      GT_BLOCK_FRAME1_CTL_BASE,                             // UINT64 CntBaseX
> -      0xFFFFFFFFFFFFFFFF,                                   // UINT64 CntEL0BaseX
> -      GT_BLOCK_FRAME1_GSIV,                                 // UINT32 GTxPhysicalTimerGSIV
> -      0,                                                    // UINT32 GTxPhysicalTimerFlags
> +      FVP_GT_BLOCK_FRAME0_CTL_BASE,                         // UINT64 CntBaseX
> +      FVP_GT_BLOCK_FRAME0_CTL_EL0_BASE,                     // UINT64 CntEL0BaseX
> +      FVP_GT_BLOCK_FRAME0_GSIV,                             // UINT32 GTxPhysicalTimerGSIV
> +      FVP_GTX_TIMER_FLAGS,                                  // UINT32 GTxPhysicalTimerFlags
>        0,                                                    // UINT32 GTxVirtualTimerGSIV
>        0,                                                    // UINT32 GTxVirtualTimerFlags
> -      0                                                     // UINT32 GTxCommonFlags
> +      FVP_GTX_COMMON_FLAGS                                  // UINT32 GTxCommonFlags
> +    },
> +    {
> +      1,                                                    // UINT8 GTFrameNumber
> +      {EFI_ACPI_RESERVED_BYTE,
> +       EFI_ACPI_RESERVED_BYTE,
> +       EFI_ACPI_RESERVED_BYTE},                             // UINT8 Reserved[3]
> +      FVP_GT_BLOCK_FRAME1_CTL_BASE,                         // UINT64 CntBaseX
> +      FVP_GT_BLOCK_FRAME1_CTL_EL0_BASE,                     // UINT64 CntEL0BaseX
> +      FVP_GT_BLOCK_FRAME1_GSIV,                             // UINT32 GTxPhysicalTimerGSIV
> +      FVP_GTX_TIMER_FLAGS,                                  // UINT32 GTxPhysicalTimerFlags
> +      0,                                                    // UINT32 GTxVirtualTimerGSIV
> +      0,                                                    // UINT32 GTxVirtualTimerFlags
> +      FVP_GTX_COMMON_FLAGS                                  // UINT32 GTxCommonFlags
> +    }
> +  },
> +  {
> +    {
> +      EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG,                // UINT8 Type
> +      sizeof(EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE), // UINT16 Length
> +      EFI_ACPI_RESERVED_BYTE,                                 // UINT8 Reserved
> +      FVP_SBSA_WATCHDOG_REFRESH_BASE,                         // UINT64 RefreshFramePhysicalAddress
> +      FVP_SBSA_WATCHDOG_CONTROL_BASE,                         // UINT64 WatchdogControlFramePhysicalAddress
> +      FVP_SBSA_WATCHDOG_GSIV,                                 // UINT32 WatchdogTimerGSIV
> +      FVP_SBSA_WATCHDOG_FLAGS                                 // UINT32 WatchdogTimerFlags
>      }
>    }
>  };
> --
> 2.5.5
>

Hi Fu Wei,

Sorry to have dropped this one, but...
You generated this v2 based on comments from Alexei, so you should
have cc:d him. I will have been waiting for his Reviewed-by.

Regards,

Leif

On Tue, Aug 23, 2016 at 07:36:27PM +0800, fu.wei@linaro.org wrote:
> From: Fu Wei <fu.wei@linaro.org>
> 
> Add Memory-mapped GT and SBSA Generic Watchdog timer info
> base on Foundation Model.
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Fu Wei <fu.wei@linaro.org>
> ---
> Changelog:
> v2: Fix a inappropriate definition:
>     GTDT_TIMER_SECURE --> GTDT_TIMER_SAVE_CONTEXT
> 
> v1: The first upstreaming version: https://lists.linaro.org/pipermail/linaro-uefi/2016-July/002230.html
> 
>  Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc | 128 ++++++++++++++++++++++------
>  1 file changed, 101 insertions(+), 27 deletions(-)
> 
> diff --git a/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc b/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
> index 142249f..fc8f91f 100644
> --- a/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
> +++ b/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
> @@ -19,21 +19,70 @@
>  #include <Library/PcdLib.h>
>  #include <IndustryStandard/Acpi61.h>
>  
> -#define SECURE_TIMER_EL1_GSIV       0x1D
> -#define NON_SECURE_TIMER_EL1_GSIV   0x1E
> -#define VIRTUAL_TIMER_GSIV          0x1B
> -#define NON_SECURE_EL2_GSIV         0x1A
> +#define FVP_SYSTEM_TIMER_BASE_ADDRESS   0x000000002a430000
> +#define FVP_CNT_READ_BASE_ADDRESS       0x000000002a800000
>  
> -#define GT_BLOCK_CTL_BASE           0x000000002A810000
> -#define GT_BLOCK_FRAME1_CTL_BASE    0x000000002A820000
> -#define GT_BLOCK_FRAME1_GSIV        0x29
> +#define FVP_SECURE_TIMER_EL1_GSIV       0x1D
> +#define FVP_NON_SECURE_TIMER_EL1_GSIV   0x1E
> +#define FVP_VIRTUAL_TIMER_GSIV          0x1B
> +#define FVP_NON_SECURE_EL2_GSIV         0x1A
> +
> +#define GTDT_TIMER_EDGE_TRIGGERED   EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE
> +#define GTDT_TIMER_LEVEL_TRIGGERED  0
> +#define GTDT_TIMER_ACTIVE_LOW       EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
> +#define GTDT_TIMER_ACTIVE_HIGH      0
> +#define GTDT_TIMER_SAVE_CONTEXT     EFI_ACPI_6_1_GTDT_TIMER_FLAG_ALWAYS_ON_CAPABILITY
> +#define GTDT_TIMER_LOSE_CONTEXT     0
> +
> +#define FVP_GTDT_GTIMER_FLAGS       (GTDT_TIMER_LOSE_CONTEXT | GTDT_TIMER_ACTIVE_HIGH | GTDT_TIMER_EDGE_TRIGGERED)
> +
> +#define FVP_PLATFORM_TIMER_COUNT    2
> +#define FVP_TIMER_FRAMES_COUNT      2
> +#define FVP_WATCHDOG_COUNT          1
> +
> +#define FVP_GT_BLOCK_CTL_BASE           0x000000002A810000
> +#define FVP_GT_BLOCK_FRAME0_CTL_BASE    0x000000002A820000
> +#define FVP_GT_BLOCK_FRAME0_CTL_EL0_BASE  0xFFFFFFFFFFFFFFFF
> +#define FVP_GT_BLOCK_FRAME0_GSIV        0x39
> +
> +#define FVP_GT_BLOCK_FRAME1_CTL_BASE    0x000000002A830000
> +#define FVP_GT_BLOCK_FRAME1_CTL_EL0_BASE  0xFFFFFFFFFFFFFFFF
> +#define FVP_GT_BLOCK_FRAME1_GSIV        0x3A
> +
> +#define GTX_TIMER_EDGE_TRIGGERED    EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_FLAG_TIMER_INTERRUPT_MODE
> +#define GTX_TIMER_LEVEL_TRIGGERED   0
> +#define GTX_TIMER_ACTIVE_LOW        EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
> +#define GTX_TIMER_ACTIVE_HIGH       0
> +
> +#define FVP_GTX_TIMER_FLAGS         (GTX_TIMER_ACTIVE_HIGH | GTX_TIMER_LEVEL_TRIGGERED)
> +
> +#define GTX_TIMER_SECURE            EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_SECURE_TIMER
> +#define GTX_TIMER_NON_SECURE        0
> +#define GTX_TIMER_SAVE_CONTEXT      EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_ALWAYS_ON_CAPABILITY
> +#define GTX_TIMER_LOSE_CONTEXT      0
> +
> +#define FVP_GTX_COMMON_FLAGS        (GTX_TIMER_SAVE_CONTEXT | GTX_TIMER_SECURE)
> +
> +#define FVP_SBSA_WATCHDOG_REFRESH_BASE     0x000000002a450000
> +#define FVP_SBSA_WATCHDOG_CONTROL_BASE     0x000000002a440000
> +#define FVP_SBSA_WATCHDOG_GSIV             0x3B
> +
> +#define SBSA_WATCHDOG_EDGE_TRIGGERED   EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_MODE
> +#define SBSA_WATCHDOG_LEVEL_TRIGGERED  0
> +#define SBSA_WATCHDOG_ACTIVE_LOW       EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_POLARITY
> +#define SBSA_WATCHDOG_ACTIVE_HIGH      0
> +#define SBSA_WATCHDOG_SECURE           EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER
> +#define SBSA_WATCHDOG_NON_SECURE       0
> +
> +#define FVP_SBSA_WATCHDOG_FLAGS            (SBSA_WATCHDOG_NON_SECURE | SBSA_WATCHDOG_ACTIVE_HIGH | SBSA_WATCHDOG_LEVEL_TRIGGERED)
>  
>  #pragma pack (1)
>  
>  typedef struct {
>    EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE          Gtdt;
>    EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE                  GtBlock;
> -  EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE            Frames[1];
> +  EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE            Frames[FVP_TIMER_FRAMES_COUNT];
> +  EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE     Watchdogs[FVP_WATCHDOG_COUNT];
>  } FVP_GENERIC_TIMER_DESCRIPTION_TABLES;
>  
>  #pragma pack ()
> @@ -45,27 +94,28 @@ FVP_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {
>        FVP_GENERIC_TIMER_DESCRIPTION_TABLES,
>        EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION
>      ),
> -    0xFFFFFFFFFFFFFFFF,                                   // UINT64  PhysicalAddress
> +    FVP_SYSTEM_TIMER_BASE_ADDRESS,                        // UINT64  PhysicalAddress
>      EFI_ACPI_RESERVED_DWORD,                              // UINT32  Reserved
> -    SECURE_TIMER_EL1_GSIV,                                // UINT32  SecurePL1TimerGSIV
> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  SecurePL1TimerFlags
> -    NON_SECURE_TIMER_EL1_GSIV,                            // UINT32  NonSecurePL1TimerGSIV
> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  NonSecurePL1TimerFlags
> -    VIRTUAL_TIMER_GSIV,                                   // UINT32  VirtualTimerGSIV
> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  VirtualTimerFlags
> -    NON_SECURE_EL2_GSIV,                                  // UINT32  NonSecurePL2TimerGSIV
> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  NonSecurePL2TimerFlags
> -    0xFFFFFFFFFFFFFFFF,                                   // UINT64  CntReadBasePhysicalAddress
> -    1,                                                    // UINT32  PlatformTimerCount
> +    FVP_SECURE_TIMER_EL1_GSIV,                            // UINT32  SecurePL1TimerGSIV
> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  SecurePL1TimerFlags
> +    FVP_NON_SECURE_TIMER_EL1_GSIV,                        // UINT32  NonSecurePL1TimerGSIV
> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  NonSecurePL1TimerFlags
> +    FVP_VIRTUAL_TIMER_GSIV,                               // UINT32  VirtualTimerGSIV
> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  VirtualTimerFlags
> +    FVP_NON_SECURE_EL2_GSIV,                              // UINT32  NonSecurePL2TimerGSIV
> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  NonSecurePL2TimerFlags
> +    FVP_CNT_READ_BASE_ADDRESS,                            // UINT64  CntReadBasePhysicalAddress
> +    FVP_PLATFORM_TIMER_COUNT,                             // UINT32  PlatformTimerCount
>      sizeof (EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE) // UINT32  PlatfromTimerOffset
>    },
>    {
>      EFI_ACPI_6_1_GTDT_GT_BLOCK,                           // UINT8 Type
>      sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE)          // UINT16 Length
> -      + sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE),
> +      + sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE) *
> +        FVP_TIMER_FRAMES_COUNT,
>      EFI_ACPI_RESERVED_BYTE,                               // UINT8 Reserved
> -    GT_BLOCK_CTL_BASE,                                   // UINT64 CntCtlBase
> -    1,                                                    // UINT32 GTBlockTimerCount
> +    FVP_GT_BLOCK_CTL_BASE,                                // UINT64 CntCtlBase
> +    FVP_TIMER_FRAMES_COUNT,                               // UINT32 GTBlockTimerCount
>      sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE)          // UINT32 GTBlockTimerOffset
>    },
>    {
> @@ -74,13 +124,37 @@ FVP_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {
>        {EFI_ACPI_RESERVED_BYTE,
>         EFI_ACPI_RESERVED_BYTE,
>         EFI_ACPI_RESERVED_BYTE},                             // UINT8 Reserved[3]
> -      GT_BLOCK_FRAME1_CTL_BASE,                             // UINT64 CntBaseX
> -      0xFFFFFFFFFFFFFFFF,                                   // UINT64 CntEL0BaseX
> -      GT_BLOCK_FRAME1_GSIV,                                 // UINT32 GTxPhysicalTimerGSIV
> -      0,                                                    // UINT32 GTxPhysicalTimerFlags
> +      FVP_GT_BLOCK_FRAME0_CTL_BASE,                         // UINT64 CntBaseX
> +      FVP_GT_BLOCK_FRAME0_CTL_EL0_BASE,                     // UINT64 CntEL0BaseX
> +      FVP_GT_BLOCK_FRAME0_GSIV,                             // UINT32 GTxPhysicalTimerGSIV
> +      FVP_GTX_TIMER_FLAGS,                                  // UINT32 GTxPhysicalTimerFlags
>        0,                                                    // UINT32 GTxVirtualTimerGSIV
>        0,                                                    // UINT32 GTxVirtualTimerFlags
> -      0                                                     // UINT32 GTxCommonFlags
> +      FVP_GTX_COMMON_FLAGS                                  // UINT32 GTxCommonFlags
> +    },
> +    {
> +      1,                                                    // UINT8 GTFrameNumber
> +      {EFI_ACPI_RESERVED_BYTE,
> +       EFI_ACPI_RESERVED_BYTE,
> +       EFI_ACPI_RESERVED_BYTE},                             // UINT8 Reserved[3]
> +      FVP_GT_BLOCK_FRAME1_CTL_BASE,                         // UINT64 CntBaseX
> +      FVP_GT_BLOCK_FRAME1_CTL_EL0_BASE,                     // UINT64 CntEL0BaseX
> +      FVP_GT_BLOCK_FRAME1_GSIV,                             // UINT32 GTxPhysicalTimerGSIV
> +      FVP_GTX_TIMER_FLAGS,                                  // UINT32 GTxPhysicalTimerFlags
> +      0,                                                    // UINT32 GTxVirtualTimerGSIV
> +      0,                                                    // UINT32 GTxVirtualTimerFlags
> +      FVP_GTX_COMMON_FLAGS                                  // UINT32 GTxCommonFlags
> +    }
> +  },
> +  {
> +    {
> +      EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG,                // UINT8 Type
> +      sizeof(EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE), // UINT16 Length
> +      EFI_ACPI_RESERVED_BYTE,                                 // UINT8 Reserved
> +      FVP_SBSA_WATCHDOG_REFRESH_BASE,                         // UINT64 RefreshFramePhysicalAddress
> +      FVP_SBSA_WATCHDOG_CONTROL_BASE,                         // UINT64 WatchdogControlFramePhysicalAddress
> +      FVP_SBSA_WATCHDOG_GSIV,                                 // UINT32 WatchdogTimerGSIV
> +      FVP_SBSA_WATCHDOG_FLAGS                                 // UINT32 WatchdogTimerFlags
>      }
>    }
>  };
> -- 
> 2.5.5
>

Hi Alexei, Leif,

Add Mark and  Marc in the cc list.

On 25 January 2017 at 19:42, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> Hi Fu Wei,
>
> Sorry to have dropped this one, but...
> You generated this v2 based on comments from Alexei, so you should
> have cc:d him. I will have been waiting for his Reviewed-by.

Sorry, I should update my git-send-email shell script :-)

There is a question below, would you mind to have a look ?

>
> Regards,
>
> Leif
>
> On Tue, Aug 23, 2016 at 07:36:27PM +0800, fu.wei@linaro.org wrote:
>> From: Fu Wei <fu.wei@linaro.org>
>>
>> Add Memory-mapped GT and SBSA Generic Watchdog timer info
>> base on Foundation Model.
>>
>> Contributed-under: TianoCore Contribution Agreement 1.0
>> Signed-off-by: Fu Wei <fu.wei@linaro.org>
>> ---
>> Changelog:
>> v2: Fix a inappropriate definition:
>>     GTDT_TIMER_SECURE --> GTDT_TIMER_SAVE_CONTEXT
>>
>> v1: The first upstreaming version: https://lists.linaro.org/pipermail/linaro-uefi/2016-July/002230.html
>>
>>  Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc | 128 ++++++++++++++++++++++------
>>  1 file changed, 101 insertions(+), 27 deletions(-)
>>
>> diff --git a/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc b/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
>> index 142249f..fc8f91f 100644
>> --- a/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
>> +++ b/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
>> @@ -19,21 +19,70 @@
>>  #include <Library/PcdLib.h>
>>  #include <IndustryStandard/Acpi61.h>
>>
>> -#define SECURE_TIMER_EL1_GSIV       0x1D
>> -#define NON_SECURE_TIMER_EL1_GSIV   0x1E
>> -#define VIRTUAL_TIMER_GSIV          0x1B
>> -#define NON_SECURE_EL2_GSIV         0x1A
>> +#define FVP_SYSTEM_TIMER_BASE_ADDRESS   0x000000002a430000
>> +#define FVP_CNT_READ_BASE_ADDRESS       0x000000002a800000
>>
>> -#define GT_BLOCK_CTL_BASE           0x000000002A810000
>> -#define GT_BLOCK_FRAME1_CTL_BASE    0x000000002A820000
>> -#define GT_BLOCK_FRAME1_GSIV        0x29
>> +#define FVP_SECURE_TIMER_EL1_GSIV       0x1D
>> +#define FVP_NON_SECURE_TIMER_EL1_GSIV   0x1E
>> +#define FVP_VIRTUAL_TIMER_GSIV          0x1B
>> +#define FVP_NON_SECURE_EL2_GSIV         0x1A
>> +
>> +#define GTDT_TIMER_EDGE_TRIGGERED   EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE
>> +#define GTDT_TIMER_LEVEL_TRIGGERED  0
>> +#define GTDT_TIMER_ACTIVE_LOW       EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
>> +#define GTDT_TIMER_ACTIVE_HIGH      0
>> +#define GTDT_TIMER_SAVE_CONTEXT     EFI_ACPI_6_1_GTDT_TIMER_FLAG_ALWAYS_ON_CAPABILITY
>> +#define GTDT_TIMER_LOSE_CONTEXT     0
>> +
>> +#define FVP_GTDT_GTIMER_FLAGS       (GTDT_TIMER_LOSE_CONTEXT | GTDT_TIMER_ACTIVE_HIGH | GTDT_TIMER_EDGE_TRIGGERED)
>> +
>> +#define FVP_PLATFORM_TIMER_COUNT    2
>> +#define FVP_TIMER_FRAMES_COUNT      2
>> +#define FVP_WATCHDOG_COUNT          1
>> +
>> +#define FVP_GT_BLOCK_CTL_BASE           0x000000002A810000
>> +#define FVP_GT_BLOCK_FRAME0_CTL_BASE    0x000000002A820000
>> +#define FVP_GT_BLOCK_FRAME0_CTL_EL0_BASE  0xFFFFFFFFFFFFFFFF
>> +#define FVP_GT_BLOCK_FRAME0_GSIV        0x39
>> +
>> +#define FVP_GT_BLOCK_FRAME1_CTL_BASE    0x000000002A830000
>> +#define FVP_GT_BLOCK_FRAME1_CTL_EL0_BASE  0xFFFFFFFFFFFFFFFF
>> +#define FVP_GT_BLOCK_FRAME1_GSIV        0x3A
>> +
>> +#define GTX_TIMER_EDGE_TRIGGERED    EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_FLAG_TIMER_INTERRUPT_MODE
>> +#define GTX_TIMER_LEVEL_TRIGGERED   0
>> +#define GTX_TIMER_ACTIVE_LOW        EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
>> +#define GTX_TIMER_ACTIVE_HIGH       0
>> +
>> +#define FVP_GTX_TIMER_FLAGS         (GTX_TIMER_ACTIVE_HIGH | GTX_TIMER_LEVEL_TRIGGERED)
>> +
>> +#define GTX_TIMER_SECURE            EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_SECURE_TIMER
>> +#define GTX_TIMER_NON_SECURE        0
>> +#define GTX_TIMER_SAVE_CONTEXT      EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_ALWAYS_ON_CAPABILITY
>> +#define GTX_TIMER_LOSE_CONTEXT      0
>> +
>> +#define FVP_GTX_COMMON_FLAGS        (GTX_TIMER_SAVE_CONTEXT | GTX_TIMER_SECURE)

For this GTX_TIMER_SECURE, the timer frames of FM:

AP_REFCLK CNTBase0, Generic Timer   S
AP_REFCLK CNTBase1, Generic Timer   S/NS
(From ARM v8-A Foundation Platform User Guide)

Dose it means the timer frame 0 is SECURE , and the timer frame 1 is NON_SECURE?

And because Linux kernel is running on Non-secure EL1, so should we
skip SECURE timer in Linux?

,
>> +
>> +#define FVP_SBSA_WATCHDOG_REFRESH_BASE     0x000000002a450000
>> +#define FVP_SBSA_WATCHDOG_CONTROL_BASE     0x000000002a440000
>> +#define FVP_SBSA_WATCHDOG_GSIV             0x3B
>> +
>> +#define SBSA_WATCHDOG_EDGE_TRIGGERED   EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_MODE
>> +#define SBSA_WATCHDOG_LEVEL_TRIGGERED  0
>> +#define SBSA_WATCHDOG_ACTIVE_LOW       EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_POLARITY
>> +#define SBSA_WATCHDOG_ACTIVE_HIGH      0
>> +#define SBSA_WATCHDOG_SECURE           EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER
>> +#define SBSA_WATCHDOG_NON_SECURE       0
>> +
>> +#define FVP_SBSA_WATCHDOG_FLAGS            (SBSA_WATCHDOG_NON_SECURE | SBSA_WATCHDOG_ACTIVE_HIGH | SBSA_WATCHDOG_LEVEL_TRIGGERED)
>>
>>  #pragma pack (1)
>>
>>  typedef struct {
>>    EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE          Gtdt;
>>    EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE                  GtBlock;
>> -  EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE            Frames[1];
>> +  EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE            Frames[FVP_TIMER_FRAMES_COUNT];
>> +  EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE     Watchdogs[FVP_WATCHDOG_COUNT];
>>  } FVP_GENERIC_TIMER_DESCRIPTION_TABLES;
>>
>>  #pragma pack ()
>> @@ -45,27 +94,28 @@ FVP_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {
>>        FVP_GENERIC_TIMER_DESCRIPTION_TABLES,
>>        EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION
>>      ),
>> -    0xFFFFFFFFFFFFFFFF,                                   // UINT64  PhysicalAddress
>> +    FVP_SYSTEM_TIMER_BASE_ADDRESS,                        // UINT64  PhysicalAddress
>>      EFI_ACPI_RESERVED_DWORD,                              // UINT32  Reserved
>> -    SECURE_TIMER_EL1_GSIV,                                // UINT32  SecurePL1TimerGSIV
>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  SecurePL1TimerFlags
>> -    NON_SECURE_TIMER_EL1_GSIV,                            // UINT32  NonSecurePL1TimerGSIV
>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  NonSecurePL1TimerFlags
>> -    VIRTUAL_TIMER_GSIV,                                   // UINT32  VirtualTimerGSIV
>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  VirtualTimerFlags
>> -    NON_SECURE_EL2_GSIV,                                  // UINT32  NonSecurePL2TimerGSIV
>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  NonSecurePL2TimerFlags
>> -    0xFFFFFFFFFFFFFFFF,                                   // UINT64  CntReadBasePhysicalAddress
>> -    1,                                                    // UINT32  PlatformTimerCount
>> +    FVP_SECURE_TIMER_EL1_GSIV,                            // UINT32  SecurePL1TimerGSIV
>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  SecurePL1TimerFlags
>> +    FVP_NON_SECURE_TIMER_EL1_GSIV,                        // UINT32  NonSecurePL1TimerGSIV
>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  NonSecurePL1TimerFlags
>> +    FVP_VIRTUAL_TIMER_GSIV,                               // UINT32  VirtualTimerGSIV
>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  VirtualTimerFlags
>> +    FVP_NON_SECURE_EL2_GSIV,                              // UINT32  NonSecurePL2TimerGSIV
>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  NonSecurePL2TimerFlags
>> +    FVP_CNT_READ_BASE_ADDRESS,                            // UINT64  CntReadBasePhysicalAddress
>> +    FVP_PLATFORM_TIMER_COUNT,                             // UINT32  PlatformTimerCount
>>      sizeof (EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE) // UINT32  PlatfromTimerOffset
>>    },
>>    {
>>      EFI_ACPI_6_1_GTDT_GT_BLOCK,                           // UINT8 Type
>>      sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE)          // UINT16 Length
>> -      + sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE),
>> +      + sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE) *
>> +        FVP_TIMER_FRAMES_COUNT,
>>      EFI_ACPI_RESERVED_BYTE,                               // UINT8 Reserved
>> -    GT_BLOCK_CTL_BASE,                                   // UINT64 CntCtlBase
>> -    1,                                                    // UINT32 GTBlockTimerCount
>> +    FVP_GT_BLOCK_CTL_BASE,                                // UINT64 CntCtlBase
>> +    FVP_TIMER_FRAMES_COUNT,                               // UINT32 GTBlockTimerCount
>>      sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE)          // UINT32 GTBlockTimerOffset
>>    },
>>    {
>> @@ -74,13 +124,37 @@ FVP_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {
>>        {EFI_ACPI_RESERVED_BYTE,
>>         EFI_ACPI_RESERVED_BYTE,
>>         EFI_ACPI_RESERVED_BYTE},                             // UINT8 Reserved[3]
>> -      GT_BLOCK_FRAME1_CTL_BASE,                             // UINT64 CntBaseX
>> -      0xFFFFFFFFFFFFFFFF,                                   // UINT64 CntEL0BaseX
>> -      GT_BLOCK_FRAME1_GSIV,                                 // UINT32 GTxPhysicalTimerGSIV
>> -      0,                                                    // UINT32 GTxPhysicalTimerFlags
>> +      FVP_GT_BLOCK_FRAME0_CTL_BASE,                         // UINT64 CntBaseX
>> +      FVP_GT_BLOCK_FRAME0_CTL_EL0_BASE,                     // UINT64 CntEL0BaseX
>> +      FVP_GT_BLOCK_FRAME0_GSIV,                             // UINT32 GTxPhysicalTimerGSIV
>> +      FVP_GTX_TIMER_FLAGS,                                  // UINT32 GTxPhysicalTimerFlags
>>        0,                                                    // UINT32 GTxVirtualTimerGSIV
>>        0,                                                    // UINT32 GTxVirtualTimerFlags
>> -      0                                                     // UINT32 GTxCommonFlags
>> +      FVP_GTX_COMMON_FLAGS                                  // UINT32 GTxCommonFlags
>> +    },
>> +    {
>> +      1,                                                    // UINT8 GTFrameNumber
>> +      {EFI_ACPI_RESERVED_BYTE,
>> +       EFI_ACPI_RESERVED_BYTE,
>> +       EFI_ACPI_RESERVED_BYTE},                             // UINT8 Reserved[3]
>> +      FVP_GT_BLOCK_FRAME1_CTL_BASE,                         // UINT64 CntBaseX
>> +      FVP_GT_BLOCK_FRAME1_CTL_EL0_BASE,                     // UINT64 CntEL0BaseX
>> +      FVP_GT_BLOCK_FRAME1_GSIV,                             // UINT32 GTxPhysicalTimerGSIV
>> +      FVP_GTX_TIMER_FLAGS,                                  // UINT32 GTxPhysicalTimerFlags
>> +      0,                                                    // UINT32 GTxVirtualTimerGSIV
>> +      0,                                                    // UINT32 GTxVirtualTimerFlags
>> +      FVP_GTX_COMMON_FLAGS                                  // UINT32 GTxCommonFlags
>> +    }
>> +  },
>> +  {
>> +    {
>> +      EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG,                // UINT8 Type
>> +      sizeof(EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE), // UINT16 Length
>> +      EFI_ACPI_RESERVED_BYTE,                                 // UINT8 Reserved
>> +      FVP_SBSA_WATCHDOG_REFRESH_BASE,                         // UINT64 RefreshFramePhysicalAddress
>> +      FVP_SBSA_WATCHDOG_CONTROL_BASE,                         // UINT64 WatchdogControlFramePhysicalAddress
>> +      FVP_SBSA_WATCHDOG_GSIV,                                 // UINT32 WatchdogTimerGSIV
>> +      FVP_SBSA_WATCHDOG_FLAGS                                 // UINT32 WatchdogTimerFlags
>>      }
>>    }
>>  };
>> --
>> 2.5.5
>>

Looks OK for me.

-----Original Message-----
From: Fu Wei [mailto:fu.wei@linaro.org]

Sent: 25 January 2017 12:00
To: Leif Lindholm; Mark Rutland
Cc: ard.biesheuvel@linaro.org; Linaro UEFI Mailman List; Linaro ACPI Mailman List; ryan.harkin@linaro.org; graeme.gregory@linaro.org; Al Stone; hanjun.guo@linaro.org; Alexei Fedorov; Marc Zyngier
Subject: Re: [PATCH v2] Platforms/ARM: fix gtdt.asl for VExpressPkg

Hi Alexei, Leif,

Add Mark and  Marc in the cc list.

On 25 January 2017 at 19:42, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> Hi Fu Wei,

>

> Sorry to have dropped this one, but...

> You generated this v2 based on comments from Alexei, so you should

> have cc:d him. I will have been waiting for his Reviewed-by.


Sorry, I should update my git-send-email shell script :-)

There is a question below, would you mind to have a look ?

>

> Regards,

>

> Leif

>

> On Tue, Aug 23, 2016 at 07:36:27PM +0800, fu.wei@linaro.org wrote:

>> From: Fu Wei <fu.wei@linaro.org>

>>

>> Add Memory-mapped GT and SBSA Generic Watchdog timer info base on

>> Foundation Model.

>>

>> Contributed-under: TianoCore Contribution Agreement 1.0

>> Signed-off-by: Fu Wei <fu.wei@linaro.org>

>> ---

>> Changelog:

>> v2: Fix a inappropriate definition:

>>     GTDT_TIMER_SECURE --> GTDT_TIMER_SAVE_CONTEXT

>>

>> v1: The first upstreaming version:

>> https://lists.linaro.org/pipermail/linaro-uefi/2016-July/002230.html

>>

>>  Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc | 128

>> ++++++++++++++++++++++------

>>  1 file changed, 101 insertions(+), 27 deletions(-)

>>

>> diff --git a/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc

>> b/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc

>> index 142249f..fc8f91f 100644

>> --- a/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc

>> +++ b/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc

>> @@ -19,21 +19,70 @@

>>  #include <Library/PcdLib.h>

>>  #include <IndustryStandard/Acpi61.h>

>>

>> -#define SECURE_TIMER_EL1_GSIV       0x1D

>> -#define NON_SECURE_TIMER_EL1_GSIV   0x1E

>> -#define VIRTUAL_TIMER_GSIV          0x1B

>> -#define NON_SECURE_EL2_GSIV         0x1A

>> +#define FVP_SYSTEM_TIMER_BASE_ADDRESS   0x000000002a430000

>> +#define FVP_CNT_READ_BASE_ADDRESS       0x000000002a800000

>>

>> -#define GT_BLOCK_CTL_BASE           0x000000002A810000

>> -#define GT_BLOCK_FRAME1_CTL_BASE    0x000000002A820000

>> -#define GT_BLOCK_FRAME1_GSIV        0x29

>> +#define FVP_SECURE_TIMER_EL1_GSIV       0x1D

>> +#define FVP_NON_SECURE_TIMER_EL1_GSIV   0x1E

>> +#define FVP_VIRTUAL_TIMER_GSIV          0x1B

>> +#define FVP_NON_SECURE_EL2_GSIV         0x1A

>> +

>> +#define GTDT_TIMER_EDGE_TRIGGERED   EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE

>> +#define GTDT_TIMER_LEVEL_TRIGGERED  0

>> +#define GTDT_TIMER_ACTIVE_LOW       EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY

>> +#define GTDT_TIMER_ACTIVE_HIGH      0

>> +#define GTDT_TIMER_SAVE_CONTEXT     EFI_ACPI_6_1_GTDT_TIMER_FLAG_ALWAYS_ON_CAPABILITY

>> +#define GTDT_TIMER_LOSE_CONTEXT     0

>> +

>> +#define FVP_GTDT_GTIMER_FLAGS       (GTDT_TIMER_LOSE_CONTEXT | GTDT_TIMER_ACTIVE_HIGH | GTDT_TIMER_EDGE_TRIGGERED)

>> +

>> +#define FVP_PLATFORM_TIMER_COUNT    2

>> +#define FVP_TIMER_FRAMES_COUNT      2

>> +#define FVP_WATCHDOG_COUNT          1

>> +

>> +#define FVP_GT_BLOCK_CTL_BASE           0x000000002A810000

>> +#define FVP_GT_BLOCK_FRAME0_CTL_BASE    0x000000002A820000

>> +#define FVP_GT_BLOCK_FRAME0_CTL_EL0_BASE  0xFFFFFFFFFFFFFFFF

>> +#define FVP_GT_BLOCK_FRAME0_GSIV        0x39

>> +

>> +#define FVP_GT_BLOCK_FRAME1_CTL_BASE    0x000000002A830000

>> +#define FVP_GT_BLOCK_FRAME1_CTL_EL0_BASE  0xFFFFFFFFFFFFFFFF

>> +#define FVP_GT_BLOCK_FRAME1_GSIV        0x3A

>> +

>> +#define GTX_TIMER_EDGE_TRIGGERED    EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_FLAG_TIMER_INTERRUPT_MODE

>> +#define GTX_TIMER_LEVEL_TRIGGERED   0

>> +#define GTX_TIMER_ACTIVE_LOW        EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_FLAG_TIMER_INTERRUPT_POLARITY

>> +#define GTX_TIMER_ACTIVE_HIGH       0

>> +

>> +#define FVP_GTX_TIMER_FLAGS         (GTX_TIMER_ACTIVE_HIGH | GTX_TIMER_LEVEL_TRIGGERED)

>> +

>> +#define GTX_TIMER_SECURE            EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_SECURE_TIMER

>> +#define GTX_TIMER_NON_SECURE        0

>> +#define GTX_TIMER_SAVE_CONTEXT      EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_ALWAYS_ON_CAPABILITY

>> +#define GTX_TIMER_LOSE_CONTEXT      0

>> +

>> +#define FVP_GTX_COMMON_FLAGS        (GTX_TIMER_SAVE_CONTEXT | GTX_TIMER_SECURE)


For this GTX_TIMER_SECURE, the timer frames of FM:

AP_REFCLK CNTBase0, Generic Timer   S
AP_REFCLK CNTBase1, Generic Timer   S/NS
(From ARM v8-A Foundation Platform User Guide)

Dose it means the timer frame 0 is SECURE , and the timer frame 1 is NON_SECURE?

And because Linux kernel is running on Non-secure EL1, so should we skip SECURE timer in Linux?

,
>> +

>> +#define FVP_SBSA_WATCHDOG_REFRESH_BASE     0x000000002a450000

>> +#define FVP_SBSA_WATCHDOG_CONTROL_BASE     0x000000002a440000

>> +#define FVP_SBSA_WATCHDOG_GSIV             0x3B

>> +

>> +#define SBSA_WATCHDOG_EDGE_TRIGGERED   EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_MODE

>> +#define SBSA_WATCHDOG_LEVEL_TRIGGERED  0

>> +#define SBSA_WATCHDOG_ACTIVE_LOW       EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_POLARITY

>> +#define SBSA_WATCHDOG_ACTIVE_HIGH      0

>> +#define SBSA_WATCHDOG_SECURE           EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER

>> +#define SBSA_WATCHDOG_NON_SECURE       0

>> +

>> +#define FVP_SBSA_WATCHDOG_FLAGS            (SBSA_WATCHDOG_NON_SECURE | SBSA_WATCHDOG_ACTIVE_HIGH | SBSA_WATCHDOG_LEVEL_TRIGGERED)

>>

>>  #pragma pack (1)

>>

>>  typedef struct {

>>    EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE          Gtdt;

>>    EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE                  GtBlock;

>> -  EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE            Frames[1];

>> +  EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE            Frames[FVP_TIMER_FRAMES_COUNT];

>> +  EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE     Watchdogs[FVP_WATCHDOG_COUNT];

>>  } FVP_GENERIC_TIMER_DESCRIPTION_TABLES;

>>

>>  #pragma pack ()

>> @@ -45,27 +94,28 @@ FVP_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {

>>        FVP_GENERIC_TIMER_DESCRIPTION_TABLES,

>>        EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION

>>      ),

>> -    0xFFFFFFFFFFFFFFFF,                                   // UINT64  PhysicalAddress

>> +    FVP_SYSTEM_TIMER_BASE_ADDRESS,                        // UINT64  PhysicalAddress

>>      EFI_ACPI_RESERVED_DWORD,                              // UINT32  Reserved

>> -    SECURE_TIMER_EL1_GSIV,                                // UINT32  SecurePL1TimerGSIV

>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  SecurePL1TimerFlags

>> -    NON_SECURE_TIMER_EL1_GSIV,                            // UINT32  NonSecurePL1TimerGSIV

>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  NonSecurePL1TimerFlags

>> -    VIRTUAL_TIMER_GSIV,                                   // UINT32  VirtualTimerGSIV

>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  VirtualTimerFlags

>> -    NON_SECURE_EL2_GSIV,                                  // UINT32  NonSecurePL2TimerGSIV

>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  NonSecurePL2TimerFlags

>> -    0xFFFFFFFFFFFFFFFF,                                   // UINT64  CntReadBasePhysicalAddress

>> -    1,                                                    // UINT32  PlatformTimerCount

>> +    FVP_SECURE_TIMER_EL1_GSIV,                            // UINT32  SecurePL1TimerGSIV

>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  SecurePL1TimerFlags

>> +    FVP_NON_SECURE_TIMER_EL1_GSIV,                        // UINT32  NonSecurePL1TimerGSIV

>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  NonSecurePL1TimerFlags

>> +    FVP_VIRTUAL_TIMER_GSIV,                               // UINT32  VirtualTimerGSIV

>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  VirtualTimerFlags

>> +    FVP_NON_SECURE_EL2_GSIV,                              // UINT32  NonSecurePL2TimerGSIV

>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  NonSecurePL2TimerFlags

>> +    FVP_CNT_READ_BASE_ADDRESS,                            // UINT64  CntReadBasePhysicalAddress

>> +    FVP_PLATFORM_TIMER_COUNT,                             // UINT32  PlatformTimerCount

>>      sizeof (EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE) // UINT32  PlatfromTimerOffset

>>    },

>>    {

>>      EFI_ACPI_6_1_GTDT_GT_BLOCK,                           // UINT8 Type

>>      sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE)          // UINT16 Length

>> -      + sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE),

>> +      + sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE) *

>> +        FVP_TIMER_FRAMES_COUNT,

>>      EFI_ACPI_RESERVED_BYTE,                               // UINT8 Reserved

>> -    GT_BLOCK_CTL_BASE,                                   // UINT64 CntCtlBase

>> -    1,                                                    // UINT32 GTBlockTimerCount

>> +    FVP_GT_BLOCK_CTL_BASE,                                // UINT64 CntCtlBase

>> +    FVP_TIMER_FRAMES_COUNT,                               // UINT32 GTBlockTimerCount

>>      sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE)          // UINT32 GTBlockTimerOffset

>>    },

>>    {

>> @@ -74,13 +124,37 @@ FVP_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {

>>        {EFI_ACPI_RESERVED_BYTE,

>>         EFI_ACPI_RESERVED_BYTE,

>>         EFI_ACPI_RESERVED_BYTE},                             // UINT8 Reserved[3]

>> -      GT_BLOCK_FRAME1_CTL_BASE,                             // UINT64 CntBaseX

>> -      0xFFFFFFFFFFFFFFFF,                                   // UINT64 CntEL0BaseX

>> -      GT_BLOCK_FRAME1_GSIV,                                 // UINT32 GTxPhysicalTimerGSIV

>> -      0,                                                    // UINT32 GTxPhysicalTimerFlags

>> +      FVP_GT_BLOCK_FRAME0_CTL_BASE,                         // UINT64 CntBaseX

>> +      FVP_GT_BLOCK_FRAME0_CTL_EL0_BASE,                     // UINT64 CntEL0BaseX

>> +      FVP_GT_BLOCK_FRAME0_GSIV,                             // UINT32 GTxPhysicalTimerGSIV

>> +      FVP_GTX_TIMER_FLAGS,                                  // UINT32 GTxPhysicalTimerFlags

>>        0,                                                    // UINT32 GTxVirtualTimerGSIV

>>        0,                                                    // UINT32 GTxVirtualTimerFlags

>> -      0                                                     // UINT32 GTxCommonFlags

>> +      FVP_GTX_COMMON_FLAGS                                  // UINT32 GTxCommonFlags

>> +    },

>> +    {

>> +      1,                                                    // UINT8 GTFrameNumber

>> +      {EFI_ACPI_RESERVED_BYTE,

>> +       EFI_ACPI_RESERVED_BYTE,

>> +       EFI_ACPI_RESERVED_BYTE},                             // UINT8 Reserved[3]

>> +      FVP_GT_BLOCK_FRAME1_CTL_BASE,                         // UINT64 CntBaseX

>> +      FVP_GT_BLOCK_FRAME1_CTL_EL0_BASE,                     // UINT64 CntEL0BaseX

>> +      FVP_GT_BLOCK_FRAME1_GSIV,                             // UINT32 GTxPhysicalTimerGSIV

>> +      FVP_GTX_TIMER_FLAGS,                                  // UINT32 GTxPhysicalTimerFlags

>> +      0,                                                    // UINT32 GTxVirtualTimerGSIV

>> +      0,                                                    // UINT32 GTxVirtualTimerFlags

>> +      FVP_GTX_COMMON_FLAGS                                  // UINT32 GTxCommonFlags

>> +    }

>> +  },

>> +  {

>> +    {

>> +      EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG,                // UINT8 Type

>> +      sizeof(EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE), // UINT16 Length

>> +      EFI_ACPI_RESERVED_BYTE,                                 // UINT8 Reserved

>> +      FVP_SBSA_WATCHDOG_REFRESH_BASE,                         // UINT64 RefreshFramePhysicalAddress

>> +      FVP_SBSA_WATCHDOG_CONTROL_BASE,                         // UINT64 WatchdogControlFramePhysicalAddress

>> +      FVP_SBSA_WATCHDOG_GSIV,                                 // UINT32 WatchdogTimerGSIV

>> +      FVP_SBSA_WATCHDOG_FLAGS                                 // UINT32 WatchdogTimerFlags

>>      }

>>    }

>>  };

>> --

>> 2.5.5

>>




--
Best regards,

Fu Wei
Software Engineer
Red Hat
IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

On Wed, Jan 25, 2017 at 05:18:01PM +0000, Alexei Fedorov wrote:
> Looks OK for me.

Thanks, Alexei. I'll take that as a Reviewed-by:.

Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Pushed as cec1666e.

> -----Original Message-----
> From: Fu Wei [mailto:fu.wei@linaro.org]
> Sent: 25 January 2017 12:00
> To: Leif Lindholm; Mark Rutland
> Cc: ard.biesheuvel@linaro.org; Linaro UEFI Mailman List; Linaro ACPI Mailman List; ryan.harkin@linaro.org; graeme.gregory@linaro.org; Al Stone; hanjun.guo@linaro.org; Alexei Fedorov; Marc Zyngier
> Subject: Re: [PATCH v2] Platforms/ARM: fix gtdt.asl for VExpressPkg
> 
> Hi Alexei, Leif,
> 
> Add Mark and  Marc in the cc list.
> 
> On 25 January 2017 at 19:42, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> > Hi Fu Wei,
> >
> > Sorry to have dropped this one, but...
> > You generated this v2 based on comments from Alexei, so you should
> > have cc:d him. I will have been waiting for his Reviewed-by.
> 
> Sorry, I should update my git-send-email shell script :-)
> 
> There is a question below, would you mind to have a look ?
> 
> >
> > Regards,
> >
> > Leif
> >
> > On Tue, Aug 23, 2016 at 07:36:27PM +0800, fu.wei@linaro.org wrote:
> >> From: Fu Wei <fu.wei@linaro.org>
> >>
> >> Add Memory-mapped GT and SBSA Generic Watchdog timer info base on
> >> Foundation Model.
> >>
> >> Contributed-under: TianoCore Contribution Agreement 1.0
> >> Signed-off-by: Fu Wei <fu.wei@linaro.org>
> >> ---
> >> Changelog:
> >> v2: Fix a inappropriate definition:
> >>     GTDT_TIMER_SECURE --> GTDT_TIMER_SAVE_CONTEXT
> >>
> >> v1: The first upstreaming version:
> >> https://lists.linaro.org/pipermail/linaro-uefi/2016-July/002230.html
> >>
> >>  Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc | 128
> >> ++++++++++++++++++++++------
> >>  1 file changed, 101 insertions(+), 27 deletions(-)
> >>
> >> diff --git a/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
> >> b/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
> >> index 142249f..fc8f91f 100644
> >> --- a/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
> >> +++ b/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
> >> @@ -19,21 +19,70 @@
> >>  #include <Library/PcdLib.h>
> >>  #include <IndustryStandard/Acpi61.h>
> >>
> >> -#define SECURE_TIMER_EL1_GSIV       0x1D
> >> -#define NON_SECURE_TIMER_EL1_GSIV   0x1E
> >> -#define VIRTUAL_TIMER_GSIV          0x1B
> >> -#define NON_SECURE_EL2_GSIV         0x1A
> >> +#define FVP_SYSTEM_TIMER_BASE_ADDRESS   0x000000002a430000
> >> +#define FVP_CNT_READ_BASE_ADDRESS       0x000000002a800000
> >>
> >> -#define GT_BLOCK_CTL_BASE           0x000000002A810000
> >> -#define GT_BLOCK_FRAME1_CTL_BASE    0x000000002A820000
> >> -#define GT_BLOCK_FRAME1_GSIV        0x29
> >> +#define FVP_SECURE_TIMER_EL1_GSIV       0x1D
> >> +#define FVP_NON_SECURE_TIMER_EL1_GSIV   0x1E
> >> +#define FVP_VIRTUAL_TIMER_GSIV          0x1B
> >> +#define FVP_NON_SECURE_EL2_GSIV         0x1A
> >> +
> >> +#define GTDT_TIMER_EDGE_TRIGGERED   EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE
> >> +#define GTDT_TIMER_LEVEL_TRIGGERED  0
> >> +#define GTDT_TIMER_ACTIVE_LOW       EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
> >> +#define GTDT_TIMER_ACTIVE_HIGH      0
> >> +#define GTDT_TIMER_SAVE_CONTEXT     EFI_ACPI_6_1_GTDT_TIMER_FLAG_ALWAYS_ON_CAPABILITY
> >> +#define GTDT_TIMER_LOSE_CONTEXT     0
> >> +
> >> +#define FVP_GTDT_GTIMER_FLAGS       (GTDT_TIMER_LOSE_CONTEXT | GTDT_TIMER_ACTIVE_HIGH | GTDT_TIMER_EDGE_TRIGGERED)
> >> +
> >> +#define FVP_PLATFORM_TIMER_COUNT    2
> >> +#define FVP_TIMER_FRAMES_COUNT      2
> >> +#define FVP_WATCHDOG_COUNT          1
> >> +
> >> +#define FVP_GT_BLOCK_CTL_BASE           0x000000002A810000
> >> +#define FVP_GT_BLOCK_FRAME0_CTL_BASE    0x000000002A820000
> >> +#define FVP_GT_BLOCK_FRAME0_CTL_EL0_BASE  0xFFFFFFFFFFFFFFFF
> >> +#define FVP_GT_BLOCK_FRAME0_GSIV        0x39
> >> +
> >> +#define FVP_GT_BLOCK_FRAME1_CTL_BASE    0x000000002A830000
> >> +#define FVP_GT_BLOCK_FRAME1_CTL_EL0_BASE  0xFFFFFFFFFFFFFFFF
> >> +#define FVP_GT_BLOCK_FRAME1_GSIV        0x3A
> >> +
> >> +#define GTX_TIMER_EDGE_TRIGGERED    EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_FLAG_TIMER_INTERRUPT_MODE
> >> +#define GTX_TIMER_LEVEL_TRIGGERED   0
> >> +#define GTX_TIMER_ACTIVE_LOW        EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
> >> +#define GTX_TIMER_ACTIVE_HIGH       0
> >> +
> >> +#define FVP_GTX_TIMER_FLAGS         (GTX_TIMER_ACTIVE_HIGH | GTX_TIMER_LEVEL_TRIGGERED)
> >> +
> >> +#define GTX_TIMER_SECURE            EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_SECURE_TIMER
> >> +#define GTX_TIMER_NON_SECURE        0
> >> +#define GTX_TIMER_SAVE_CONTEXT      EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_ALWAYS_ON_CAPABILITY
> >> +#define GTX_TIMER_LOSE_CONTEXT      0
> >> +
> >> +#define FVP_GTX_COMMON_FLAGS        (GTX_TIMER_SAVE_CONTEXT | GTX_TIMER_SECURE)
> 
> For this GTX_TIMER_SECURE, the timer frames of FM:
> 
> AP_REFCLK CNTBase0, Generic Timer   S
> AP_REFCLK CNTBase1, Generic Timer   S/NS
> (From ARM v8-A Foundation Platform User Guide)
> 
> Dose it means the timer frame 0 is SECURE , and the timer frame 1 is NON_SECURE?
> 
> And because Linux kernel is running on Non-secure EL1, so should we skip SECURE timer in Linux?
> 
> ,
> >> +
> >> +#define FVP_SBSA_WATCHDOG_REFRESH_BASE     0x000000002a450000
> >> +#define FVP_SBSA_WATCHDOG_CONTROL_BASE     0x000000002a440000
> >> +#define FVP_SBSA_WATCHDOG_GSIV             0x3B
> >> +
> >> +#define SBSA_WATCHDOG_EDGE_TRIGGERED   EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_MODE
> >> +#define SBSA_WATCHDOG_LEVEL_TRIGGERED  0
> >> +#define SBSA_WATCHDOG_ACTIVE_LOW       EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_POLARITY
> >> +#define SBSA_WATCHDOG_ACTIVE_HIGH      0
> >> +#define SBSA_WATCHDOG_SECURE           EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER
> >> +#define SBSA_WATCHDOG_NON_SECURE       0
> >> +
> >> +#define FVP_SBSA_WATCHDOG_FLAGS            (SBSA_WATCHDOG_NON_SECURE | SBSA_WATCHDOG_ACTIVE_HIGH | SBSA_WATCHDOG_LEVEL_TRIGGERED)
> >>
> >>  #pragma pack (1)
> >>
> >>  typedef struct {
> >>    EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE          Gtdt;
> >>    EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE                  GtBlock;
> >> -  EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE            Frames[1];
> >> +  EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE            Frames[FVP_TIMER_FRAMES_COUNT];
> >> +  EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE     Watchdogs[FVP_WATCHDOG_COUNT];
> >>  } FVP_GENERIC_TIMER_DESCRIPTION_TABLES;
> >>
> >>  #pragma pack ()
> >> @@ -45,27 +94,28 @@ FVP_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {
> >>        FVP_GENERIC_TIMER_DESCRIPTION_TABLES,
> >>        EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION
> >>      ),
> >> -    0xFFFFFFFFFFFFFFFF,                                   // UINT64  PhysicalAddress
> >> +    FVP_SYSTEM_TIMER_BASE_ADDRESS,                        // UINT64  PhysicalAddress
> >>      EFI_ACPI_RESERVED_DWORD,                              // UINT32  Reserved
> >> -    SECURE_TIMER_EL1_GSIV,                                // UINT32  SecurePL1TimerGSIV
> >> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  SecurePL1TimerFlags
> >> -    NON_SECURE_TIMER_EL1_GSIV,                            // UINT32  NonSecurePL1TimerGSIV
> >> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  NonSecurePL1TimerFlags
> >> -    VIRTUAL_TIMER_GSIV,                                   // UINT32  VirtualTimerGSIV
> >> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  VirtualTimerFlags
> >> -    NON_SECURE_EL2_GSIV,                                  // UINT32  NonSecurePL2TimerGSIV
> >> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  NonSecurePL2TimerFlags
> >> -    0xFFFFFFFFFFFFFFFF,                                   // UINT64  CntReadBasePhysicalAddress
> >> -    1,                                                    // UINT32  PlatformTimerCount
> >> +    FVP_SECURE_TIMER_EL1_GSIV,                            // UINT32  SecurePL1TimerGSIV
> >> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  SecurePL1TimerFlags
> >> +    FVP_NON_SECURE_TIMER_EL1_GSIV,                        // UINT32  NonSecurePL1TimerGSIV
> >> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  NonSecurePL1TimerFlags
> >> +    FVP_VIRTUAL_TIMER_GSIV,                               // UINT32  VirtualTimerGSIV
> >> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  VirtualTimerFlags
> >> +    FVP_NON_SECURE_EL2_GSIV,                              // UINT32  NonSecurePL2TimerGSIV
> >> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  NonSecurePL2TimerFlags
> >> +    FVP_CNT_READ_BASE_ADDRESS,                            // UINT64  CntReadBasePhysicalAddress
> >> +    FVP_PLATFORM_TIMER_COUNT,                             // UINT32  PlatformTimerCount
> >>      sizeof (EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE) // UINT32  PlatfromTimerOffset
> >>    },
> >>    {
> >>      EFI_ACPI_6_1_GTDT_GT_BLOCK,                           // UINT8 Type
> >>      sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE)          // UINT16 Length
> >> -      + sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE),
> >> +      + sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE) *
> >> +        FVP_TIMER_FRAMES_COUNT,
> >>      EFI_ACPI_RESERVED_BYTE,                               // UINT8 Reserved
> >> -    GT_BLOCK_CTL_BASE,                                   // UINT64 CntCtlBase
> >> -    1,                                                    // UINT32 GTBlockTimerCount
> >> +    FVP_GT_BLOCK_CTL_BASE,                                // UINT64 CntCtlBase
> >> +    FVP_TIMER_FRAMES_COUNT,                               // UINT32 GTBlockTimerCount
> >>      sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE)          // UINT32 GTBlockTimerOffset
> >>    },
> >>    {
> >> @@ -74,13 +124,37 @@ FVP_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {
> >>        {EFI_ACPI_RESERVED_BYTE,
> >>         EFI_ACPI_RESERVED_BYTE,
> >>         EFI_ACPI_RESERVED_BYTE},                             // UINT8 Reserved[3]
> >> -      GT_BLOCK_FRAME1_CTL_BASE,                             // UINT64 CntBaseX
> >> -      0xFFFFFFFFFFFFFFFF,                                   // UINT64 CntEL0BaseX
> >> -      GT_BLOCK_FRAME1_GSIV,                                 // UINT32 GTxPhysicalTimerGSIV
> >> -      0,                                                    // UINT32 GTxPhysicalTimerFlags
> >> +      FVP_GT_BLOCK_FRAME0_CTL_BASE,                         // UINT64 CntBaseX
> >> +      FVP_GT_BLOCK_FRAME0_CTL_EL0_BASE,                     // UINT64 CntEL0BaseX
> >> +      FVP_GT_BLOCK_FRAME0_GSIV,                             // UINT32 GTxPhysicalTimerGSIV
> >> +      FVP_GTX_TIMER_FLAGS,                                  // UINT32 GTxPhysicalTimerFlags
> >>        0,                                                    // UINT32 GTxVirtualTimerGSIV
> >>        0,                                                    // UINT32 GTxVirtualTimerFlags
> >> -      0                                                     // UINT32 GTxCommonFlags
> >> +      FVP_GTX_COMMON_FLAGS                                  // UINT32 GTxCommonFlags
> >> +    },
> >> +    {
> >> +      1,                                                    // UINT8 GTFrameNumber
> >> +      {EFI_ACPI_RESERVED_BYTE,
> >> +       EFI_ACPI_RESERVED_BYTE,
> >> +       EFI_ACPI_RESERVED_BYTE},                             // UINT8 Reserved[3]
> >> +      FVP_GT_BLOCK_FRAME1_CTL_BASE,                         // UINT64 CntBaseX
> >> +      FVP_GT_BLOCK_FRAME1_CTL_EL0_BASE,                     // UINT64 CntEL0BaseX
> >> +      FVP_GT_BLOCK_FRAME1_GSIV,                             // UINT32 GTxPhysicalTimerGSIV
> >> +      FVP_GTX_TIMER_FLAGS,                                  // UINT32 GTxPhysicalTimerFlags
> >> +      0,                                                    // UINT32 GTxVirtualTimerGSIV
> >> +      0,                                                    // UINT32 GTxVirtualTimerFlags
> >> +      FVP_GTX_COMMON_FLAGS                                  // UINT32 GTxCommonFlags
> >> +    }
> >> +  },
> >> +  {
> >> +    {
> >> +      EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG,                // UINT8 Type
> >> +      sizeof(EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE), // UINT16 Length
> >> +      EFI_ACPI_RESERVED_BYTE,                                 // UINT8 Reserved
> >> +      FVP_SBSA_WATCHDOG_REFRESH_BASE,                         // UINT64 RefreshFramePhysicalAddress
> >> +      FVP_SBSA_WATCHDOG_CONTROL_BASE,                         // UINT64 WatchdogControlFramePhysicalAddress
> >> +      FVP_SBSA_WATCHDOG_GSIV,                                 // UINT32 WatchdogTimerGSIV
> >> +      FVP_SBSA_WATCHDOG_FLAGS                                 // UINT32 WatchdogTimerFlags
> >>      }
> >>    }
> >>  };
> >> --
> >> 2.5.5
> >>
> 
> 
> 
> --
> Best regards,
> 
> Fu Wei
> Software Engineer
> Red Hat
> IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.

Dear all,

May I ask the background to switch timer from system register access to 
memory mapped access? Is it a requirement for ARM platforms to support 
memory mapped timer?

Regards,

Heyi Guo (Gary)


在 1/26/2017 4:30 AM, Leif Lindholm 写道:
> On Wed, Jan 25, 2017 at 05:18:01PM +0000, Alexei Fedorov wrote:
>> Looks OK for me.
> Thanks, Alexei. I'll take that as a Reviewed-by:.
>
> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
> Pushed as cec1666e.
>
>> -----Original Message-----
>> From: Fu Wei [mailto:fu.wei@linaro.org]
>> Sent: 25 January 2017 12:00
>> To: Leif Lindholm; Mark Rutland
>> Cc: ard.biesheuvel@linaro.org; Linaro UEFI Mailman List; Linaro ACPI Mailman List; ryan.harkin@linaro.org; graeme.gregory@linaro.org; Al Stone; hanjun.guo@linaro.org; Alexei Fedorov; Marc Zyngier
>> Subject: Re: [PATCH v2] Platforms/ARM: fix gtdt.asl for VExpressPkg
>>
>> Hi Alexei, Leif,
>>
>> Add Mark and  Marc in the cc list.
>>
>> On 25 January 2017 at 19:42, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>>> Hi Fu Wei,
>>>
>>> Sorry to have dropped this one, but...
>>> You generated this v2 based on comments from Alexei, so you should
>>> have cc:d him. I will have been waiting for his Reviewed-by.
>> Sorry, I should update my git-send-email shell script :-)
>>
>> There is a question below, would you mind to have a look ?
>>
>>> Regards,
>>>
>>> Leif
>>>
>>> On Tue, Aug 23, 2016 at 07:36:27PM +0800, fu.wei@linaro.org wrote:
>>>> From: Fu Wei <fu.wei@linaro.org>
>>>>
>>>> Add Memory-mapped GT and SBSA Generic Watchdog timer info base on
>>>> Foundation Model.
>>>>
>>>> Contributed-under: TianoCore Contribution Agreement 1.0
>>>> Signed-off-by: Fu Wei <fu.wei@linaro.org>
>>>> ---
>>>> Changelog:
>>>> v2: Fix a inappropriate definition:
>>>>      GTDT_TIMER_SECURE --> GTDT_TIMER_SAVE_CONTEXT
>>>>
>>>> v1: The first upstreaming version:
>>>> https://lists.linaro.org/pipermail/linaro-uefi/2016-July/002230.html
>>>>
>>>>   Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc | 128
>>>> ++++++++++++++++++++++------
>>>>   1 file changed, 101 insertions(+), 27 deletions(-)
>>>>
>>>> diff --git a/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
>>>> b/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
>>>> index 142249f..fc8f91f 100644
>>>> --- a/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
>>>> +++ b/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
>>>> @@ -19,21 +19,70 @@
>>>>   #include <Library/PcdLib.h>
>>>>   #include <IndustryStandard/Acpi61.h>
>>>>
>>>> -#define SECURE_TIMER_EL1_GSIV       0x1D
>>>> -#define NON_SECURE_TIMER_EL1_GSIV   0x1E
>>>> -#define VIRTUAL_TIMER_GSIV          0x1B
>>>> -#define NON_SECURE_EL2_GSIV         0x1A
>>>> +#define FVP_SYSTEM_TIMER_BASE_ADDRESS   0x000000002a430000
>>>> +#define FVP_CNT_READ_BASE_ADDRESS       0x000000002a800000
>>>>
>>>> -#define GT_BLOCK_CTL_BASE           0x000000002A810000
>>>> -#define GT_BLOCK_FRAME1_CTL_BASE    0x000000002A820000
>>>> -#define GT_BLOCK_FRAME1_GSIV        0x29
>>>> +#define FVP_SECURE_TIMER_EL1_GSIV       0x1D
>>>> +#define FVP_NON_SECURE_TIMER_EL1_GSIV   0x1E
>>>> +#define FVP_VIRTUAL_TIMER_GSIV          0x1B
>>>> +#define FVP_NON_SECURE_EL2_GSIV         0x1A
>>>> +
>>>> +#define GTDT_TIMER_EDGE_TRIGGERED   EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE
>>>> +#define GTDT_TIMER_LEVEL_TRIGGERED  0
>>>> +#define GTDT_TIMER_ACTIVE_LOW       EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
>>>> +#define GTDT_TIMER_ACTIVE_HIGH      0
>>>> +#define GTDT_TIMER_SAVE_CONTEXT     EFI_ACPI_6_1_GTDT_TIMER_FLAG_ALWAYS_ON_CAPABILITY
>>>> +#define GTDT_TIMER_LOSE_CONTEXT     0
>>>> +
>>>> +#define FVP_GTDT_GTIMER_FLAGS       (GTDT_TIMER_LOSE_CONTEXT | GTDT_TIMER_ACTIVE_HIGH | GTDT_TIMER_EDGE_TRIGGERED)
>>>> +
>>>> +#define FVP_PLATFORM_TIMER_COUNT    2
>>>> +#define FVP_TIMER_FRAMES_COUNT      2
>>>> +#define FVP_WATCHDOG_COUNT          1
>>>> +
>>>> +#define FVP_GT_BLOCK_CTL_BASE           0x000000002A810000
>>>> +#define FVP_GT_BLOCK_FRAME0_CTL_BASE    0x000000002A820000
>>>> +#define FVP_GT_BLOCK_FRAME0_CTL_EL0_BASE  0xFFFFFFFFFFFFFFFF
>>>> +#define FVP_GT_BLOCK_FRAME0_GSIV        0x39
>>>> +
>>>> +#define FVP_GT_BLOCK_FRAME1_CTL_BASE    0x000000002A830000
>>>> +#define FVP_GT_BLOCK_FRAME1_CTL_EL0_BASE  0xFFFFFFFFFFFFFFFF
>>>> +#define FVP_GT_BLOCK_FRAME1_GSIV        0x3A
>>>> +
>>>> +#define GTX_TIMER_EDGE_TRIGGERED    EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_FLAG_TIMER_INTERRUPT_MODE
>>>> +#define GTX_TIMER_LEVEL_TRIGGERED   0
>>>> +#define GTX_TIMER_ACTIVE_LOW        EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
>>>> +#define GTX_TIMER_ACTIVE_HIGH       0
>>>> +
>>>> +#define FVP_GTX_TIMER_FLAGS         (GTX_TIMER_ACTIVE_HIGH | GTX_TIMER_LEVEL_TRIGGERED)
>>>> +
>>>> +#define GTX_TIMER_SECURE            EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_SECURE_TIMER
>>>> +#define GTX_TIMER_NON_SECURE        0
>>>> +#define GTX_TIMER_SAVE_CONTEXT      EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_ALWAYS_ON_CAPABILITY
>>>> +#define GTX_TIMER_LOSE_CONTEXT      0
>>>> +
>>>> +#define FVP_GTX_COMMON_FLAGS        (GTX_TIMER_SAVE_CONTEXT | GTX_TIMER_SECURE)
>> For this GTX_TIMER_SECURE, the timer frames of FM:
>>
>> AP_REFCLK CNTBase0, Generic Timer   S
>> AP_REFCLK CNTBase1, Generic Timer   S/NS
>> (From ARM v8-A Foundation Platform User Guide)
>>
>> Dose it means the timer frame 0 is SECURE , and the timer frame 1 is NON_SECURE?
>>
>> And because Linux kernel is running on Non-secure EL1, so should we skip SECURE timer in Linux?
>>
>> ,
>>>> +
>>>> +#define FVP_SBSA_WATCHDOG_REFRESH_BASE     0x000000002a450000
>>>> +#define FVP_SBSA_WATCHDOG_CONTROL_BASE     0x000000002a440000
>>>> +#define FVP_SBSA_WATCHDOG_GSIV             0x3B
>>>> +
>>>> +#define SBSA_WATCHDOG_EDGE_TRIGGERED   EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_MODE
>>>> +#define SBSA_WATCHDOG_LEVEL_TRIGGERED  0
>>>> +#define SBSA_WATCHDOG_ACTIVE_LOW       EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_POLARITY
>>>> +#define SBSA_WATCHDOG_ACTIVE_HIGH      0
>>>> +#define SBSA_WATCHDOG_SECURE           EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER
>>>> +#define SBSA_WATCHDOG_NON_SECURE       0
>>>> +
>>>> +#define FVP_SBSA_WATCHDOG_FLAGS            (SBSA_WATCHDOG_NON_SECURE | SBSA_WATCHDOG_ACTIVE_HIGH | SBSA_WATCHDOG_LEVEL_TRIGGERED)
>>>>
>>>>   #pragma pack (1)
>>>>
>>>>   typedef struct {
>>>>     EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE          Gtdt;
>>>>     EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE                  GtBlock;
>>>> -  EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE            Frames[1];
>>>> +  EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE            Frames[FVP_TIMER_FRAMES_COUNT];
>>>> +  EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE     Watchdogs[FVP_WATCHDOG_COUNT];
>>>>   } FVP_GENERIC_TIMER_DESCRIPTION_TABLES;
>>>>
>>>>   #pragma pack ()
>>>> @@ -45,27 +94,28 @@ FVP_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {
>>>>         FVP_GENERIC_TIMER_DESCRIPTION_TABLES,
>>>>         EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION
>>>>       ),
>>>> -    0xFFFFFFFFFFFFFFFF,                                   // UINT64  PhysicalAddress
>>>> +    FVP_SYSTEM_TIMER_BASE_ADDRESS,                        // UINT64  PhysicalAddress
>>>>       EFI_ACPI_RESERVED_DWORD,                              // UINT32  Reserved
>>>> -    SECURE_TIMER_EL1_GSIV,                                // UINT32  SecurePL1TimerGSIV
>>>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  SecurePL1TimerFlags
>>>> -    NON_SECURE_TIMER_EL1_GSIV,                            // UINT32  NonSecurePL1TimerGSIV
>>>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  NonSecurePL1TimerFlags
>>>> -    VIRTUAL_TIMER_GSIV,                                   // UINT32  VirtualTimerGSIV
>>>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  VirtualTimerFlags
>>>> -    NON_SECURE_EL2_GSIV,                                  // UINT32  NonSecurePL2TimerGSIV
>>>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  NonSecurePL2TimerFlags
>>>> -    0xFFFFFFFFFFFFFFFF,                                   // UINT64  CntReadBasePhysicalAddress
>>>> -    1,                                                    // UINT32  PlatformTimerCount
>>>> +    FVP_SECURE_TIMER_EL1_GSIV,                            // UINT32  SecurePL1TimerGSIV
>>>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  SecurePL1TimerFlags
>>>> +    FVP_NON_SECURE_TIMER_EL1_GSIV,                        // UINT32  NonSecurePL1TimerGSIV
>>>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  NonSecurePL1TimerFlags
>>>> +    FVP_VIRTUAL_TIMER_GSIV,                               // UINT32  VirtualTimerGSIV
>>>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  VirtualTimerFlags
>>>> +    FVP_NON_SECURE_EL2_GSIV,                              // UINT32  NonSecurePL2TimerGSIV
>>>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  NonSecurePL2TimerFlags
>>>> +    FVP_CNT_READ_BASE_ADDRESS,                            // UINT64  CntReadBasePhysicalAddress
>>>> +    FVP_PLATFORM_TIMER_COUNT,                             // UINT32  PlatformTimerCount
>>>>       sizeof (EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE) // UINT32  PlatfromTimerOffset
>>>>     },
>>>>     {
>>>>       EFI_ACPI_6_1_GTDT_GT_BLOCK,                           // UINT8 Type
>>>>       sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE)          // UINT16 Length
>>>> -      + sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE),
>>>> +      + sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE) *
>>>> +        FVP_TIMER_FRAMES_COUNT,
>>>>       EFI_ACPI_RESERVED_BYTE,                               // UINT8 Reserved
>>>> -    GT_BLOCK_CTL_BASE,                                   // UINT64 CntCtlBase
>>>> -    1,                                                    // UINT32 GTBlockTimerCount
>>>> +    FVP_GT_BLOCK_CTL_BASE,                                // UINT64 CntCtlBase
>>>> +    FVP_TIMER_FRAMES_COUNT,                               // UINT32 GTBlockTimerCount
>>>>       sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE)          // UINT32 GTBlockTimerOffset
>>>>     },
>>>>     {
>>>> @@ -74,13 +124,37 @@ FVP_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {
>>>>         {EFI_ACPI_RESERVED_BYTE,
>>>>          EFI_ACPI_RESERVED_BYTE,
>>>>          EFI_ACPI_RESERVED_BYTE},                             // UINT8 Reserved[3]
>>>> -      GT_BLOCK_FRAME1_CTL_BASE,                             // UINT64 CntBaseX
>>>> -      0xFFFFFFFFFFFFFFFF,                                   // UINT64 CntEL0BaseX
>>>> -      GT_BLOCK_FRAME1_GSIV,                                 // UINT32 GTxPhysicalTimerGSIV
>>>> -      0,                                                    // UINT32 GTxPhysicalTimerFlags
>>>> +      FVP_GT_BLOCK_FRAME0_CTL_BASE,                         // UINT64 CntBaseX
>>>> +      FVP_GT_BLOCK_FRAME0_CTL_EL0_BASE,                     // UINT64 CntEL0BaseX
>>>> +      FVP_GT_BLOCK_FRAME0_GSIV,                             // UINT32 GTxPhysicalTimerGSIV
>>>> +      FVP_GTX_TIMER_FLAGS,                                  // UINT32 GTxPhysicalTimerFlags
>>>>         0,                                                    // UINT32 GTxVirtualTimerGSIV
>>>>         0,                                                    // UINT32 GTxVirtualTimerFlags
>>>> -      0                                                     // UINT32 GTxCommonFlags
>>>> +      FVP_GTX_COMMON_FLAGS                                  // UINT32 GTxCommonFlags
>>>> +    },
>>>> +    {
>>>> +      1,                                                    // UINT8 GTFrameNumber
>>>> +      {EFI_ACPI_RESERVED_BYTE,
>>>> +       EFI_ACPI_RESERVED_BYTE,
>>>> +       EFI_ACPI_RESERVED_BYTE},                             // UINT8 Reserved[3]
>>>> +      FVP_GT_BLOCK_FRAME1_CTL_BASE,                         // UINT64 CntBaseX
>>>> +      FVP_GT_BLOCK_FRAME1_CTL_EL0_BASE,                     // UINT64 CntEL0BaseX
>>>> +      FVP_GT_BLOCK_FRAME1_GSIV,                             // UINT32 GTxPhysicalTimerGSIV
>>>> +      FVP_GTX_TIMER_FLAGS,                                  // UINT32 GTxPhysicalTimerFlags
>>>> +      0,                                                    // UINT32 GTxVirtualTimerGSIV
>>>> +      0,                                                    // UINT32 GTxVirtualTimerFlags
>>>> +      FVP_GTX_COMMON_FLAGS                                  // UINT32 GTxCommonFlags
>>>> +    }
>>>> +  },
>>>> +  {
>>>> +    {
>>>> +      EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG,                // UINT8 Type
>>>> +      sizeof(EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE), // UINT16 Length
>>>> +      EFI_ACPI_RESERVED_BYTE,                                 // UINT8 Reserved
>>>> +      FVP_SBSA_WATCHDOG_REFRESH_BASE,                         // UINT64 RefreshFramePhysicalAddress
>>>> +      FVP_SBSA_WATCHDOG_CONTROL_BASE,                         // UINT64 WatchdogControlFramePhysicalAddress
>>>> +      FVP_SBSA_WATCHDOG_GSIV,                                 // UINT32 WatchdogTimerGSIV
>>>> +      FVP_SBSA_WATCHDOG_FLAGS                                 // UINT32 WatchdogTimerFlags
>>>>       }
>>>>     }
>>>>   };
>>>> --
>>>> 2.5.5
>>>>
>>
>>
>> --
>> Best regards,
>>
>> Fu Wei
>> Software Engineer
>> Red Hat
>> IMPORTANT NOTICE: The contents of this email and any attachments are confidential and may also be privileged. If you are not the intended recipient, please notify the sender immediately and do not disclose the contents to any other person, use it for any purpose, or store or copy the information in any medium. Thank you.
> _______________________________________________
> Linaro-acpi mailing list
> Linaro-acpi@lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/linaro-acpi

Hi Heyi,

On 26 January 2017 at 09:26, Heyi Guo <heyi.guo@linaro.org> wrote:
> Dear all,
>
> May I ask the background to switch timer from system register access to
> memory mapped access? Is it a requirement for ARM platforms to support
> memory mapped timer?

It's not "switch",  we are just adding the missed info about Generic
Timer for Foundation Model.

I am upstreaming GTDT support , you may can get some info from here:

https://lkml.org/lkml/2017/1/18/534

>
> Regards,
>
> Heyi Guo (Gary)
>
>
>
> 在 1/26/2017 4:30 AM, Leif Lindholm 写道:
>>
>> On Wed, Jan 25, 2017 at 05:18:01PM +0000, Alexei Fedorov wrote:
>>>
>>> Looks OK for me.
>>
>> Thanks, Alexei. I'll take that as a Reviewed-by:.
>>
>> Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
>> Pushed as cec1666e.
>>
>>> -----Original Message-----
>>> From: Fu Wei [mailto:fu.wei@linaro.org]
>>> Sent: 25 January 2017 12:00
>>> To: Leif Lindholm; Mark Rutland
>>> Cc: ard.biesheuvel@linaro.org; Linaro UEFI Mailman List; Linaro ACPI
>>> Mailman List; ryan.harkin@linaro.org; graeme.gregory@linaro.org; Al Stone;
>>> hanjun.guo@linaro.org; Alexei Fedorov; Marc Zyngier
>>> Subject: Re: [PATCH v2] Platforms/ARM: fix gtdt.asl for VExpressPkg
>>>
>>> Hi Alexei, Leif,
>>>
>>> Add Mark and  Marc in the cc list.
>>>
>>> On 25 January 2017 at 19:42, Leif Lindholm <leif.lindholm@linaro.org>
>>> wrote:
>>>>
>>>> Hi Fu Wei,
>>>>
>>>> Sorry to have dropped this one, but...
>>>> You generated this v2 based on comments from Alexei, so you should
>>>> have cc:d him. I will have been waiting for his Reviewed-by.
>>>
>>> Sorry, I should update my git-send-email shell script :-)
>>>
>>> There is a question below, would you mind to have a look ?
>>>
>>>> Regards,
>>>>
>>>> Leif
>>>>
>>>> On Tue, Aug 23, 2016 at 07:36:27PM +0800, fu.wei@linaro.org wrote:
>>>>>
>>>>> From: Fu Wei <fu.wei@linaro.org>
>>>>>
>>>>> Add Memory-mapped GT and SBSA Generic Watchdog timer info base on
>>>>> Foundation Model.
>>>>>
>>>>> Contributed-under: TianoCore Contribution Agreement 1.0
>>>>> Signed-off-by: Fu Wei <fu.wei@linaro.org>
>>>>> ---
>>>>> Changelog:
>>>>> v2: Fix a inappropriate definition:
>>>>>      GTDT_TIMER_SECURE --> GTDT_TIMER_SAVE_CONTEXT
>>>>>
>>>>> v1: The first upstreaming version:
>>>>> https://lists.linaro.org/pipermail/linaro-uefi/2016-July/002230.html
>>>>>
>>>>>   Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc | 128
>>>>> ++++++++++++++++++++++------
>>>>>   1 file changed, 101 insertions(+), 27 deletions(-)
>>>>>
>>>>> diff --git a/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
>>>>> b/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
>>>>> index 142249f..fc8f91f 100644
>>>>> --- a/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
>>>>> +++ b/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
>>>>> @@ -19,21 +19,70 @@
>>>>>   #include <Library/PcdLib.h>
>>>>>   #include <IndustryStandard/Acpi61.h>
>>>>>
>>>>> -#define SECURE_TIMER_EL1_GSIV       0x1D
>>>>> -#define NON_SECURE_TIMER_EL1_GSIV   0x1E
>>>>> -#define VIRTUAL_TIMER_GSIV          0x1B
>>>>> -#define NON_SECURE_EL2_GSIV         0x1A
>>>>> +#define FVP_SYSTEM_TIMER_BASE_ADDRESS   0x000000002a430000
>>>>> +#define FVP_CNT_READ_BASE_ADDRESS       0x000000002a800000
>>>>>
>>>>> -#define GT_BLOCK_CTL_BASE           0x000000002A810000
>>>>> -#define GT_BLOCK_FRAME1_CTL_BASE    0x000000002A820000
>>>>> -#define GT_BLOCK_FRAME1_GSIV        0x29
>>>>> +#define FVP_SECURE_TIMER_EL1_GSIV       0x1D
>>>>> +#define FVP_NON_SECURE_TIMER_EL1_GSIV   0x1E
>>>>> +#define FVP_VIRTUAL_TIMER_GSIV          0x1B
>>>>> +#define FVP_NON_SECURE_EL2_GSIV         0x1A
>>>>> +
>>>>> +#define GTDT_TIMER_EDGE_TRIGGERED
>>>>> EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE
>>>>> +#define GTDT_TIMER_LEVEL_TRIGGERED  0
>>>>> +#define GTDT_TIMER_ACTIVE_LOW
>>>>> EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
>>>>> +#define GTDT_TIMER_ACTIVE_HIGH      0
>>>>> +#define GTDT_TIMER_SAVE_CONTEXT
>>>>> EFI_ACPI_6_1_GTDT_TIMER_FLAG_ALWAYS_ON_CAPABILITY
>>>>> +#define GTDT_TIMER_LOSE_CONTEXT     0
>>>>> +
>>>>> +#define FVP_GTDT_GTIMER_FLAGS       (GTDT_TIMER_LOSE_CONTEXT |
>>>>> GTDT_TIMER_ACTIVE_HIGH | GTDT_TIMER_EDGE_TRIGGERED)
>>>>> +
>>>>> +#define FVP_PLATFORM_TIMER_COUNT    2
>>>>> +#define FVP_TIMER_FRAMES_COUNT      2
>>>>> +#define FVP_WATCHDOG_COUNT          1
>>>>> +
>>>>> +#define FVP_GT_BLOCK_CTL_BASE           0x000000002A810000
>>>>> +#define FVP_GT_BLOCK_FRAME0_CTL_BASE    0x000000002A820000
>>>>> +#define FVP_GT_BLOCK_FRAME0_CTL_EL0_BASE  0xFFFFFFFFFFFFFFFF
>>>>> +#define FVP_GT_BLOCK_FRAME0_GSIV        0x39
>>>>> +
>>>>> +#define FVP_GT_BLOCK_FRAME1_CTL_BASE    0x000000002A830000
>>>>> +#define FVP_GT_BLOCK_FRAME1_CTL_EL0_BASE  0xFFFFFFFFFFFFFFFF
>>>>> +#define FVP_GT_BLOCK_FRAME1_GSIV        0x3A
>>>>> +
>>>>> +#define GTX_TIMER_EDGE_TRIGGERED
>>>>> EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_FLAG_TIMER_INTERRUPT_MODE
>>>>> +#define GTX_TIMER_LEVEL_TRIGGERED   0
>>>>> +#define GTX_TIMER_ACTIVE_LOW
>>>>> EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
>>>>> +#define GTX_TIMER_ACTIVE_HIGH       0
>>>>> +
>>>>> +#define FVP_GTX_TIMER_FLAGS         (GTX_TIMER_ACTIVE_HIGH |
>>>>> GTX_TIMER_LEVEL_TRIGGERED)
>>>>> +
>>>>> +#define GTX_TIMER_SECURE
>>>>> EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_SECURE_TIMER
>>>>> +#define GTX_TIMER_NON_SECURE        0
>>>>> +#define GTX_TIMER_SAVE_CONTEXT
>>>>> EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_ALWAYS_ON_CAPABILITY
>>>>> +#define GTX_TIMER_LOSE_CONTEXT      0
>>>>> +
>>>>> +#define FVP_GTX_COMMON_FLAGS        (GTX_TIMER_SAVE_CONTEXT |
>>>>> GTX_TIMER_SECURE)
>>>
>>> For this GTX_TIMER_SECURE, the timer frames of FM:
>>>
>>> AP_REFCLK CNTBase0, Generic Timer   S
>>> AP_REFCLK CNTBase1, Generic Timer   S/NS
>>> (From ARM v8-A Foundation Platform User Guide)
>>>
>>> Dose it means the timer frame 0 is SECURE , and the timer frame 1 is
>>> NON_SECURE?
>>>
>>> And because Linux kernel is running on Non-secure EL1, so should we skip
>>> SECURE timer in Linux?
>>>
>>> ,
>>>>>
>>>>> +
>>>>> +#define FVP_SBSA_WATCHDOG_REFRESH_BASE     0x000000002a450000
>>>>> +#define FVP_SBSA_WATCHDOG_CONTROL_BASE     0x000000002a440000
>>>>> +#define FVP_SBSA_WATCHDOG_GSIV             0x3B
>>>>> +
>>>>> +#define SBSA_WATCHDOG_EDGE_TRIGGERED
>>>>> EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_MODE
>>>>> +#define SBSA_WATCHDOG_LEVEL_TRIGGERED  0
>>>>> +#define SBSA_WATCHDOG_ACTIVE_LOW
>>>>> EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_POLARITY
>>>>> +#define SBSA_WATCHDOG_ACTIVE_HIGH      0
>>>>> +#define SBSA_WATCHDOG_SECURE
>>>>> EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER
>>>>> +#define SBSA_WATCHDOG_NON_SECURE       0
>>>>> +
>>>>> +#define FVP_SBSA_WATCHDOG_FLAGS            (SBSA_WATCHDOG_NON_SECURE |
>>>>> SBSA_WATCHDOG_ACTIVE_HIGH | SBSA_WATCHDOG_LEVEL_TRIGGERED)
>>>>>
>>>>>   #pragma pack (1)
>>>>>
>>>>>   typedef struct {
>>>>>     EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE          Gtdt;
>>>>>     EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE                  GtBlock;
>>>>> -  EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE            Frames[1];
>>>>> +  EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE
>>>>> Frames[FVP_TIMER_FRAMES_COUNT];
>>>>> +  EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE
>>>>> Watchdogs[FVP_WATCHDOG_COUNT];
>>>>>   } FVP_GENERIC_TIMER_DESCRIPTION_TABLES;
>>>>>
>>>>>   #pragma pack ()
>>>>> @@ -45,27 +94,28 @@ FVP_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {
>>>>>         FVP_GENERIC_TIMER_DESCRIPTION_TABLES,
>>>>>         EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION
>>>>>       ),
>>>>> -    0xFFFFFFFFFFFFFFFF,                                   // UINT64
>>>>> PhysicalAddress
>>>>> +    FVP_SYSTEM_TIMER_BASE_ADDRESS,                        // UINT64
>>>>> PhysicalAddress
>>>>>       EFI_ACPI_RESERVED_DWORD,                              // UINT32
>>>>> Reserved
>>>>> -    SECURE_TIMER_EL1_GSIV,                                // UINT32
>>>>> SecurePL1TimerGSIV
>>>>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32
>>>>> SecurePL1TimerFlags
>>>>> -    NON_SECURE_TIMER_EL1_GSIV,                            // UINT32
>>>>> NonSecurePL1TimerGSIV
>>>>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32
>>>>> NonSecurePL1TimerFlags
>>>>> -    VIRTUAL_TIMER_GSIV,                                   // UINT32
>>>>> VirtualTimerGSIV
>>>>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32
>>>>> VirtualTimerFlags
>>>>> -    NON_SECURE_EL2_GSIV,                                  // UINT32
>>>>> NonSecurePL2TimerGSIV
>>>>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32
>>>>> NonSecurePL2TimerFlags
>>>>> -    0xFFFFFFFFFFFFFFFF,                                   // UINT64
>>>>> CntReadBasePhysicalAddress
>>>>> -    1,                                                    // UINT32
>>>>> PlatformTimerCount
>>>>> +    FVP_SECURE_TIMER_EL1_GSIV,                            // UINT32
>>>>> SecurePL1TimerGSIV
>>>>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32
>>>>> SecurePL1TimerFlags
>>>>> +    FVP_NON_SECURE_TIMER_EL1_GSIV,                        // UINT32
>>>>> NonSecurePL1TimerGSIV
>>>>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32
>>>>> NonSecurePL1TimerFlags
>>>>> +    FVP_VIRTUAL_TIMER_GSIV,                               // UINT32
>>>>> VirtualTimerGSIV
>>>>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32
>>>>> VirtualTimerFlags
>>>>> +    FVP_NON_SECURE_EL2_GSIV,                              // UINT32
>>>>> NonSecurePL2TimerGSIV
>>>>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32
>>>>> NonSecurePL2TimerFlags
>>>>> +    FVP_CNT_READ_BASE_ADDRESS,                            // UINT64
>>>>> CntReadBasePhysicalAddress
>>>>> +    FVP_PLATFORM_TIMER_COUNT,                             // UINT32
>>>>> PlatformTimerCount
>>>>>       sizeof (EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE) // UINT32
>>>>> PlatfromTimerOffset
>>>>>     },
>>>>>     {
>>>>>       EFI_ACPI_6_1_GTDT_GT_BLOCK,                           // UINT8
>>>>> Type
>>>>>       sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE)          // UINT16
>>>>> Length
>>>>> -      + sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE),
>>>>> +      + sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE) *
>>>>> +        FVP_TIMER_FRAMES_COUNT,
>>>>>       EFI_ACPI_RESERVED_BYTE,                               // UINT8
>>>>> Reserved
>>>>> -    GT_BLOCK_CTL_BASE,                                   // UINT64
>>>>> CntCtlBase
>>>>> -    1,                                                    // UINT32
>>>>> GTBlockTimerCount
>>>>> +    FVP_GT_BLOCK_CTL_BASE,                                // UINT64
>>>>> CntCtlBase
>>>>> +    FVP_TIMER_FRAMES_COUNT,                               // UINT32
>>>>> GTBlockTimerCount
>>>>>       sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE)          // UINT32
>>>>> GTBlockTimerOffset
>>>>>     },
>>>>>     {
>>>>> @@ -74,13 +124,37 @@ FVP_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {
>>>>>         {EFI_ACPI_RESERVED_BYTE,
>>>>>          EFI_ACPI_RESERVED_BYTE,
>>>>>          EFI_ACPI_RESERVED_BYTE},                             // UINT8
>>>>> Reserved[3]
>>>>> -      GT_BLOCK_FRAME1_CTL_BASE,                             // UINT64
>>>>> CntBaseX
>>>>> -      0xFFFFFFFFFFFFFFFF,                                   // UINT64
>>>>> CntEL0BaseX
>>>>> -      GT_BLOCK_FRAME1_GSIV,                                 // UINT32
>>>>> GTxPhysicalTimerGSIV
>>>>> -      0,                                                    // UINT32
>>>>> GTxPhysicalTimerFlags
>>>>> +      FVP_GT_BLOCK_FRAME0_CTL_BASE,                         // UINT64
>>>>> CntBaseX
>>>>> +      FVP_GT_BLOCK_FRAME0_CTL_EL0_BASE,                     // UINT64
>>>>> CntEL0BaseX
>>>>> +      FVP_GT_BLOCK_FRAME0_GSIV,                             // UINT32
>>>>> GTxPhysicalTimerGSIV
>>>>> +      FVP_GTX_TIMER_FLAGS,                                  // UINT32
>>>>> GTxPhysicalTimerFlags
>>>>>         0,                                                    // UINT32
>>>>> GTxVirtualTimerGSIV
>>>>>         0,                                                    // UINT32
>>>>> GTxVirtualTimerFlags
>>>>> -      0                                                     // UINT32
>>>>> GTxCommonFlags
>>>>> +      FVP_GTX_COMMON_FLAGS                                  // UINT32
>>>>> GTxCommonFlags
>>>>> +    },
>>>>> +    {
>>>>> +      1,                                                    // UINT8
>>>>> GTFrameNumber
>>>>> +      {EFI_ACPI_RESERVED_BYTE,
>>>>> +       EFI_ACPI_RESERVED_BYTE,
>>>>> +       EFI_ACPI_RESERVED_BYTE},                             // UINT8
>>>>> Reserved[3]
>>>>> +      FVP_GT_BLOCK_FRAME1_CTL_BASE,                         // UINT64
>>>>> CntBaseX
>>>>> +      FVP_GT_BLOCK_FRAME1_CTL_EL0_BASE,                     // UINT64
>>>>> CntEL0BaseX
>>>>> +      FVP_GT_BLOCK_FRAME1_GSIV,                             // UINT32
>>>>> GTxPhysicalTimerGSIV
>>>>> +      FVP_GTX_TIMER_FLAGS,                                  // UINT32
>>>>> GTxPhysicalTimerFlags
>>>>> +      0,                                                    // UINT32
>>>>> GTxVirtualTimerGSIV
>>>>> +      0,                                                    // UINT32
>>>>> GTxVirtualTimerFlags
>>>>> +      FVP_GTX_COMMON_FLAGS                                  // UINT32
>>>>> GTxCommonFlags
>>>>> +    }
>>>>> +  },
>>>>> +  {
>>>>> +    {
>>>>> +      EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG,                // UINT8
>>>>> Type
>>>>> +      sizeof(EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE), //
>>>>> UINT16 Length
>>>>> +      EFI_ACPI_RESERVED_BYTE,                                 // UINT8
>>>>> Reserved
>>>>> +      FVP_SBSA_WATCHDOG_REFRESH_BASE,                         //
>>>>> UINT64 RefreshFramePhysicalAddress
>>>>> +      FVP_SBSA_WATCHDOG_CONTROL_BASE,                         //
>>>>> UINT64 WatchdogControlFramePhysicalAddress
>>>>> +      FVP_SBSA_WATCHDOG_GSIV,                                 //
>>>>> UINT32 WatchdogTimerGSIV
>>>>> +      FVP_SBSA_WATCHDOG_FLAGS                                 //
>>>>> UINT32 WatchdogTimerFlags
>>>>>       }
>>>>>     }
>>>>>   };
>>>>> --
>>>>> 2.5.5
>>>>>
>>>
>>>
>>> --
>>> Best regards,
>>>
>>> Fu Wei
>>> Software Engineer
>>> Red Hat
>>> IMPORTANT NOTICE: The contents of this email and any attachments are
>>> confidential and may also be privileged. If you are not the intended
>>> recipient, please notify the sender immediately and do not disclose the
>>> contents to any other person, use it for any purpose, or store or copy the
>>> information in any medium. Thank you.
>>
>> _______________________________________________
>> Linaro-acpi mailing list
>> Linaro-acpi@lists.linaro.org
>> https://lists.linaro.org/mailman/listinfo/linaro-acpi
>
>
> _______________________________________________
> Linaro-acpi mailing list
> Linaro-acpi@lists.linaro.org
> https://lists.linaro.org/mailman/listinfo/linaro-acpi

Hi Alexei, Leif, Mark, Marc,

On 25 January 2017 at 20:00, Fu Wei <fu.wei@linaro.org> wrote:
> Hi Alexei, Leif,
>
> Add Mark and  Marc in the cc list.
>
> On 25 January 2017 at 19:42, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>> Hi Fu Wei,
>>
>> Sorry to have dropped this one, but...
>> You generated this v2 based on comments from Alexei, so you should
>> have cc:d him. I will have been waiting for his Reviewed-by.
>
> Sorry, I should update my git-send-email shell script :-)
>
> There is a question below, would you mind to have a look ?
>
>>
>> Regards,
>>
>> Leif
>>
>> On Tue, Aug 23, 2016 at 07:36:27PM +0800, fu.wei@linaro.org wrote:
>>> From: Fu Wei <fu.wei@linaro.org>
>>>
>>> Add Memory-mapped GT and SBSA Generic Watchdog timer info
>>> base on Foundation Model.
>>>
>>> Contributed-under: TianoCore Contribution Agreement 1.0
>>> Signed-off-by: Fu Wei <fu.wei@linaro.org>
>>> ---
>>> Changelog:
>>> v2: Fix a inappropriate definition:
>>>     GTDT_TIMER_SECURE --> GTDT_TIMER_SAVE_CONTEXT
>>>
>>> v1: The first upstreaming version: https://lists.linaro.org/pipermail/linaro-uefi/2016-July/002230.html
>>>
>>>  Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc | 128 ++++++++++++++++++++++------
>>>  1 file changed, 101 insertions(+), 27 deletions(-)
>>>
>>> diff --git a/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc b/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
>>> index 142249f..fc8f91f 100644
>>> --- a/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
>>> +++ b/Platforms/ARM/VExpress/AcpiTables/Gtdt.aslc
>>> @@ -19,21 +19,70 @@
>>>  #include <Library/PcdLib.h>
>>>  #include <IndustryStandard/Acpi61.h>
>>>
>>> -#define SECURE_TIMER_EL1_GSIV       0x1D
>>> -#define NON_SECURE_TIMER_EL1_GSIV   0x1E
>>> -#define VIRTUAL_TIMER_GSIV          0x1B
>>> -#define NON_SECURE_EL2_GSIV         0x1A
>>> +#define FVP_SYSTEM_TIMER_BASE_ADDRESS   0x000000002a430000
>>> +#define FVP_CNT_READ_BASE_ADDRESS       0x000000002a800000
>>>
>>> -#define GT_BLOCK_CTL_BASE           0x000000002A810000
>>> -#define GT_BLOCK_FRAME1_CTL_BASE    0x000000002A820000
>>> -#define GT_BLOCK_FRAME1_GSIV        0x29
>>> +#define FVP_SECURE_TIMER_EL1_GSIV       0x1D
>>> +#define FVP_NON_SECURE_TIMER_EL1_GSIV   0x1E
>>> +#define FVP_VIRTUAL_TIMER_GSIV          0x1B
>>> +#define FVP_NON_SECURE_EL2_GSIV         0x1A
>>> +
>>> +#define GTDT_TIMER_EDGE_TRIGGERED   EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE
>>> +#define GTDT_TIMER_LEVEL_TRIGGERED  0
>>> +#define GTDT_TIMER_ACTIVE_LOW       EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
>>> +#define GTDT_TIMER_ACTIVE_HIGH      0
>>> +#define GTDT_TIMER_SAVE_CONTEXT     EFI_ACPI_6_1_GTDT_TIMER_FLAG_ALWAYS_ON_CAPABILITY
>>> +#define GTDT_TIMER_LOSE_CONTEXT     0
>>> +
>>> +#define FVP_GTDT_GTIMER_FLAGS       (GTDT_TIMER_LOSE_CONTEXT | GTDT_TIMER_ACTIVE_HIGH | GTDT_TIMER_EDGE_TRIGGERED)
>>> +
>>> +#define FVP_PLATFORM_TIMER_COUNT    2
>>> +#define FVP_TIMER_FRAMES_COUNT      2
>>> +#define FVP_WATCHDOG_COUNT          1
>>> +
>>> +#define FVP_GT_BLOCK_CTL_BASE           0x000000002A810000
>>> +#define FVP_GT_BLOCK_FRAME0_CTL_BASE    0x000000002A820000
>>> +#define FVP_GT_BLOCK_FRAME0_CTL_EL0_BASE  0xFFFFFFFFFFFFFFFF
>>> +#define FVP_GT_BLOCK_FRAME0_GSIV        0x39
>>> +
>>> +#define FVP_GT_BLOCK_FRAME1_CTL_BASE    0x000000002A830000
>>> +#define FVP_GT_BLOCK_FRAME1_CTL_EL0_BASE  0xFFFFFFFFFFFFFFFF
>>> +#define FVP_GT_BLOCK_FRAME1_GSIV        0x3A
>>> +
>>> +#define GTX_TIMER_EDGE_TRIGGERED    EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_FLAG_TIMER_INTERRUPT_MODE
>>> +#define GTX_TIMER_LEVEL_TRIGGERED   0
>>> +#define GTX_TIMER_ACTIVE_LOW        EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
>>> +#define GTX_TIMER_ACTIVE_HIGH       0
>>> +
>>> +#define FVP_GTX_TIMER_FLAGS         (GTX_TIMER_ACTIVE_HIGH | GTX_TIMER_LEVEL_TRIGGERED)
>>> +
>>> +#define GTX_TIMER_SECURE            EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_SECURE_TIMER
>>> +#define GTX_TIMER_NON_SECURE        0
>>> +#define GTX_TIMER_SAVE_CONTEXT      EFI_ACPI_6_1_GTDT_GT_BLOCK_COMMON_FLAG_ALWAYS_ON_CAPABILITY
>>> +#define GTX_TIMER_LOSE_CONTEXT      0
>>> +
>>> +#define FVP_GTX_COMMON_FLAGS        (GTX_TIMER_SAVE_CONTEXT | GTX_TIMER_SECURE)
>
> For this GTX_TIMER_SECURE, the timer frames of FM:
>
> AP_REFCLK CNTBase0, Generic Timer   S
> AP_REFCLK CNTBase1, Generic Timer   S/NS
> (From ARM v8-A Foundation Platform User Guide)
>
> Dose it means the timer frame 0 is SECURE , and the timer frame 1 is NON_SECURE?
>
> And because Linux kernel is running on Non-secure EL1, so should we
> skip SECURE timer in Linux?

Can you help me on the question above? Thanks !  :-)

Should we set the timer frame 0 to  (GTX_TIMER_SAVE_CONTEXT | GTX_TIMER_SECURE),
and  the timer frame 1 to  (GTX_TIMER_SAVE_CONTEXT | GTX_TIMER_NON_SECURE)??

>
> ,
>>> +
>>> +#define FVP_SBSA_WATCHDOG_REFRESH_BASE     0x000000002a450000
>>> +#define FVP_SBSA_WATCHDOG_CONTROL_BASE     0x000000002a440000
>>> +#define FVP_SBSA_WATCHDOG_GSIV             0x3B
>>> +
>>> +#define SBSA_WATCHDOG_EDGE_TRIGGERED   EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_MODE
>>> +#define SBSA_WATCHDOG_LEVEL_TRIGGERED  0
>>> +#define SBSA_WATCHDOG_ACTIVE_LOW       EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_POLARITY
>>> +#define SBSA_WATCHDOG_ACTIVE_HIGH      0
>>> +#define SBSA_WATCHDOG_SECURE           EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_SECURE_TIMER
>>> +#define SBSA_WATCHDOG_NON_SECURE       0
>>> +
>>> +#define FVP_SBSA_WATCHDOG_FLAGS            (SBSA_WATCHDOG_NON_SECURE | SBSA_WATCHDOG_ACTIVE_HIGH | SBSA_WATCHDOG_LEVEL_TRIGGERED)
>>>
>>>  #pragma pack (1)
>>>
>>>  typedef struct {
>>>    EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE          Gtdt;
>>>    EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE                  GtBlock;
>>> -  EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE            Frames[1];
>>> +  EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE            Frames[FVP_TIMER_FRAMES_COUNT];
>>> +  EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE     Watchdogs[FVP_WATCHDOG_COUNT];
>>>  } FVP_GENERIC_TIMER_DESCRIPTION_TABLES;
>>>
>>>  #pragma pack ()
>>> @@ -45,27 +94,28 @@ FVP_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {
>>>        FVP_GENERIC_TIMER_DESCRIPTION_TABLES,
>>>        EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION
>>>      ),
>>> -    0xFFFFFFFFFFFFFFFF,                                   // UINT64  PhysicalAddress
>>> +    FVP_SYSTEM_TIMER_BASE_ADDRESS,                        // UINT64  PhysicalAddress
>>>      EFI_ACPI_RESERVED_DWORD,                              // UINT32  Reserved
>>> -    SECURE_TIMER_EL1_GSIV,                                // UINT32  SecurePL1TimerGSIV
>>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  SecurePL1TimerFlags
>>> -    NON_SECURE_TIMER_EL1_GSIV,                            // UINT32  NonSecurePL1TimerGSIV
>>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  NonSecurePL1TimerFlags
>>> -    VIRTUAL_TIMER_GSIV,                                   // UINT32  VirtualTimerGSIV
>>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  VirtualTimerFlags
>>> -    NON_SECURE_EL2_GSIV,                                  // UINT32  NonSecurePL2TimerGSIV
>>> -    EFI_ACPI_6_1_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE,    // UINT32  NonSecurePL2TimerFlags
>>> -    0xFFFFFFFFFFFFFFFF,                                   // UINT64  CntReadBasePhysicalAddress
>>> -    1,                                                    // UINT32  PlatformTimerCount
>>> +    FVP_SECURE_TIMER_EL1_GSIV,                            // UINT32  SecurePL1TimerGSIV
>>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  SecurePL1TimerFlags
>>> +    FVP_NON_SECURE_TIMER_EL1_GSIV,                        // UINT32  NonSecurePL1TimerGSIV
>>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  NonSecurePL1TimerFlags
>>> +    FVP_VIRTUAL_TIMER_GSIV,                               // UINT32  VirtualTimerGSIV
>>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  VirtualTimerFlags
>>> +    FVP_NON_SECURE_EL2_GSIV,                              // UINT32  NonSecurePL2TimerGSIV
>>> +    FVP_GTDT_GTIMER_FLAGS,                                // UINT32  NonSecurePL2TimerFlags
>>> +    FVP_CNT_READ_BASE_ADDRESS,                            // UINT64  CntReadBasePhysicalAddress
>>> +    FVP_PLATFORM_TIMER_COUNT,                             // UINT32  PlatformTimerCount
>>>      sizeof (EFI_ACPI_6_1_GENERIC_TIMER_DESCRIPTION_TABLE) // UINT32  PlatfromTimerOffset
>>>    },
>>>    {
>>>      EFI_ACPI_6_1_GTDT_GT_BLOCK,                           // UINT8 Type
>>>      sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE)          // UINT16 Length
>>> -      + sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE),
>>> +      + sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_TIMER_STRUCTURE) *
>>> +        FVP_TIMER_FRAMES_COUNT,
>>>      EFI_ACPI_RESERVED_BYTE,                               // UINT8 Reserved
>>> -    GT_BLOCK_CTL_BASE,                                   // UINT64 CntCtlBase
>>> -    1,                                                    // UINT32 GTBlockTimerCount
>>> +    FVP_GT_BLOCK_CTL_BASE,                                // UINT64 CntCtlBase
>>> +    FVP_TIMER_FRAMES_COUNT,                               // UINT32 GTBlockTimerCount
>>>      sizeof(EFI_ACPI_6_1_GTDT_GT_BLOCK_STRUCTURE)          // UINT32 GTBlockTimerOffset
>>>    },
>>>    {
>>> @@ -74,13 +124,37 @@ FVP_GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {
>>>        {EFI_ACPI_RESERVED_BYTE,
>>>         EFI_ACPI_RESERVED_BYTE,
>>>         EFI_ACPI_RESERVED_BYTE},                             // UINT8 Reserved[3]
>>> -      GT_BLOCK_FRAME1_CTL_BASE,                             // UINT64 CntBaseX
>>> -      0xFFFFFFFFFFFFFFFF,                                   // UINT64 CntEL0BaseX
>>> -      GT_BLOCK_FRAME1_GSIV,                                 // UINT32 GTxPhysicalTimerGSIV
>>> -      0,                                                    // UINT32 GTxPhysicalTimerFlags
>>> +      FVP_GT_BLOCK_FRAME0_CTL_BASE,                         // UINT64 CntBaseX
>>> +      FVP_GT_BLOCK_FRAME0_CTL_EL0_BASE,                     // UINT64 CntEL0BaseX
>>> +      FVP_GT_BLOCK_FRAME0_GSIV,                             // UINT32 GTxPhysicalTimerGSIV
>>> +      FVP_GTX_TIMER_FLAGS,                                  // UINT32 GTxPhysicalTimerFlags
>>>        0,                                                    // UINT32 GTxVirtualTimerGSIV
>>>        0,                                                    // UINT32 GTxVirtualTimerFlags
>>> -      0                                                     // UINT32 GTxCommonFlags
>>> +      FVP_GTX_COMMON_FLAGS                                  // UINT32 GTxCommonFlags
>>> +    },
>>> +    {
>>> +      1,                                                    // UINT8 GTFrameNumber
>>> +      {EFI_ACPI_RESERVED_BYTE,
>>> +       EFI_ACPI_RESERVED_BYTE,
>>> +       EFI_ACPI_RESERVED_BYTE},                             // UINT8 Reserved[3]
>>> +      FVP_GT_BLOCK_FRAME1_CTL_BASE,                         // UINT64 CntBaseX
>>> +      FVP_GT_BLOCK_FRAME1_CTL_EL0_BASE,                     // UINT64 CntEL0BaseX
>>> +      FVP_GT_BLOCK_FRAME1_GSIV,                             // UINT32 GTxPhysicalTimerGSIV
>>> +      FVP_GTX_TIMER_FLAGS,                                  // UINT32 GTxPhysicalTimerFlags
>>> +      0,                                                    // UINT32 GTxVirtualTimerGSIV
>>> +      0,                                                    // UINT32 GTxVirtualTimerFlags
>>> +      FVP_GTX_COMMON_FLAGS                                  // UINT32 GTxCommonFlags
>>> +    }
>>> +  },
>>> +  {
>>> +    {
>>> +      EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG,                // UINT8 Type
>>> +      sizeof(EFI_ACPI_6_1_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE), // UINT16 Length
>>> +      EFI_ACPI_RESERVED_BYTE,                                 // UINT8 Reserved
>>> +      FVP_SBSA_WATCHDOG_REFRESH_BASE,                         // UINT64 RefreshFramePhysicalAddress
>>> +      FVP_SBSA_WATCHDOG_CONTROL_BASE,                         // UINT64 WatchdogControlFramePhysicalAddress
>>> +      FVP_SBSA_WATCHDOG_GSIV,                                 // UINT32 WatchdogTimerGSIV
>>> +      FVP_SBSA_WATCHDOG_FLAGS                                 // UINT32 WatchdogTimerFlags
>>>      }
>>>    }
>>>  };
>>> --
>>> 2.5.5
>>>
>
>
>
> --
> Best regards,
>
> Fu Wei
> Software Engineer
> Red Hat