From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@semihalf-com.20150623.gappssmtp.com header.s=20150623 header.b=Ua0B82IN; spf=none, err=SPF record not found (domain: semihalf.com, ip: 209.85.208.195, mailfrom: mw@semihalf.com) Received: from mail-lj1-f195.google.com (mail-lj1-f195.google.com [209.85.208.195]) by groups.io with SMTP; Wed, 17 Apr 2019 02:32:17 -0700 Received: by mail-lj1-f195.google.com with SMTP id j89so21790364ljb.1 for ; Wed, 17 Apr 2019 02:32:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=5DieWlPEK9UaoVkqeofCB2jkDKG/7oYlTmJGNQ/2kk0=; b=Ua0B82INXXpezXRmk1lNh6/KuyoPCN9tUEtdp6eDpbOU8dhofXCVHl2n0hq9GOcG5W JkMsGAwZ7drmL945wWH+G5ApuRQtpWMTvTsLumpPOSiFAY5E8QVZ1bOzqarfesSCt3SV U2cg8e/8YLZgUteDqIgLFmQXazxWbggN2QhXTa/8eH6zHmds4oF03tfTFKrAjAiGBGuG EAN+MMH3JC/RAos8hKcORdBaJEeUVjsO5NpYzJKLiuO37nKQ3qaZflPP8vQDwjT3vhjH p8VNoW3qeLgNG91uqWKryBgiDu9tHDZPI+/BjDKreb5qfsxRfiWOXgGNf0SlFzr115SN Aa/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=5DieWlPEK9UaoVkqeofCB2jkDKG/7oYlTmJGNQ/2kk0=; b=RVoAmwnwMwD4JP/EhfSgXANLqA6OlJhCMzwclplILgKShTRpccc5nSBFYBpV+4FpJN 295BqDXcoQJQpoCg6VHJSQZTkHbhMHXKlXK5cWVBZrcSKC75QAATEV6T+nwkNbnHY6Ni aGSpdRrM7bW2pMM3mnq7vEkS1TDSKqbK9as/bOFzP2ga2KoSEZ6QHpWOy0tUITBYU/J1 SAw/od8Uo506YZjDVHsUvEOT5S5HPivSTn4NjvaahVwbYYEMGb+/r4MWi0d4sUgbQ5A7 bXFdSk17wJsh7Q6PuN+kJkTaP9BdEZAZr54T6D51EUmLVYeq5mv9Rv+c2AVCCRY6fnUl tlcQ== X-Gm-Message-State: APjAAAUev3mIYVYWDPiMjlhY5Y48F/pjJjfGoq6qxez9R+oXk+NfNYou lpQUak0mXcMfkHnu+DZ/sgoUsPGPGPs6fQ== X-Google-Smtp-Source: APXvYqyT2p36xvEIU7PK6HufaplMLDBhe0KWpBMCQc5P8fXZy3jRT29xKGiBqO8TdUR0QOBGFFw1cQ== X-Received: by 2002:a2e:9010:: with SMTP id h16mr46146995ljg.16.1555493534527; Wed, 17 Apr 2019 02:32:14 -0700 (PDT) Return-Path: Received: from gilgamesh.semihalf.com (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id k90sm10878523ljb.89.2019.04.17.02.32.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 17 Apr 2019 02:32:13 -0700 (PDT) From: "Marcin Wojtas" To: devel@edk2.groups.io Cc: leif.lindholm@linaro.org, ard.biesheuvel@linaro.org, mw@semihalf.com, jsd@semihalf.com, jaz@semihalf.com, kostap@marvell.com, jeremy.linton@arm.com, Jici.Gao@arm.com Subject: [edk2-platforms: PATCH v3 1/1] Marvell/Armada7k8k: Implement PMU interrupt handling Date: Wed, 17 Apr 2019 11:31:38 +0200 Message-Id: <1555493498-29178-1-git-send-email-mw@semihalf.com> X-Mailer: git-send-email 2.7.4 Generic handling of the PMU interrupts in UEFI and Linux with ACPI require enabling a dedicated handler in the EL3. Extend the PlatInitDxe with enabler code. Because for DT world the EL3 service must remain disabled, switch it off in the ExitBootServicesEvent. Its execution depends on the gEdkiiPlatformHasAcpiGuid status check in the new gEfiEventReadyToBootGuid routine. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Marcin Wojtas --- Changelog: v2->v3: * Invert and add comments in OnReadyToBoot event * Use ASSERT_EFI_ERROR * Close OnReadyToBoot event Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf | 6 ++ Silicon/Marvell/Include/IndustryStandard/MvSmc.h | 2 + Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c | 88 ++++++++++++++++++++ 3 files changed, 96 insertions(+) diff --git a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf index e707fe9..df10526 100644 --- a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf +++ b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.inf @@ -25,6 +25,7 @@ PlatInitDxe.c [Packages] + ArmPkg/ArmPkg.dec EmbeddedPkg/EmbeddedPkg.dec MdeModulePkg/MdeModulePkg.dec MdePkg/MdePkg.dec @@ -32,6 +33,7 @@ [LibraryClasses] ArmadaIcuLib + ArmSmcLib ComPhyLib DebugLib MppLib @@ -40,6 +42,10 @@ UefiDriverEntryPoint UtmiPhyLib +[Guids] + gEdkiiPlatformHasAcpiGuid + gEfiEventReadyToBootGuid + [Protocols] gMarvellPlatformInitCompleteProtocolGuid ## PRODUCES diff --git a/Silicon/Marvell/Include/IndustryStandard/MvSmc.h b/Silicon/Marvell/Include/IndustryStandard/MvSmc.h index 0c90f11..e5c89d9 100644 --- a/Silicon/Marvell/Include/IndustryStandard/MvSmc.h +++ b/Silicon/Marvell/Include/IndustryStandard/MvSmc.h @@ -20,5 +20,7 @@ #define MV_SMC_ID_COMPHY_POWER_OFF 0x82000002 #define MV_SMC_ID_COMPHY_PLL_LOCK 0x82000003 #define MV_SMC_ID_DRAM_SIZE 0x82000010 +#define MV_SMC_ID_PMU_IRQ_ENABLE 0x82000012 +#define MV_SMC_ID_PMU_IRQ_DISABLE 0x82000013 #endif //__MV_SMC_H__ diff --git a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c index 18b6783..30336fe 100644 --- a/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c +++ b/Silicon/Marvell/Armada7k8k/Drivers/PlatInitDxe/PlatInitDxe.c @@ -12,7 +12,12 @@ **/ +#include + +#include + #include +#include #include #include #include @@ -21,6 +26,72 @@ #include #include +STATIC EFI_EVENT mArmada7k8kExitBootServicesEvent; + +/** + Disable extra EL3 handling of the PMU interrupts for DT world. + + @param[in] Event Event structure + @param[in] Context Notification context + +**/ +STATIC +VOID +EFIAPI +Armada7k8kExitBootServicesHandler ( + IN EFI_EVENT Event, + IN VOID *Context + ) +{ + ARM_SMC_ARGS SmcRegs = {0}; + + SmcRegs.Arg0 = MV_SMC_ID_PMU_IRQ_DISABLE; + ArmCallSmc (&SmcRegs); + + return; +} + +/** + Check if we boot with DT and trigger EBS event in such case. + + @param[in] Event Event structure + @param[in] Context Notification context + +**/ +STATIC +VOID +EFIAPI +Armada7k8kOnReadyToBootHandler ( + IN EFI_EVENT Event, + IN VOID *Context + ) +{ + EFI_STATUS Status; + VOID *Interface; + + /* Ensure the event will be triggered only once. */ + gBS->CloseEvent (Event); + + Status = gBS->LocateProtocol (&gEdkiiPlatformHasAcpiGuid, + NULL, + (VOID **)&Interface); + if (!EFI_ERROR (Status)) { + /* ACPI is enabled, so leave the current settings intact. */ + return; + } + + /* + * In case DT is selected, create EBS event for disabling + * extra EL3 handling of the PMU interrupts in EL3. + */ + Status = gBS->CreateEvent (EVT_SIGNAL_EXIT_BOOT_SERVICES, + TPL_NOTIFY, + Armada7k8kExitBootServicesHandler, + NULL, + &mArmada7k8kExitBootServicesEvent); + ASSERT_EFI_ERROR (Status); +} + EFI_STATUS EFIAPI ArmadaPlatInitDxeEntryPoint ( @@ -28,7 +99,9 @@ ArmadaPlatInitDxeEntryPoint ( IN EFI_SYSTEM_TABLE *SystemTable ) { + ARM_SMC_ARGS SmcRegs = {0}; EFI_STATUS Status; + EFI_EVENT Event; DEBUG ((DEBUG_ERROR, "\nArmada Platform Init\n\n")); @@ -43,5 +116,20 @@ ArmadaPlatInitDxeEntryPoint ( MppInitialize (); ArmadaIcuInitialize (); + /* + * Enable EL3 PMU interrupt handler and + * register the ReadyToBoot event. + */ + SmcRegs.Arg0 = MV_SMC_ID_PMU_IRQ_ENABLE; + ArmCallSmc (&SmcRegs); + + Status = gBS->CreateEventEx (EVT_NOTIFY_SIGNAL, + TPL_CALLBACK, + Armada7k8kOnReadyToBootHandler, + NULL, + &gEfiEventReadyToBootGuid, + &Event); + ASSERT_EFI_ERROR (Status); + return EFI_SUCCESS; } -- 2.7.4