From nobody Wed Apr 24 15:30:17 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+66188+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66188+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1602605682; cv=none; d=zohomail.com; s=zohoarc; b=PPBgExX9vGI7BqDfZoHgvvUjZ+Bt/3Q0RBTTsMr1vTJRu9m/ScDmLZoKNwvqX2RbDCKM5d1mpX14IugELcEO+7CeKbfSBjwQ4nKynYxRgsLo2V3DBwhIXmsqWOXpdywiQIcwnYedCQfT6AAaEW4RgGelNvz1GZu1X45BNvjXKA0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602605682; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To; bh=jufCcyGoHYRK4cNcC2Mt2jCLMfsHtljhAh9pgi9fBdE=; b=PwKJSeNoK5ZDK2R2tiQYuoPWLdhXLvkYRt47oBDnUAuR1KO7VY/ND38csZKBbCR20gUczh6jGyQhsE8nV9W1Gp90qdPqxOFIEFxhFFZmluURWp3JruBXBHCifVp2lr4RmMiAEuCvWADGkYyWRnaPXeLiymFsvTZmKFBqWqmhMUM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+66188+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1602605682871294.7718874789125; Tue, 13 Oct 2020 09:14:42 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id luDBYY1788612xPBQI5sEK9b; Tue, 13 Oct 2020 09:14:42 -0700 X-Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by mx.groups.io with SMTP id smtpd.web10.156.1602605680437243200 for ; Tue, 13 Oct 2020 09:14:40 -0700 X-Received: by mail-qt1-f175.google.com with SMTP id h19so294022qtq.4 for ; Tue, 13 Oct 2020 09:14:40 -0700 (PDT) X-Gm-Message-State: tlzwYpsGpps396AbL7mX11mxx1787277AA= X-Google-Smtp-Source: ABdhPJy0KKcQNDQ9OyZnpxNFmfKs+5RO6AiXSAHMO3MHX8T37rNHnerRAct0D/M6Cx0/FMu3P84O8g== X-Received: by 2002:ac8:1c39:: with SMTP id a54mr409737qtk.344.1602605679611; Tue, 13 Oct 2020 09:14:39 -0700 (PDT) X-Received: from master.ht.home ([2607:fea8:e2a0:e950::5917]) by smtp.googlemail.com with ESMTPSA id z13sm134586qkl.2.2020.10.13.09.14.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 09:14:39 -0700 (PDT) From: "Shashi Mallela" To: leif@nuviainc.com, ard.biesheuvel@arm.com, graeme@nuviainc.com Cc: devel@edk2.groups.io Subject: [edk2-devel] [PATCH v2 1/1] Silicon/Qemu/Sbsa: Add SBSA-wdt entry to GTDT Date: Tue, 13 Oct 2020 12:14:35 -0400 Message-Id: <20201013161435.33893-2-shashi.mallela@linaro.org> In-Reply-To: <20201013161435.33893-1-shashi.mallela@linaro.org> References: <20201013161435.33893-1-shashi.mallela@linaro.org> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,shashi.mallela@linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1602605682; bh=DkwPb4qemCH2iQhc2/9MHJJc5SHeKsH73L0PqxsOG+I=; h=Cc:Date:From:Reply-To:Subject:To; b=ShVuQYpOS9I6V1K0BE98Ak2rLslLmlsJZr3HzUAO9MoL8PVqVVqkNwYHkh+hu+Rhrkn hJEU5ZpGJ6eVCGIVInW2dYcQ21NHe6nd9o6CtVIqCAezhArtDE8jRen0qaUKPNiJxK2IV qj2MmYPVxXrUufpNnyuC4YtEajgR5ICQ1P0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 Reviewed-by: Graeme Gregory --- 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/Sbsa= Qemu/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 =20 -#define GTDT_TIMER_EDGE_TRIGGERED EFI_ACPI_5_0_GTDT_TIMER_FLAG_TIMER_INT= ERRUPT_MODE +#define GTDT_TIMER_EDGE_TRIGGERED EFI_ACPI_6_3_GTDT_TIMER_FLAG_TIMER_INT= ERRUPT_MODE #define GTDT_TIMER_LEVEL_TRIGGERED 0 -#define GTDT_TIMER_ACTIVE_LOW EFI_ACPI_5_0_GTDT_TIMER_FLAG_TIMER_INT= ERRUPT_POLARITY +#define GTDT_TIMER_ACTIVE_LOW EFI_ACPI_6_3_GTDT_TIMER_FLAG_TIMER_INT= ERRUPT_POLARITY #define GTDT_TIMER_ACTIVE_HIGH 0 =20 #define GTDT_GTIMER_FLAGS (GTDT_TIMER_ACTIVE_LOW | GTDT_TIMER_LE= VEL_TRIGGERED) =20 +#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_WATCH= DOG_FLAG_TIMER_INTERRUPT_MODE +#define GTDT_WDTIMER_LEVEL_TRIGGERED 0 +#define GTDT_WDTIMER_ACTIVE_LOW EFI_ACPI_6_3_GTDT_SBSA_GENERIC_WATCH= DOG_FLAG_TIMER_INTERRUPT_POLARITY +#define GTDT_WDTIMER_ACTIVE_HIGH 0 + +#define GTDT_WDTIMER_FLAGS (GTDT_WDTIMER_ACTIVE_HIGH | GTDT_WDTIM= ER_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) =20 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; =20 #pragma pack () =20 GENERIC_TIMER_DESCRIPTION_TABLE Gtdt =3D { { 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 PhysicalAdd= ress 0, // UINT32 Reserved @@ -57,9 +85,18 @@ FixedPcdGet32 (PcdArmArchTimerHypIntrNum), // UINT32 NonSecurePL= 2TimerGSIV GTDT_GTIMER_FLAGS, // UINT32 NonSecurePL= 2TimerFlags 0xFFFFFFFFFFFFFFFF, // UINT64 CntReadBase= PhysicalAddress - 0, // UINT32 PlatformTim= erCount - 0 + SBSA_PLATFORM_TIMER_COUNT, // UINT32 PlatformTim= erCount + sizeof(EFI_ACPI_6_3_GENERIC_TIMER_DESCRIPTION_TABLE), + // UINT32 PlatformTim= erOffset + 0, // UINT32 VirtualPL2T= imerGSIV + 0 // UINT32 VirtualPL2T= imerFlags }, + 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 + ) }; =20 // Reference the table being generated to prevent the optimizer from remov= ing the --=20 2.18.4 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#66188): https://edk2.groups.io/g/devel/message/66188 Mute This Topic: https://groups.io/mt/77486540/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-