From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4001:c0b::235; helo=mail-it0-x235.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-it0-x235.google.com (mail-it0-x235.google.com [IPv6:2607:f8b0:4001:c0b::235]) (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 6FA5D21A1099A for ; Tue, 12 Dec 2017 06:49:41 -0800 (PST) Received: by mail-it0-x235.google.com with SMTP id r6so24837055itr.3 for ; Tue, 12 Dec 2017 06:54:20 -0800 (PST) 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=b9rxtLLOjwuDbj8OAvSG8ZX4UMuSvekLyFdt8DSAwPw=; b=fgYvyvWJrQh8QXKAmuaiBGGTtNY4OOphc8J1huoLhk7mkg9GkGTJ38VjLVcCto1cWj /zYNIUpvG3Dxdaf7YBIJx6esgbgiMZfbW6+RLTLoYMWRan4XgehMND81+RuXOAymxyqg XnGXZ/eqAsHpXpsFNRBiwyqmCvE0k+g9psuDY= 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=b9rxtLLOjwuDbj8OAvSG8ZX4UMuSvekLyFdt8DSAwPw=; b=M/ifa/a83rH9hxAN1llQlv0NdCbjJUGVO+9SuphO+LrVKL+8LqxF9enZ07q+UDZivy hyLwK5kYJrB5nTje4LmaZnSwR5pUoqS902R5l+pRjoAd+5AWhi4WlpTLa0rzm1Y+To8e O+eFCksZRyfwCBmT0/LkiSWKX4X+xnMWAcy1xqbuy5OHh3JwLLt5JYljRMSrEudVYkVK vi1Y0az6GWv3K1am3AFsD6Eqw5ANmJam2G3eM9ljbXjaWVIoyztiLB8FxQF8UHhEfmAy cf3XP6d7xPcra8+DTIrcfvJIMkWgzbpV5BwEXvOnQ8CxeQODvVqblr0wti2iNioNIUN0 32lA== X-Gm-Message-State: AKGB3mIMf+r/3EMAJSVN3/TWxJdGe/zU4m8yfiDuZCdIAH81JCQCmhdx TWIc03NDNFQ3QrnH6bR170fN44vUBvexZ1/O9eiPUCQA0+0= X-Google-Smtp-Source: ACJfBovxf+IRPPak0uptmkuuNWLTmgwJqKU2wS0XEH0//A184AH55ftduG7L7N5pt1b8x/FByYa5a3BciR96qKOrOr8= X-Received: by 10.107.2.137 with SMTP id 131mr5952196ioc.186.1513090458557; Tue, 12 Dec 2017 06:54:18 -0800 (PST) MIME-Version: 1.0 Received: by 10.107.104.16 with HTTP; Tue, 12 Dec 2017 06:54:17 -0800 (PST) In-Reply-To: <20171212103807.18836-6-ard.biesheuvel@linaro.org> References: <20171212103807.18836-1-ard.biesheuvel@linaro.org> <20171212103807.18836-6-ard.biesheuvel@linaro.org> From: Ard Biesheuvel Date: Tue, 12 Dec 2017 14:54:17 +0000 Message-ID: To: "edk2-devel@lists.01.org" Cc: Leif Lindholm , Daniel Thompson , Masami Hiramatsu , Ard Biesheuvel Subject: Re: [PATCH edk2-platforms 5/8] Silicon/SynQuacer: disable PCI RC #0 DT node if disabled 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: Tue, 12 Dec 2017 14:49:41 -0000 Content-Type: text/plain; charset="UTF-8" On 12 December 2017 at 10:38, Ard Biesheuvel wrote: > If PCIe RC #0 is not enabled (due to the fact that the slot is not > populated), set its DT node 'status' property to 'disabled' so that > the OS will not attempt to attach to it. > > This means we will need to switch from the default DtPlatformDtbLoaderLib > to a special one for our platform. > > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ard Biesheuvel > --- > Platform/Socionext/DeveloperBox/DeveloperBox.dsc | 8 +- > Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 3 +- > Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c | 94 ++++++++++++++++++++ > Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf | 42 +++++++++ > 4 files changed, 141 insertions(+), 6 deletions(-) > > diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc > index 5ec26f9cdd34..80728fedbc20 100644 > --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc > +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc > @@ -160,7 +160,8 @@ [LibraryClasses.common.DXE_CORE] > PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf > > [LibraryClasses.common.DXE_DRIVER] > - DtPlatformDtbLoaderLib|EmbeddedPkg/Library/DxeDtPlatformDtbLoaderLibDefault/DxeDtPlatformDtbLoaderLibDefault.inf > + DtPlatformDtbLoaderLib|Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf > + FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf > > @@ -611,10 +612,7 @@ [Components.common] > # > # Console preference selection > # > - EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.inf { > - > - FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf > - } > + EmbeddedPkg/Drivers/ConsolePrefDxe/ConsolePrefDxe.inf > > # > # DT support > diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc > index bc8ddd452d4b..c71425664bdc 100644 > --- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc > +++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc > @@ -159,7 +159,8 @@ [LibraryClasses.common.DXE_CORE] > PerformanceLib|MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf > > [LibraryClasses.common.DXE_DRIVER] > - DtPlatformDtbLoaderLib|EmbeddedPkg/Library/DxeDtPlatformDtbLoaderLibDefault/DxeDtPlatformDtbLoaderLibDefault.inf > + DtPlatformDtbLoaderLib|Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.inf > + FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf > SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf > PerformanceLib|MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf > > diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c b/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c > new file mode 100644 > index 000000000000..a93a6027e64d > --- /dev/null > +++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c > @@ -0,0 +1,94 @@ > +/** @file > +* > +* Copyright (c) 2017, Linaro, Ltd. All rights reserved. > +* > +* 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 license 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 EXPRESS OR IMPLIED. > +* > +**/ > + > +#include > + > +#include > +#include > +#include > +#include > +#include > + > +#define DTB_PADDING 64 > + > +STATIC > +VOID > +DisableDtNode ( > + IN VOID *Dtb, > + IN CONST CHAR8 *NodePath > + ) > +{ > + INT32 Node; > + INT32 Rc; > + > + Node = fdt_path_offset (Dtb, NodePath); > + if (Node < 0) { > + DEBUG ((DEBUG_ERROR, "%a: failed to locate DT path '%a': %a\n", > + __FUNCTION__, NodePath, fdt_strerror (Node))); > + return; > + } > + Rc = fdt_setprop_string (Dtb, Node, "status", "disabled"); > + if (Rc < 0) { > + DEBUG ((DEBUG_ERROR, "%a: failed to set status to 'disabled' on '%a': %a\n", > + __FUNCTION__, NodePath, fdt_strerror (Rc))); > + } > +} > + > +/** > + 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 successfully > + @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 > + ) > +{ > + EFI_STATUS Status; > + VOID *OrigDtb; > + VOID *CopyDtb; > + UINTN OrigDtbSize; > + > + Status = GetSectionFromAnyFv (&gDtPlatformDefaultDtbFileGuid, > + EFI_SECTION_RAW, 0, &OrigDtb, &OrigDtbSize); > + if (EFI_ERROR (Status)) { > + return EFI_NOT_FOUND; > + } > + > + CopyDtb = AllocateCopyPool (OrigDtbSize + DTB_PADDING, OrigDtb); > + if (CopyDtb == NULL) { > + return EFI_OUT_OF_RESOURCES; > + } > + > + if (!(PcdGet8 (PcdPcieEnableMask) & BIT0)) { > + DisableDtNode (CopyDtb, "/pcie@60000000"); > + } > + if (!(PcdGet8 (PcdPcieEnableMask) & BIT1)) { > + DisableDtNode (CopyDtb, "/pcie@70000000"); > + } > + > + *Dtb = CopyDtb; > + *DtbSize = OrigDtbSize + DTB_PADDING; > + > + return EFI_SUCCESS; > +} This needs a tweak: I forgot to incorporate the fdt_copy_into() call which grows the DTB image before adding properties. The following needs to be applied on top. --- a/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c +++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerDtbLoaderLib/SynQuacerDtbLoaderLib.c @@ -68,6 +68,8 @@ DtPlatformLoadDtb ( VOID *OrigDtb; VOID *CopyDtb; UINTN OrigDtbSize; + UINTN CopyDtbSize; + INT32 Rc; Status = GetSectionFromAnyFv (&gDtPlatformDefaultDtbFileGuid, EFI_SECTION_RAW, 0, &OrigDtb, &OrigDtbSize); @@ -75,11 +77,19 @@ DtPlatformLoadDtb ( return EFI_NOT_FOUND; } - CopyDtb = AllocateCopyPool (OrigDtbSize + DTB_PADDING, OrigDtb); + CopyDtbSize = OrigDtbSize + DTB_PADDING; + CopyDtb = AllocatePool (CopyDtbSize); if (CopyDtb == NULL) { return EFI_OUT_OF_RESOURCES; } + Rc = fdt_open_into (OrigDtb, CopyDtb, CopyDtbSize); + if (Rc < 0) { + DEBUG ((DEBUG_ERROR, "%a: fdt_open_into () failed: %a\n", __FUNCTION__, + fdt_strerror (Rc))); + return EFI_NOT_FOUND; + } + if (!(PcdGet8 (PcdPcieEnableMask) & BIT0)) { DisableDtNode (CopyDtb, "/pcie@60000000"); } @@ -88,7 +98,7 @@ DtPlatformLoadDtb ( } *Dtb = CopyDtb; - *DtbSize = OrigDtbSize + DTB_PADDING; + *DtbSize = CopyDtbSize; return EFI_SUCCESS; }