* [PATCH v2 0/1] Add SBSA-wdt entry to GTDT
@ 2020-10-13 16:14 shashi.mallela
2020-10-13 16:14 ` [PATCH v2 1/1] Silicon/Qemu/Sbsa: " Shashi Mallela
0 siblings, 1 reply; 3+ messages in thread
From: shashi.mallela @ 2020-10-13 16:14 UTC (permalink / raw)
To: leif, ard.biesheuvel, graeme; +Cc: devel
To enable detection of qemu SBSA generic watchdog timer device,this
patch has been added to create sbsa-wdt entry into the GTDT table
which helps firmware report the presence of SBSA-wdt to the OS.
Changes in v2:
- fixed patch indentation
Shashi Mallela (1):
Silicon/Qemu/Sbsa: Add SBSA-wdt entry to GTDT
Silicon/Qemu/SbsaQemu/AcpiTables/Gtdt.aslc | 53 +++++++++++++++++---
1 file changed, 45 insertions(+), 8 deletions(-)
--
2.18.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2 1/1] Silicon/Qemu/Sbsa: Add SBSA-wdt entry to GTDT
2020-10-13 16:14 [PATCH v2 0/1] Add SBSA-wdt entry to GTDT shashi.mallela
@ 2020-10-13 16:14 ` Shashi Mallela
2020-10-14 9:27 ` Graeme Gregory
0 siblings, 1 reply; 3+ messages in thread
From: Shashi Mallela @ 2020-10-13 16:14 UTC (permalink / raw)
To: leif, ard.biesheuvel, graeme; +Cc: devel
SBSA generic watchdog timer structure entry has been added
to GTDT table as per BSAv0.9.
This enables acpi detection of wdt in qemu sbsa platform
Signed-off-by: Shashi Mallela <shashi.mallela@linaro.org>
---
Silicon/Qemu/SbsaQemu/AcpiTables/Gtdt.aslc | 53 +++++++++++++++++---
1 file changed, 45 insertions(+), 8 deletions(-)
diff --git a/Silicon/Qemu/SbsaQemu/AcpiTables/Gtdt.aslc b/Silicon/Qemu/SbsaQemu/AcpiTables/Gtdt.aslc
index d16778e01a5c..2312fd74e26d 100644
--- a/Silicon/Qemu/SbsaQemu/AcpiTables/Gtdt.aslc
+++ b/Silicon/Qemu/SbsaQemu/AcpiTables/Gtdt.aslc
@@ -24,27 +24,55 @@
#define SYSTEM_TIMER_BASE_ADDRESS 0xFFFFFFFFFFFFFFFF
#endif
-#define GTDT_TIMER_EDGE_TRIGGERED EFI_ACPI_5_0_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE
+#define GTDT_TIMER_EDGE_TRIGGERED EFI_ACPI_6_3_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE
#define GTDT_TIMER_LEVEL_TRIGGERED 0
-#define GTDT_TIMER_ACTIVE_LOW EFI_ACPI_5_0_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
+#define GTDT_TIMER_ACTIVE_LOW EFI_ACPI_6_3_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
#define GTDT_TIMER_ACTIVE_HIGH 0
#define GTDT_GTIMER_FLAGS (GTDT_TIMER_ACTIVE_LOW | GTDT_TIMER_LEVEL_TRIGGERED)
+#define SBSA_PLATFORM_WATCHDOG_COUNT 1
+#define SBSA_PLATFORM_TIMER_COUNT (SBSA_PLATFORM_WATCHDOG_COUNT)
+
+#define SBSAQEMU_WDT_REFRESH_FRAME_BASE 0x50010000
+#define SBSAQEMU_WDT_CONTROL_FRAME_BASE 0x50011000
+#define SBSAQEMU_WDT_IRQ 44
+
+#define GTDT_WDTIMER_EDGE_TRIGGERED EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_MODE
+#define GTDT_WDTIMER_LEVEL_TRIGGERED 0
+#define GTDT_WDTIMER_ACTIVE_LOW EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_POLARITY
+#define GTDT_WDTIMER_ACTIVE_HIGH 0
+
+#define GTDT_WDTIMER_FLAGS (GTDT_WDTIMER_ACTIVE_HIGH | GTDT_WDTIMER_LEVEL_TRIGGERED)
+
+#define EFI_ACPI_6_3_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT( \
+ RefreshFramePhysicalAddress, ControlFramePhysicalAddress, \
+ WatchdogTimerGSIV, WatchdogTimerFlags) \
+ { \
+ EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG, \
+ sizeof(EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE), \
+ EFI_ACPI_RESERVED_WORD, \
+ RefreshFramePhysicalAddress, \
+ ControlFramePhysicalAddress, \
+ WatchdogTimerGSIV, \
+ WatchdogTimerFlags \
+ }
+
#pragma pack (1)
typedef struct {
- EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE Gtdt;
- } GENERIC_TIMER_DESCRIPTION_TABLE;
+ EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE Gtdt;
+ EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE Gwdt;
+ } GENERIC_TIMER_DESCRIPTION_TABLES;
#pragma pack ()
GENERIC_TIMER_DESCRIPTION_TABLE Gtdt = {
{
SBSAQEMU_ACPI_HEADER(
- EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE,
+ EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE,
GENERIC_TIMER_DESCRIPTION_TABLE,
- EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION
+ EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION
),
SYSTEM_TIMER_BASE_ADDRESS, // UINT64 PhysicalAddress
0, // UINT32 Reserved
@@ -57,9 +85,18 @@
FixedPcdGet32 (PcdArmArchTimerHypIntrNum), // UINT32 NonSecurePL2TimerGSIV
GTDT_GTIMER_FLAGS, // UINT32 NonSecurePL2TimerFlags
0xFFFFFFFFFFFFFFFF, // UINT64 CntReadBasePhysicalAddress
- 0, // UINT32 PlatformTimerCount
- 0
+ SBSA_PLATFORM_TIMER_COUNT, // UINT32 PlatformTimerCount
+ sizeof(EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE),
+ // UINT32 PlatformTimerOffset
+ 0, // UINT32 VirtualPL2TimerGSIV
+ 0 // UINT32 VirtualPL2TimerFlags
},
+ EFI_ACPI_6_3_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT(
+ SBSAQEMU_WDT_REFRESH_FRAME_BASE,
+ SBSAQEMU_WDT_CONTROL_FRAME_BASE,
+ SBSAQEMU_WDT_IRQ,
+ GTDT_WDTIMER_FLAGS
+ )
};
// Reference the table being generated to prevent the optimizer from removing the
--
2.18.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2 1/1] Silicon/Qemu/Sbsa: Add SBSA-wdt entry to GTDT
2020-10-13 16:14 ` [PATCH v2 1/1] Silicon/Qemu/Sbsa: " Shashi Mallela
@ 2020-10-14 9:27 ` Graeme Gregory
0 siblings, 0 replies; 3+ messages in thread
From: Graeme Gregory @ 2020-10-14 9:27 UTC (permalink / raw)
To: Shashi Mallela; +Cc: leif, ard.biesheuvel, devel
On Tue, Oct 13, 2020 at 12:14:35PM -0400, Shashi Mallela wrote:
> SBSA generic watchdog timer structure entry has been added
> to GTDT table as per BSAv0.9.
> This enables acpi detection of wdt in qemu sbsa platform
>
> Signed-off-by: Shashi Mallela <shashi.mallela@linaro.org>
New version is looking fine to me.
Reviewed-by: Graeme Gregory <graeme@nuviainc.com>
> ---
> Silicon/Qemu/SbsaQemu/AcpiTables/Gtdt.aslc | 53 +++++++++++++++++---
> 1 file changed, 45 insertions(+), 8 deletions(-)
>
> diff --git a/Silicon/Qemu/SbsaQemu/AcpiTables/Gtdt.aslc b/Silicon/Qemu/SbsaQemu/AcpiTables/Gtdt.aslc
> index d16778e01a5c..2312fd74e26d 100644
> --- a/Silicon/Qemu/SbsaQemu/AcpiTables/Gtdt.aslc
> +++ b/Silicon/Qemu/SbsaQemu/AcpiTables/Gtdt.aslc
> @@ -24,27 +24,55 @@
> #define SYSTEM_TIMER_BASE_ADDRESS 0xFFFFFFFFFFFFFFFF
> #endif
>
> -#define GTDT_TIMER_EDGE_TRIGGERED EFI_ACPI_5_0_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE
> +#define GTDT_TIMER_EDGE_TRIGGERED EFI_ACPI_6_3_GTDT_TIMER_FLAG_TIMER_INTERRUPT_MODE
> #define GTDT_TIMER_LEVEL_TRIGGERED 0
> -#define GTDT_TIMER_ACTIVE_LOW EFI_ACPI_5_0_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
> +#define GTDT_TIMER_ACTIVE_LOW EFI_ACPI_6_3_GTDT_TIMER_FLAG_TIMER_INTERRUPT_POLARITY
> #define GTDT_TIMER_ACTIVE_HIGH 0
>
> #define GTDT_GTIMER_FLAGS (GTDT_TIMER_ACTIVE_LOW | GTDT_TIMER_LEVEL_TRIGGERED)
>
> +#define SBSA_PLATFORM_WATCHDOG_COUNT 1
> +#define SBSA_PLATFORM_TIMER_COUNT (SBSA_PLATFORM_WATCHDOG_COUNT)
> +
> +#define SBSAQEMU_WDT_REFRESH_FRAME_BASE 0x50010000
> +#define SBSAQEMU_WDT_CONTROL_FRAME_BASE 0x50011000
> +#define SBSAQEMU_WDT_IRQ 44
> +
> +#define GTDT_WDTIMER_EDGE_TRIGGERED EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_MODE
> +#define GTDT_WDTIMER_LEVEL_TRIGGERED 0
> +#define GTDT_WDTIMER_ACTIVE_LOW EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_FLAG_TIMER_INTERRUPT_POLARITY
> +#define GTDT_WDTIMER_ACTIVE_HIGH 0
> +
> +#define GTDT_WDTIMER_FLAGS (GTDT_WDTIMER_ACTIVE_HIGH | GTDT_WDTIMER_LEVEL_TRIGGERED)
> +
> +#define EFI_ACPI_6_3_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT( \
> + RefreshFramePhysicalAddress, ControlFramePhysicalAddress, \
> + WatchdogTimerGSIV, WatchdogTimerFlags) \
> + { \
> + EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG, \
> + sizeof(EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE), \
> + EFI_ACPI_RESERVED_WORD, \
> + RefreshFramePhysicalAddress, \
> + ControlFramePhysicalAddress, \
> + WatchdogTimerGSIV, \
> + WatchdogTimerFlags \
> + }
> +
> #pragma pack (1)
>
> typedef struct {
> - EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE Gtdt;
> - } GENERIC_TIMER_DESCRIPTION_TABLE;
> + EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE Gtdt;
> + EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCHDOG_STRUCTURE Gwdt;
> + } GENERIC_TIMER_DESCRIPTION_TABLES;
>
> #pragma pack ()
>
> GENERIC_TIMER_DESCRIPTION_TABLE Gtdt = {
> {
> SBSAQEMU_ACPI_HEADER(
> - EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE,
> + EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE,
> GENERIC_TIMER_DESCRIPTION_TABLE,
> - EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION
> + EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION
> ),
> SYSTEM_TIMER_BASE_ADDRESS, // UINT64 PhysicalAddress
> 0, // UINT32 Reserved
> @@ -57,9 +85,18 @@
> FixedPcdGet32 (PcdArmArchTimerHypIntrNum), // UINT32 NonSecurePL2TimerGSIV
> GTDT_GTIMER_FLAGS, // UINT32 NonSecurePL2TimerFlags
> 0xFFFFFFFFFFFFFFFF, // UINT64 CntReadBasePhysicalAddress
> - 0, // UINT32 PlatformTimerCount
> - 0
> + SBSA_PLATFORM_TIMER_COUNT, // UINT32 PlatformTimerCount
> + sizeof(EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE),
> + // UINT32 PlatformTimerOffset
> + 0, // UINT32 VirtualPL2TimerGSIV
> + 0 // UINT32 VirtualPL2TimerFlags
> },
> + EFI_ACPI_6_3_SBSA_GENERIC_WATCHDOG_STRUCTURE_INIT(
> + SBSAQEMU_WDT_REFRESH_FRAME_BASE,
> + SBSAQEMU_WDT_CONTROL_FRAME_BASE,
> + SBSAQEMU_WDT_IRQ,
> + GTDT_WDTIMER_FLAGS
> + )
> };
>
> // Reference the table being generated to prevent the optimizer from removing the
> --
> 2.18.4
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-10-14 9:28 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-13 16:14 [PATCH v2 0/1] Add SBSA-wdt entry to GTDT shashi.mallela
2020-10-13 16:14 ` [PATCH v2 1/1] Silicon/Qemu/Sbsa: " Shashi Mallela
2020-10-14 9:27 ` Graeme Gregory
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox