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=hs0aFrYB; spf=none, err=SPF record not found (domain: semihalf.com, ip: 209.85.160.196, mailfrom: mw@semihalf.com) Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by groups.io with SMTP; Mon, 15 Apr 2019 02:52:56 -0700 Received: by mail-qt1-f196.google.com with SMTP id d13so18358154qth.5 for ; Mon, 15 Apr 2019 02:52:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=0WHeyfw3jOiYXlUrroeTeJHyFFkIgBO/G75qZn7AeHg=; b=hs0aFrYBCb8tD4JtUZxAWz3XGlbzgUdh1OTTjVXmbzRqEaGXfApWWlnWgzP+VBSDAl w1LJdFZHDtPpnNpsevMlY5Wr+LkIhfk0G2UHlC/AdyYKF8/53cIn3FX61XVUru9GGwi5 qk47C+2OYXwQ0GxwSNyqjqLl2zweChOYbFW19CKAJ7cswyXe1i2QIIZzstI522MvLHFl giZbep8mx8LcYXrzcnM4E9HfnhSFSbkNKGaq4OsTANQWdSD6sVyKmLw3OdunUr3u68Hj MJqR3a/2tFsoptCTzkzBMP0Xulcb1fH20rQOkSBZPDQ86I0bBLJl/Kg8e59o4BK/I0HP ul5w== 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=0WHeyfw3jOiYXlUrroeTeJHyFFkIgBO/G75qZn7AeHg=; b=sNivuGZjIKt9MvA7tjSYGNLDaDY/FCcPVshTNjibPd+dbS7MtpTNX4Igj0fDGqmG3Z XjifVx/oiVvo/BbxqSMQjrP/q5pGG6fu6VuLSGOZwO8xoWEzyWAaQQVOcyc4IwI9Hx4n 7MVjshzpcZ5hCXB6szp3lj8dpbLXj/89cANp2AweBPo5tdndVwWmkhOF3/pRTOx4oKKP ZugK6kb/8OAHw3pRS9hUvGg8F8XvGBsgfrHcLNo6KzZrj8KYpMNS5mMczMjHc5A/WkdT qtwVpBMLDB04wvlObrNhUh75JNa8wqPmt2+ux0hgatID9khr95PMVbB7Xr51883CtI4/ Uhtg== X-Gm-Message-State: APjAAAVqmB5IHRQhHVEmyADnbdx9wfa6Myi683EPdW9RYtUJYbdscDsV IFEjmCECI23mt+htccqzhe2G+srwQ+sn/F6uO5M7KA== X-Google-Smtp-Source: APXvYqyHR/HvWl7KbSTka5Sj4HR5VWHuWAkPPscwsSY8QlbAS1slUudqBNYNYG9l/bx2OvmFrqb+IYDc6lMIESlBTY8= X-Received: by 2002:a0c:af4d:: with SMTP id j13mr60691638qvc.75.1555321975238; Mon, 15 Apr 2019 02:52:55 -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: "Marcin Wojtas" Date: Mon, 15 Apr 2019 11:52:43 +0200 Message-ID: Subject: Re: [edk2-platforms: PATCH 3/6] Marvell/Armada7k8k: Implement custom DtLoaderLib To: Ard Biesheuvel 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 Hi Ard, pt., 12 kwi 2019 o 23:15 Ard Biesheuvel napisa= =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/DxeDtPlat= formDtbLoaderLib.inf | 43 +++++++ > > Silicon/Marvell/Include/IndustryStandard/MvSmc.h = | 2 + > > Silicon/Marvell/Armada7k8k/Library/DxeDtPlatformDtbLoaderLib/DxeDtPlat= formDtbLoaderLib.c | 130 ++++++++++++++++++++ > > 4 files changed, 176 insertions(+), 1 deletion(-) > > create mode 100644 Silicon/Marvell/Armada7k8k/Library/DxeDtPlatformDtb= LoaderLib/DxeDtPlatformDtbLoaderLib.inf > > create mode 100644 Silicon/Marvell/Armada7k8k/Library/DxeDtPlatformDtb= LoaderLib/DxeDtPlatformDtbLoaderLib.c > > > > diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Ma= rvell/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/DxePerformance= Lib.inf > > MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemor= yAllocationLib.inf > > NonDiscoverableDeviceRegistrationLib|MdeModulePkg/Library/NonDiscove= rableDeviceRegistrationLib/NonDiscoverableDeviceRegistrationLib.inf > > - DtPlatformDtbLoaderLib|EmbeddedPkg/Library/DxeDtPlatformDtbLoaderLib= Default/DxeDtPlatformDtbLoaderLibDefault.inf > > + DtPlatformDtbLoaderLib|Silicon/Marvell/Armada7k8k/Library/DxeDtPlatf= ormDtbLoaderLib/DxeDtPlatformDtbLoaderLib.inf > > > > [LibraryClasses.common.UEFI_APPLICATION] > > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformance= Lib.inf > > diff --git a/Silicon/Marvell/Armada7k8k/Library/DxeDtPlatformDtbLoaderL= ib/DxeDtPlatformDtbLoaderLib.inf b/Silicon/Marvell/Armada7k8k/Library/DxeDt= PlatformDtbLoaderLib/DxeDtPlatformDtbLoaderLib.inf > > new file mode 100644 > > index 0000000..ec3f3a5 > > --- /dev/null > > +++ b/Silicon/Marvell/Armada7k8k/Library/DxeDtPlatformDtbLoaderLib/DxeD= tPlatformDtbLoaderLib.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 t= he BSD License > > +* which accompanies this distribution. The full text of the license = may be found at > > +* http://opensource.org/licenses/bsd-license.php > > +* > > +* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASI= S, > > +* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS O= R IMPLIED. > > +* > > +**/ > > + > > +[Defines] > > + INF_VERSION =3D 0x0001001A > > + BASE_NAME =3D DxeDtPlatformDtbLoaderLibDefault > > + FILE_GUID =3D dde55569-ad3f-421d-b94b-3be66bb91= 6ce > > + 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/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/Library/DxeDtPlatformDtbLoaderL= ib/DxeDtPlatformDtbLoaderLib.c b/Silicon/Marvell/Armada7k8k/Library/DxeDtPl= atformDtbLoaderLib/DxeDtPlatformDtbLoaderLib.c > > new file mode 100644 > > index 0000000..b189f47 > > --- /dev/null > > +++ b/Silicon/Marvell/Armada7k8k/Library/DxeDtPlatformDtbLoaderLib/DxeD= tPlatformDtbLoaderLib.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 t= he BSD License > > +* which accompanies this distribution. The full text of the license = may be found at > > +* http://opensource.org/licenses/bsd-license.php > > +* > > +* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASI= S, > > +* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS O= R 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 fo= r > > + 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 successfully > > + @retval EFI_NOT_FOUND No suitable DTB image could be l= ocated > > + @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 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_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", __FUNCT= ION__)); > > + } > > + } > > + > > + 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? Best regards, Marcin