From: "Graeme Gregory" <graeme@nuviainc.com>
To: Shashi Mallela <shashi.mallela@linaro.org>
Cc: leif@nuviainc.com, ard.biesheuvel@arm.com, devel@edk2.groups.io
Subject: Re: [PATCH v1 1/1] Silicon/Qemu/Sbsa: Add SBSA-wdt entry to GTDT
Date: Mon, 12 Oct 2020 12:20:58 +0100 [thread overview]
Message-ID: <20201012112058.pszafzo3qaxmg256@xora-monster> (raw)
In-Reply-To: <20201008203136.94393-2-shashi.mallela@linaro.org>
On Thu, Oct 08, 2020 at 04:31:36PM -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>
> ---
> Silicon/Qemu/SbsaQemu/AcpiTables/Gtdt.aslc | 87 ++++++++++++++------
> 1 file changed, 62 insertions(+), 25 deletions(-)
>
> diff --git a/Silicon/Qemu/SbsaQemu/AcpiTables/Gtdt.aslc b/Silicon/Qemu/SbsaQemu/AcpiTables/Gtdt.aslc
> index d16778e01a5c..e26047173744 100644
> --- a/Silicon/Qemu/SbsaQemu/AcpiTables/Gtdt.aslc
> +++ b/Silicon/Qemu/SbsaQemu/AcpiTables/Gtdt.aslc
> @@ -24,42 +24,79 @@
> #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,
> - GENERIC_TIMER_DESCRIPTION_TABLE,
> - EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION
> - ),
> - SYSTEM_TIMER_BASE_ADDRESS, // UINT64 PhysicalAddress
> - 0, // UINT32 Reserved
> - FixedPcdGet32 (PcdArmArchTimerSecIntrNum), // UINT32 SecurePL1TimerGSIV
> - GTDT_GTIMER_FLAGS, // UINT32 SecurePL1TimerFlags
> - FixedPcdGet32 (PcdArmArchTimerIntrNum), // UINT32 NonSecurePL1TimerGSIV
> - GTDT_GTIMER_FLAGS, // UINT32 NonSecurePL1TimerFlags
> - FixedPcdGet32 (PcdArmArchTimerVirtIntrNum), // UINT32 VirtualTimerGSIV
> - GTDT_GTIMER_FLAGS, // UINT32 VirtualTimerFlags
> - FixedPcdGet32 (PcdArmArchTimerHypIntrNum), // UINT32 NonSecurePL2TimerGSIV
> - GTDT_GTIMER_FLAGS, // UINT32 NonSecurePL2TimerFlags
> - 0xFFFFFFFFFFFFFFFF, // UINT64 CntReadBasePhysicalAddress
> - 0, // UINT32 PlatformTimerCount
> - 0
> - },
> + GENERIC_TIMER_DESCRIPTION_TABLES Gtdt = {
> + {
> + SBSAQEMU_ACPI_HEADER(
> + EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE,
> + GENERIC_TIMER_DESCRIPTION_TABLES,
> + EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION
> + ),
> + SYSTEM_TIMER_BASE_ADDRESS, // UINT64 PhysicalAddress
> + 0, // UINT32 Reserved
> + FixedPcdGet32 (PcdArmArchTimerSecIntrNum), // UINT32 SecurePL1TimerGSIV
> + GTDT_GTIMER_FLAGS, // UINT32 SecurePL1TimerFlags
> + FixedPcdGet32 (PcdArmArchTimerIntrNum), // UINT32 NonSecurePL1TimerGSIV
> + GTDT_GTIMER_FLAGS, // UINT32 NonSecurePL1TimerFlags
> + FixedPcdGet32 (PcdArmArchTimerVirtIntrNum), // UINT32 VirtualTimerGSIV
> + GTDT_GTIMER_FLAGS, // UINT32 VirtualTimerFlags
> + FixedPcdGet32 (PcdArmArchTimerHypIntrNum), // UINT32 NonSecurePL2TimerGSIV
> + GTDT_GTIMER_FLAGS, // UINT32 NonSecurePL2TimerFlags
> + 0xFFFFFFFFFFFFFFFF, // UINT64 CntReadBasePhysicalAddress
> + 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
> + )
> };
>
Seems to be a lot of unneccessary changes here because the indentation
was changed?
Can you minimise the patch please.
Thanks
Graeme
> // Reference the table being generated to prevent the optimizer from removing the
> --
> 2.18.4
>
prev parent reply other threads:[~2020-10-12 11:21 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-08 20:31 [PATCH v1 0/1] Add SBSA-wdt entry to GTDT table Shashi Mallela
2020-10-08 20:31 ` [PATCH v1 1/1] Silicon/Qemu/Sbsa: Add SBSA-wdt entry to GTDT Shashi Mallela
2020-10-12 11:20 ` Graeme Gregory [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201012112058.pszafzo3qaxmg256@xora-monster \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox