From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-it0-x232.google.com (mail-it0-x232.google.com [IPv6:2607:f8b0:4001:c0b::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 7563E803D1 for ; Wed, 22 Mar 2017 07:18:10 -0700 (PDT) Received: by mail-it0-x232.google.com with SMTP id 190so25117014itm.0 for ; Wed, 22 Mar 2017 07:18:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=poeMx8s8MEk7JtZrUSoAT656ZljT6ixP9PVlp2FDqTs=; b=JVhU+InVVLRS/E4ycaxd0eNJLK4N0wFzzkZfqZ2gCEXKoRoo1iNGlMIfSqOsZY+UT/ aBWPByA8gxt4ALogg+RSs35bz6exKOK2/UNa7jWFJhZUA938Bges5HuXOzMoZA/9BsVJ SUug9KRGGzEFNONLjiMULm5PRg61uCI6vKrWQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=poeMx8s8MEk7JtZrUSoAT656ZljT6ixP9PVlp2FDqTs=; b=DljnuvWxKvNTvlkdCmE2syheh32lf+JmzWqrxRnwXC7qRYjGVjSbgnhakJMNBnu9Ig O2fmcAciPnAhlwaQdMCeasn0YQLBdO1KyuXy0N896eQmug4CuvEMh5qPrNgIElF4gZ7w 9m1c3DBDoGRXARcXx6wC1X2icVmt8EF8Aore0sQkecMcqNxxREZIv6Yrgyvs6QHhzSME 2TamHNBnQJjKkq49FhgL/1c546Zh/r8dUKpky8uHjp8iHdv0QSINAq5waYGqInb1VyFb /fxHWK9OxvosdlRGWBZXVFCOnL7e6aH4yA/4QuvFI0J2mfNVWI+rMROh3SdL0tyNgrKf 2t3A== X-Gm-Message-State: AFeK/H0IAF48eLkoGq2SJT93vzk517aSJzAhy9oi5+2AZWB5EXKqsPhPI1OVKfugB0Q6vqCqeZLMAc2dXysXp3kh X-Received: by 10.36.137.4 with SMTP id s4mr7756120itd.63.1490192289671; Wed, 22 Mar 2017 07:18:09 -0700 (PDT) MIME-Version: 1.0 Received: by 10.107.10.27 with HTTP; Wed, 22 Mar 2017 07:18:09 -0700 (PDT) In-Reply-To: <20170317204731.31488-11-lersek@redhat.com> References: <20170317204731.31488-1-lersek@redhat.com> <20170317204731.31488-11-lersek@redhat.com> From: Ard Biesheuvel Date: Wed, 22 Mar 2017 14:18:09 +0000 Message-ID: To: Laszlo Ersek Cc: edk2-devel-01 , Leif Lindholm Subject: Re: [PATCH v2 10/12] ArmVirtPkg/FdtClientDxe: install DT as sysconfig table in protocol notify X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Mar 2017 14:18:10 -0000 Content-Type: text/plain; charset=UTF-8 On 17 March 2017 at 20:47, Laszlo Ersek wrote: > Replace the dependency on PcdPureAcpiBoot with a Platform Has Device Tree > notification callback. Move the sysconfig table installation from the > entry point function to the callback. > > Cc: Ard Biesheuvel > Cc: Leif Lindholm > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Laszlo Ersek Reviewed-by: Ard Biesheuvel > --- > ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf | 5 +- > ArmVirtPkg/FdtClientDxe/FdtClientDxe.c | 105 ++++++++++++++++++-- > 2 files changed, 98 insertions(+), 12 deletions(-) > > diff --git a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf b/ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf > index 3a0cd37040eb..99dcbde59497 100644 > --- a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf > +++ b/ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf > @@ -25,6 +25,7 @@ [Sources] > FdtClientDxe.c > > [Packages] > + ArmPkg/ArmPkg.dec > ArmVirtPkg/ArmVirtPkg.dec > EmbeddedPkg/EmbeddedPkg.dec > MdeModulePkg/MdeModulePkg.dec > @@ -39,14 +40,12 @@ [LibraryClasses] > UefiDriverEntryPoint > > [Protocols] > + gEdkiiPlatformHasDeviceTreeProtocolGuid ## CONSUMES > gFdtClientProtocolGuid ## PRODUCES > > [Guids] > gFdtHobGuid > gFdtTableGuid > > -[FeaturePcd] > - gArmVirtTokenSpaceGuid.PcdPureAcpiBoot > - > [Depex] > TRUE > diff --git a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.c b/ArmVirtPkg/FdtClientDxe/FdtClientDxe.c > index 547a29fce62c..9dda0d005d61 100644 > --- a/ArmVirtPkg/FdtClientDxe/FdtClientDxe.c > +++ b/ArmVirtPkg/FdtClientDxe/FdtClientDxe.c > @@ -24,6 +24,7 @@ > #include > > #include > +#include > > STATIC VOID *mDeviceTreeBase; > > @@ -306,6 +307,40 @@ STATIC FDT_CLIENT_PROTOCOL mFdtClientProtocol = { > GetOrInsertChosenNode, > }; > > +STATIC > +VOID > +EFIAPI > +OnPlatformHasDeviceTree ( > + IN EFI_EVENT Event, > + IN VOID *Context > + ) > +{ > + EFI_STATUS Status; > + VOID *Interface; > + VOID *DeviceTreeBase; > + > + Status = gBS->LocateProtocol ( > + &gEdkiiPlatformHasDeviceTreeProtocolGuid, > + NULL, // Registration > + &Interface > + ); > + if (EFI_ERROR (Status)) { > + return; > + } > + > + DeviceTreeBase = Context; > + DEBUG (( > + DEBUG_INFO, > + "%a: exposing DTB @ 0x%p to OS\n", > + __FUNCTION__, > + DeviceTreeBase > + )); > + Status = gBS->InstallConfigurationTable (&gFdtTableGuid, DeviceTreeBase); > + ASSERT_EFI_ERROR (Status); > + > + gBS->CloseEvent (Event); > +} > + > EFI_STATUS > EFIAPI > InitializeFdtClientDxe ( > @@ -316,6 +351,8 @@ InitializeFdtClientDxe ( > VOID *Hob; > VOID *DeviceTreeBase; > EFI_STATUS Status; > + EFI_EVENT PlatformHasDeviceTreeEvent; > + VOID *Registration; > > Hob = GetFirstGuidHob (&gFdtHobGuid); > if (Hob == NULL || GET_GUID_HOB_DATA_SIZE (Hob) != sizeof (UINT64)) { > @@ -333,15 +370,65 @@ InitializeFdtClientDxe ( > > DEBUG ((EFI_D_INFO, "%a: DTB @ 0x%p\n", __FUNCTION__, mDeviceTreeBase)); > > - if (!FeaturePcdGet (PcdPureAcpiBoot)) { > - // > - // Only install the FDT as a configuration table if we want to leave it up > - // to the OS to decide whether it prefers ACPI over DT. > - // > - Status = gBS->InstallConfigurationTable (&gFdtTableGuid, DeviceTreeBase); > - ASSERT_EFI_ERROR (Status); > + // > + // Register a protocol notify for the EDKII Platform Has Device Tree > + // Protocol. > + // > + Status = gBS->CreateEvent ( > + EVT_NOTIFY_SIGNAL, > + TPL_CALLBACK, > + OnPlatformHasDeviceTree, > + DeviceTreeBase, // Context > + &PlatformHasDeviceTreeEvent > + ); > + if (EFI_ERROR (Status)) { > + DEBUG ((DEBUG_ERROR, "%a: CreateEvent(): %r\n", __FUNCTION__, Status)); > + return Status; > } > > - return gBS->InstallProtocolInterface (&ImageHandle, &gFdtClientProtocolGuid, > - EFI_NATIVE_INTERFACE, &mFdtClientProtocol); > + Status = gBS->RegisterProtocolNotify ( > + &gEdkiiPlatformHasDeviceTreeProtocolGuid, > + PlatformHasDeviceTreeEvent, > + &Registration > + ); > + if (EFI_ERROR (Status)) { > + DEBUG (( > + DEBUG_ERROR, > + "%a: RegisterProtocolNotify(): %r\n", > + __FUNCTION__, > + Status > + )); > + goto CloseEvent; > + } > + > + // > + // Kick the event; the protocol could be available already. > + // > + Status = gBS->SignalEvent (PlatformHasDeviceTreeEvent); > + if (EFI_ERROR (Status)) { > + DEBUG ((DEBUG_ERROR, "%a: SignalEvent(): %r\n", __FUNCTION__, Status)); > + goto CloseEvent; > + } > + > + Status = gBS->InstallProtocolInterface ( > + &ImageHandle, > + &gFdtClientProtocolGuid, > + EFI_NATIVE_INTERFACE, > + &mFdtClientProtocol > + ); > + if (EFI_ERROR (Status)) { > + DEBUG (( > + DEBUG_ERROR, > + "%a: InstallProtocolInterface(): %r\n", > + __FUNCTION__, > + Status > + )); > + goto CloseEvent; > + } > + > + return Status; > + > +CloseEvent: > + gBS->CloseEvent (PlatformHasDeviceTreeEvent); > + return Status; > } > -- > 2.9.3 > >