From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=pass header.i=@linaro.org header.s=google header.b=cdOObPDM; spf=pass (domain: linaro.org, ip: 209.85.166.195, mailfrom: ard.biesheuvel@linaro.org) Received: from mail-it1-f195.google.com (mail-it1-f195.google.com [209.85.166.195]) by groups.io with SMTP; Mon, 15 Apr 2019 22:01:16 -0700 Received: by mail-it1-f195.google.com with SMTP id y134so30942464itc.5 for ; Mon, 15 Apr 2019 22:01:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=vT813kU8qEzJhqzx7yJ9A5q2tbMp1fPS53g8nrKUN2k=; b=cdOObPDMkcwji2i9HDIxjz57NaBPj1otceXnEPqQj9RyJaS8P797e3ODF00JqwnrSA T/IzBGlI4hrcXE4q2sb5PmfzbG5bU7r4NPoyccw9apMkSCNq1u57zcUx07rT/+yReK9K 9vKABYzfwnc6keiZzDpkqEXrluMr9o+14iuRHphSJT6/vh0wyqXUa+EhJqBun1wg5zkP yiD1YjFXVk6ZFJsw8FRuSvQ4Rc85Tow36tJj8Rr8bzko75dVhEiAcCladtXNoUSUOJk9 iTneOLKVPOA+6hR5IXOi62a/P+pnFAhDwrLbIQnHp7kZ9Xxc5vqvZFnst7bmhzufZlla d3ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=vT813kU8qEzJhqzx7yJ9A5q2tbMp1fPS53g8nrKUN2k=; b=ZUdyQwIvSf4XDfUjxlfx1C5upsobwtJuHcvhMILJt7yIS+q2rAE25byZt4wpO0arBj bBbblzZ0NKgr1wu7iC64poKp9gsYZxiEVt+xIX/wfsN6AbKaACNHs/P3lt4SKV0CAbkN hYiI5Bvz2UpWl/JCDSRPoM+Q35FThA/V1FrfhK78TblkltoQgTHzmrUL3vOlb55vJflI VKHDHMnltXnyHrQRjRDfIJ85iJkHbtTAseXz4/05olczRjvkl6cqIwwOCz+SSJo7u3pt johhmHYOLJMfEXMLs03ZBPcwfcU33HWTjUHjt50VSo9gn3exheew039Fja6qr/if15VI sORQ== X-Gm-Message-State: APjAAAW8t2UmXUJjtpuUPtpVoxNq0D5I8svnVesSozKFxpD9VulhyOTQ xHz1zOt4PgiC3QmuDj+N6AT/2BjwaMSPP2rs06osEA== X-Google-Smtp-Source: APXvYqz9WH7Nx0MXBy36QKGH9UFg0gdo/GkmgpCPi5uJXuatGe58fG9JlNk40NBoymeTAPqkM9H33yHbXJgD7ikKokM= X-Received: by 2002:a02:9042:: with SMTP id y2mr54491368jaf.113.1555390875467; Mon, 15 Apr 2019 22:01:15 -0700 (PDT) MIME-Version: 1.0 References: <1555064376-22302-1-git-send-email-mw@semihalf.com> <1555064376-22302-4-git-send-email-mw@semihalf.com> In-Reply-To: From: "Ard Biesheuvel" Date: Mon, 15 Apr 2019 22:01:04 -0700 Message-ID: Subject: Re: [edk2-platforms: PATCH 3/6] Marvell/Armada7k8k: Implement custom DtLoaderLib To: Marcin Wojtas Cc: edk2-devel-groups-io , Leif Lindholm , Nadav Haklai , =?UTF-8?B?SmFuIETEhWJyb8Wb?= , Grzegorz Jaszczyk , Kostya Porotchkin , Jeremy Linton , Jici Gao Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, 15 Apr 2019 at 21:54, Marcin Wojtas wrote: > > Hi Ard, > > pon., 15 kwi 2019 o 21:01 Ard Biesheuvel napi= sa=C5=82(a): > > > > On Mon, 15 Apr 2019 at 02:52, Marcin Wojtas wrote: > > > > > > Hi Ard, > > > > > > > > > pt., 12 kwi 2019 o 23:15 Ard Biesheuvel n= apisa=C5=82(a): > > > > > > > > On Fri, 12 Apr 2019 at 03:20, Marcin Wojtas wrote= : > > > > > > > > > > In order to provide special handling for DT environment, > > > > > implement custom version of DtLoaderLib, which registers > > > > > ExitBootServices event upon generic 'DtAcpiPref' variable. > > > > > The routine is responsible for disabling the PMU workaround, > > > > > that is valid only for UEFI and OS + APCI. > > > > > > > > > > Contributed-under: TianoCore Contribution Agreement 1.1 > > > > > Signed-off-by: Marcin Wojtas > > > > > --- > > > > > Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc = | 2 +- > > > > > Silicon/Marvell/Armada7k8k/Library/DxeDtPlatformDtbLoaderLib/Dxe= DtPlatformDtbLoaderLib.inf | 43 +++++++ > > > > > Silicon/Marvell/Include/IndustryStandard/MvSmc.h = | 2 + > > > > > Silicon/Marvell/Armada7k8k/Library/DxeDtPlatformDtbLoaderLib/Dxe= DtPlatformDtbLoaderLib.c | 130 ++++++++++++++++++++ > > > > > 4 files changed, 176 insertions(+), 1 deletion(-) > > > > > create mode 100644 Silicon/Marvell/Armada7k8k/Library/DxeDtPlatf= ormDtbLoaderLib/DxeDtPlatformDtbLoaderLib.inf > > > > > create mode 100644 Silicon/Marvell/Armada7k8k/Library/DxeDtPlatf= ormDtbLoaderLib/DxeDtPlatformDtbLoaderLib.c > > > > > > > > > > diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Sili= con/Marvell/Armada7k8k/Armada7k8k.dsc.inc > > > > > index 8291582..5ed742f 100644 > > > > > --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc > > > > > +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc > > > > > @@ -200,7 +200,7 @@ > > > > > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerfo= rmanceLib.inf > > > > > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/Uef= iMemoryAllocationLib.inf > > > > > NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonD= iscoverableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf > > > > > - DtPlatformDtbLoaderLib|EmbeddedPkg/Library/DxeDtPlatformDtbLoa= derLibDefault/DxeDtPlatformDtbLoaderLibDefault.inf > > > > > + DtPlatformDtbLoaderLib|Silicon/Marvell/Armada7k8k/Library/DxeD= tPlatformDtbLoaderLib/DxeDtPlatformDtbLoaderLib.inf > > > > > > > > > > [LibraryClasses.common.UEFI_APPLICATION] > > > > > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerfo= rmanceLib.inf > > > > > diff --git a/Silicon/Marvell/Armada7k8k/Library/DxeDtPlatformDtbL= oaderLib/DxeDtPlatformDtbLoaderLib.inf b/Silicon/Marvell/Armada7k8k/Library= /DxeDtPlatformDtbLoaderLib/DxeDtPlatformDtbLoaderLib.inf > > > > > new file mode 100644 > > > > > index 0000000..ec3f3a5 > > > > > --- /dev/null > > > > > +++ b/Silicon/Marvell/Armada7k8k/Library/DxeDtPlatformDtbLoaderLi= b/DxeDtPlatformDtbLoaderLib.inf > > > > > @@ -0,0 +1,43 @@ > > > > > +/** @file > > > > > +* > > > > > +* Copyright (c) 2017, Linaro, Ltd. All rights reserved. > > > > > +* Copyright (c) 2018, Marvell International Ltd. and its affili= ates > > > > > +* > > > > > > > > Please fix the date here as well as below > > > > > > > > > +* This program and the accompanying materials > > > > > +* are licensed and made available under the terms and condition= s of the BSD License > > > > > +* which accompanies this distribution. The full text of the li= cense may be found at > > > > > +* http://opensource.org/licenses/bsd-license.php > > > > > +* > > > > > +* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS= " BASIS, > > > > > +* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXP= RESS OR IMPLIED. > > > > > +* > > > > > +**/ > > > > > + > > > > > +[Defines] > > > > > + INF_VERSION =3D 0x0001001A > > > > > + BASE_NAME =3D DxeDtPlatformDtbLoaderLibDe= fault > > > > > + FILE_GUID =3D dde55569-ad3f-421d-b94b-3be= 66bb916ce > > > > > + MODULE_TYPE =3D DXE_DRIVER > > > > > + VERSION_STRING =3D 1.0 > > > > > + LIBRARY_CLASS =3D DtPlatformDtbLoaderLib|DXE_= DRIVER > > > > > + > > > > > +[Sources] > > > > > + DxeDtPlatformDtbLoaderLib.c > > > > > + > > > > > +[Packages] > > > > > + ArmPkg/ArmPkg.dec > > > > > + EmbeddedPkg/EmbeddedPkg.dec > > > > > + MdePkg/MdePkg.dec > > > > > + Silicon/Marvell/Marvell.dec > > > > > + > > > > > +[LibraryClasses] > > > > > + ArmSmcLib > > > > > + BaseLib > > > > > + DebugLib > > > > > + DxeServicesLib > > > > > + MemoryAllocationLib > > > > > + UefiRuntimeServicesTableLib > > > > > + > > > > > > > > Are you really using all of these? > > > > > > > > > +[Guids] > > > > > + gDtPlatformDefaultDtbFileGuid > > > > > + gDtPlatformFormSetGuid > > > > > > > > and these? > > > > > > > > > diff --git a/Silicon/Marvell/Include/IndustryStandard/MvSmc.h b/S= ilicon/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/Library/DxeDtPlatformDtbL= oaderLib/DxeDtPlatformDtbLoaderLib.c b/Silicon/Marvell/Armada7k8k/Library/D= xeDtPlatformDtbLoaderLib/DxeDtPlatformDtbLoaderLib.c > > > > > new file mode 100644 > > > > > index 0000000..b189f47 > > > > > --- /dev/null > > > > > +++ b/Silicon/Marvell/Armada7k8k/Library/DxeDtPlatformDtbLoaderLi= b/DxeDtPlatformDtbLoaderLib.c > > > > > @@ -0,0 +1,130 @@ > > > > > +/** @file > > > > > +* > > > > > +* Copyright (c) 2017, Linaro, Ltd. All rights reserved. > > > > > +* Copyright (c) 2018, Marvell International Ltd. and its affili= ates > > > > > +* > > > > > +* This program and the accompanying materials > > > > > +* are licensed and made available under the terms and condition= s of the BSD License > > > > > +* which accompanies this distribution. The full text of the li= cense may be found at > > > > > +* http://opensource.org/licenses/bsd-license.php > > > > > +* > > > > > +* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS= " BASIS, > > > > > +* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXP= RESS OR IMPLIED. > > > > > +* > > > > > +**/ > > > > > + > > > > > +#include > > > > > + > > > > > +#include > > > > > + > > > > > +#include > > > > > +#include > > > > > +#include > > > > > +#include > > > > > +#include > > > > > +#include > > > > > +#include > > > > > + > > > > > > > > Please make sure that all libraries you include are listed in the .= inf > > > > > > > > > +STATIC EFI_EVENT mArmada7k8kExitBootServicesEvent; > > > > > + > > > > > +#define DT_ACPI_SELECT_DT 0x0 > > > > > +#define DT_ACPI_SELECT_ACPI 0x1 > > > > > + > > > > > +typedef struct { > > > > > + UINT8 Pref; > > > > > + UINT8 Reserved[3]; > > > > > +} DT_ACPI_VARSTORE_DATA; > > > > > + > > > > > +/** > > > > > + Disable extra EL3 handling of the PMU interrupts for DT world. > > > > > + > > > > > + @param[in] Event Event structure > > > > > + @param[in] Context Notification context > > > > > + > > > > > +**/ > > > > > +STATIC > > > > > +VOID > > > > > +Armada7k8kExitBootEvent ( > > > > > + IN EFI_EVENT Event, > > > > > + IN VOID *Context > > > > > + ) > > > > > +{ > > > > > + ARM_SMC_ARGS SmcRegs =3D {0}; > > > > > + > > > > > + SmcRegs.Arg0 =3D MV_SMC_ID_PMU_IRQ_DISABLE; > > > > > + ArmCallSmc (&SmcRegs); > > > > > + > > > > > + return; > > > > > +} > > > > > + > > > > > +/** > > > > > + Return a pool allocated copy of the DTB image that is appropri= ate for > > > > > + booting the current platform via DT. > > > > > + > > > > > + @param[out] Dtb Pointer to the DTB copy > > > > > + @param[out] DtbSize Size of the DTB copy > > > > > + > > > > > + @retval EFI_SUCCESS Operation completed succes= sfully > > > > > + @retval EFI_NOT_FOUND No suitable DTB image coul= d be located > > > > > + @retval EFI_OUT_OF_RESOURCES No pool memory available > > > > > + > > > > > +**/ > > > > > +EFI_STATUS > > > > > +EFIAPI > > > > > +DtPlatformLoadDtb ( > > > > > + OUT VOID **Dtb, > > > > > + OUT UINTN *DtbSize > > > > > + ) > > > > > +{ > > > > > + DT_ACPI_VARSTORE_DATA DtAcpiPref; > > > > > + ARM_SMC_ARGS SmcRegs =3D {0}; > > > > > + EFI_STATUS Status; > > > > > + VOID *OrigDtb; > > > > > + VOID *CopyDtb; > > > > > + UINTN OrigDtbSize; > > > > > + UINTN BufferSize; > > > > > + > > > > > + Status =3D GetSectionFromAnyFv (&gDtPlatformDefaultDtbFileGuid= , > > > > > + EFI_SECTION_RAW, > > > > > + 0, > > > > > + &OrigDtb, > > > > > + &OrigDtbSize); > > > > > + if (EFI_ERROR (Status)) { > > > > > + return EFI_NOT_FOUND; > > > > > + } > > > > > + > > > > > + CopyDtb =3D AllocateCopyPool (OrigDtbSize, OrigDtb); > > > > > + if (CopyDtb =3D=3D NULL) { > > > > > + return EFI_OUT_OF_RESOURCES; > > > > > + } > > > > > + > > > > > + *Dtb =3D CopyDtb; > > > > > + *DtbSize =3D OrigDtbSize; > > > > > + > > > > > + /* Enable EL3 handler for regardless HW description */ > > > > > + SmcRegs.Arg0 =3D MV_SMC_ID_PMU_IRQ_ENABLE; > > > > > + ArmCallSmc (&SmcRegs); > > > > > + > > > > > + /* > > > > > + * Get the current DT/ACPI preference from the DtAcpiPref vari= able. > > > > > + * Register ExitBootServices event only in case the DT will be= used. > > > > > + */ > > > > > + BufferSize =3D sizeof (DtAcpiPref); > > > > > + Status =3D gRT->GetVariable (L"DtAcpiPref", > > > > > + &gDtPlatformFormSetGuid, > > > > > + NULL, > > > > > + &BufferSize, > > > > > + &DtAcpiPref); > > > > > + if (EFI_ERROR (Status) || DtAcpiPref.Pref =3D=3D DT_ACPI_SELEC= T_DT) { > > > > > + Status =3D gBS->CreateEvent (EVT_SIGNAL_EXIT_BOOT_SERVICES, > > > > > + TPL_NOTIFY, > > > > > + Armada7k8kExitBootEvent, > > > > > + NULL, > > > > > + &mArmada7k8kExitBootServicesEvent); > > > > > + if (EFI_ERROR (Status)) { > > > > > + DEBUG ((DEBUG_ERROR, "%a: Fail to register EBS event\n", _= _FUNCTION__)); > > > > > + } > > > > > + } > > > > > + > > > > > + return EFI_SUCCESS; > > > > > +} > > > > > -- > > > > > 2.7.4 > > > > > > > > > > > > > Actually, looking at what you are trying to do, can you use the > > > > gEdkiiPlatformHasAcpiGuid protocol instead of looking at the variab= le > > > > directly? That will be installed by the DT platform driver when > > > > choosing ACPI mode. > > > > > > > > It would need to be another driver, but it is more appropriate in a= ny > > > > case to wire this up in some platform DXE rather than the generic D= TB > > > > loader. > > > > > > Ok, I'll move it to DXE. If possible, I'd prefer to use Armada's > > > PlatformInitDxe - would it be accepatble for you to check > > > gEdkiiPlatformHasAcpiGuid in ExitBootEvent? > > > > > > > Yes, but using OnReadyToBoot is more idiomatic for things like this. > > I just checked it - unfortunately it is triggered to early. I need the > PMU irq handling as long as I'm in UEFI (or boot with ACPI). With the > gEfiEventReadyToBootGuid the event hits before I enter the shell, so > I'm moving to DXE, but stick with ExitBoot event solution. > Perhaps you could check for the protocol at ready to boot, and only install the exit boot handler when booting in ACPI mode? It seems a bit convoluted perhaps, but it is better to do as little as possible in exit boot services.