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=h7Lvz1gH; spf=pass (domain: linaro.org, ip: 209.85.166.194, mailfrom: ard.biesheuvel@linaro.org) Received: from mail-it1-f194.google.com (mail-it1-f194.google.com [209.85.166.194]) by groups.io with SMTP; Mon, 15 Apr 2019 12:01:32 -0700 Received: by mail-it1-f194.google.com with SMTP id x132so28878378itf.2 for ; Mon, 15 Apr 2019 12:01:31 -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=rL/wl8DZbUgV0By5qMdWwS0mBbtt0DyPF8CdFAGDiDg=; b=h7Lvz1gHkpbWqwitgr2hMDY0eJXDV32Ii6KNMS9o03/jWfGeVeY7E7UXUvdVOAXzuh 74rNtb3AUS6RD2+36XYsY9/cEkeOeVFpDyGzIZ0mjTMnnlY9qzA7VPtpesTfTO0iZXrz 6gJZYQVjsoWV72MVCINpEGqQ7zMykH7hsdrAP7Pkn2n+t9SYQDwzjOhvLVKN627CZgA1 pyEIpUge87Ly2rrnrjYRO9X8mRESWvEQQQ6DxO/MFqT9It/Yy1bWdfOHNpctC1ogXe2f yYGnYmSYS6pFYX7k0ETCAOIL23GuTC+tPfgWFGi9xbFgHkRoPBSO66+b78eHw1cyVtBc FJqA== 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=rL/wl8DZbUgV0By5qMdWwS0mBbtt0DyPF8CdFAGDiDg=; b=oCRabV122pVKLZFZmP88oHyr748jas/mJIpN1JE+ic4/kMGTJGemqQCI0jmsVNAniK PkNdZ+W6kFly/D281rWeFAWl7URi6L/oce3YfwaRt3XdI1ZnqnypVWi/IKvDJK02GOVT ZcmSM+UO9oNVQQKupsfBciBrkwZoiogFmgSJsuV+cNoJ4xKXm6ctvHVIPIVEbQd2JLRO RWB1ppVl8OIL6oqukQMTDbPulUngDTO7qkgDOLksuMprs1rf2r/UURYKToZnKfBlpkvc JbzDMdhjiob1SvvAW8IpXpSlReqmTDZhwqBYWpt83xF1NpMjG/qbn8O8T7Npj6rnFKac 5dCw== X-Gm-Message-State: APjAAAU1VGEouGxjZxuJZYXrVsIKOrD410SyFaoyGOFkKkgscr4gQehY dO6u1zjnaUh9IvSKeQgQxQVwvtDVZK+niGeoHRkTBw== X-Google-Smtp-Source: APXvYqwwQAXKC5DaBBBM97v+32AsnYoXCeKvsB/vnxSi/dfY0LCgABbMFAMVKyGrJGrkLHuF6JfHs+7l4bKcygK1vFY= X-Received: by 2002:a05:660c:2c5:: with SMTP id j5mr25277661itd.154.1555354890545; Mon, 15 Apr 2019 12:01:30 -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 12:01:19 -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 02:52, Marcin Wojtas wrote: > > Hi Ard, > > > pt., 12 kwi 2019 o 23:15 Ard Biesheuvel napis= a=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/DxeDtPl= atformDtbLoaderLib.inf | 43 +++++++ > > > Silicon/Marvell/Include/IndustryStandard/MvSmc.h = | 2 + > > > Silicon/Marvell/Armada7k8k/Library/DxeDtPlatformDtbLoaderLib/DxeDtPl= atformDtbLoaderLib.c | 130 ++++++++++++++++++++ > > > 4 files changed, 176 insertions(+), 1 deletion(-) > > > create mode 100644 Silicon/Marvell/Armada7k8k/Library/DxeDtPlatformD= tbLoaderLib/DxeDtPlatformDtbLoaderLib.inf > > > create mode 100644 Silicon/Marvell/Armada7k8k/Library/DxeDtPlatformD= tbLoaderLib/DxeDtPlatformDtbLoaderLib.c > > > > > > diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/= 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/DxePerforman= ceLib.inf > > > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMem= oryAllocationLib.inf > > > NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDisco= verableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf > > > - DtPlatformDtbLoaderLib|EmbeddedPkg/Library/DxeDtPlatformDtbLoaderL= ibDefault/DxeDtPlatformDtbLoaderLibDefault.inf > > > + DtPlatformDtbLoaderLib|Silicon/Marvell/Armada7k8k/Library/DxeDtPla= tformDtbLoaderLib/DxeDtPlatformDtbLoaderLib.inf > > > > > > [LibraryClasses.common.UEFI_APPLICATION] > > > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerforman= ceLib.inf > > > diff --git a/Silicon/Marvell/Armada7k8k/Library/DxeDtPlatformDtbLoade= rLib/DxeDtPlatformDtbLoaderLib.inf b/Silicon/Marvell/Armada7k8k/Library/Dxe= DtPlatformDtbLoaderLib/DxeDtPlatformDtbLoaderLib.inf > > > new file mode 100644 > > > index 0000000..ec3f3a5 > > > --- /dev/null > > > +++ b/Silicon/Marvell/Armada7k8k/Library/DxeDtPlatformDtbLoaderLib/Dx= eDtPlatformDtbLoaderLib.inf > > > @@ -0,0 +1,43 @@ > > > +/** @file > > > +* > > > +* Copyright (c) 2017, Linaro, Ltd. All rights reserved. > > > +* Copyright (c) 2018, Marvell International Ltd. and its affiliates > > > +* > > > > Please fix the date here as well as below > > > > > +* This program and the accompanying materials > > > +* are licensed and made available under the terms and conditions of= the BSD License > > > +* which accompanies this distribution. The full text of the licens= e may be found at > > > +* http://opensource.org/licenses/bsd-license.php > > > +* > > > +* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BA= SIS, > > > +* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS= OR IMPLIED. > > > +* > > > +**/ > > > + > > > +[Defines] > > > + INF_VERSION =3D 0x0001001A > > > + BASE_NAME =3D DxeDtPlatformDtbLoaderLibDefaul= t > > > + FILE_GUID =3D dde55569-ad3f-421d-b94b-3be66bb= 916ce > > > + MODULE_TYPE =3D DXE_DRIVER > > > + VERSION_STRING =3D 1.0 > > > + LIBRARY_CLASS =3D DtPlatformDtbLoaderLib|DXE_DRIV= ER > > > + > > > +[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/Silic= on/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/DxeDtPlatformDtbLoade= rLib/DxeDtPlatformDtbLoaderLib.c b/Silicon/Marvell/Armada7k8k/Library/DxeDt= PlatformDtbLoaderLib/DxeDtPlatformDtbLoaderLib.c > > > new file mode 100644 > > > index 0000000..b189f47 > > > --- /dev/null > > > +++ b/Silicon/Marvell/Armada7k8k/Library/DxeDtPlatformDtbLoaderLib/Dx= eDtPlatformDtbLoaderLib.c > > > @@ -0,0 +1,130 @@ > > > +/** @file > > > +* > > > +* Copyright (c) 2017, Linaro, Ltd. All rights reserved. > > > +* Copyright (c) 2018, Marvell International Ltd. and its affiliates > > > +* > > > +* This program and the accompanying materials > > > +* are licensed and made available under the terms and conditions of= the BSD License > > > +* which accompanies this distribution. The full text of the licens= e may be found at > > > +* http://opensource.org/licenses/bsd-license.php > > > +* > > > +* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BA= SIS, > > > +* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS= 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 appropriate = 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 successful= ly > > > + @retval EFI_NOT_FOUND No suitable DTB image could 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 variable= . > > > + * Register ExitBootServices event only in case the DT will be use= d. > > > + */ > > > + BufferSize =3D sizeof (DtAcpiPref); > > > + Status =3D gRT->GetVariable (L"DtAcpiPref", > > > + &gDtPlatformFormSetGuid, > > > + NULL, > > > + &BufferSize, > > > + &DtAcpiPref); > > > + if (EFI_ERROR (Status) || DtAcpiPref.Pref =3D=3D DT_ACPI_SELECT_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", __FUN= CTION__)); > > > + } > > > + } > > > + > > > + 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 variable > > 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 any > > case to wire this up in some platform DXE rather than the generic DTB > > 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.