From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::d41; helo=mail-io1-xd41.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-io1-xd41.google.com (mail-io1-xd41.google.com [IPv6:2607:f8b0:4864:20::d41]) (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 42CF221962301 for ; Mon, 19 Nov 2018 11:16:21 -0800 (PST) Received: by mail-io1-xd41.google.com with SMTP id m1-v6so12231864ioc.13 for ; Mon, 19 Nov 2018 11:16:21 -0800 (PST) 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; bh=TXu9c3tevyF2FwpJXNfw0mdQQWki8Sy9upgWvTICZHg=; b=WCzjNmk56ptKVLYZtrRW9nL44RDoHWkQZfiRdAWmojdVcP4CNHzU1oiPAPCBh599Vh aLyyAqS3dz8giPA/vKY2OjM1xNjiRNk0PuaGPhk92zWi4CrVU+TL+cDOaA9rV8dLLc5L BvX7bQPG4PJpvVWgihVZ3QRWZrlPCAitcrChs= 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; bh=TXu9c3tevyF2FwpJXNfw0mdQQWki8Sy9upgWvTICZHg=; b=shMpSZVWVHVQcJS9328QCygURgSg/CFnzeQhw0+ysrT/IfQ1cTtwIwhQWNwTF3XbK6 dc2ETBihCJbaMlV1rBlRDaccCz2fe8dek7LrXE8GBiqLvPR0Zfw7QjpaMZukSsMAMCAE apQAG8WLcKz0c7bQ0LRg21t+ULl8dB5Y1MQFhMhqAF1rFRJVF9oQdKVZgskHr2YQ2sBT 7yDdUz9JbNDHzSvxWTqeoSUeA7yVWN35MhqeeuZJod9j1BNgLc6xIKzPFULstB1aI2LB GLh1dubL67ucXBVMbMpoEFBdg5YIcmFxb3XDZU8LApAplvHAr12m63buLi6sWhGwdT9L LrrQ== X-Gm-Message-State: AGRZ1gJnj+AnKuDtH9HPNeP6DbDyKgxRK4fuw00bDIx6qxoVgcPWMFfb Zf7VQTRPYSQRBcKKbfdVozW5HAY6L/7Jwv4WKSAGDw== X-Google-Smtp-Source: AFSGD/V7Pl8aDZ4kY3w6NTuXWaaQbQjT9dxEm3mFzFDAxxlYnsACaXDpKaUEStlui9Yuul1ihIn5cWqA8zuerfTY8mU= X-Received: by 2002:a6b:37c2:: with SMTP id e185-v6mr18693949ioa.173.1542654980463; Mon, 19 Nov 2018 11:16:20 -0800 (PST) MIME-Version: 1.0 References: <20181117004524.31851-1-ard.biesheuvel@linaro.org> <20181117004524.31851-3-ard.biesheuvel@linaro.org> <20181119191044.4uqakfz5dfmxdctz@bivouac.eciton.net> In-Reply-To: <20181119191044.4uqakfz5dfmxdctz@bivouac.eciton.net> From: Ard Biesheuvel Date: Mon, 19 Nov 2018 11:16:09 -0800 Message-ID: To: Leif Lindholm Cc: "edk2-devel@lists.01.org" , Laszlo Ersek , =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= , Hongbo Zhang Subject: Re: [PATCH 2/2] ArmVirtPkg/NorFlashQemuLib: discover NOR flash banks dynamically X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Nov 2018 19:16:21 -0000 Content-Type: text/plain; charset="UTF-8" On Mon, 19 Nov 2018 at 11:10, Leif Lindholm wrote: > > On Fri, Nov 16, 2018 at 05:29:05PM -0800, Ard Biesheuvel wrote: > > On Fri, 16 Nov 2018 at 16:45, Ard Biesheuvel wrote: > > > > > > NorFlashQemuLib is one of the last remaining drivers in ArmVirtPkg > > > that are not based on the device tree received from QEMU. > > > > > > For ArmVirtQemu, this does not really matter, given that the NOR > > > flash banks are always the same: the PEI code is linked to execute > > > in place from flash bank #0, and the fixed varstore PCDs refer to > > > flash bank #1 directly. > > > > > > However, ArmVirtQemuKernel can execute at any offset, and flash bank > > > > #0 is configured as secure-only when running with support for EL3 enabled. > > Never gets old :) > No this is entirely reasonable: it makes perfect sense for a NOR flash at address 0x0 to be secure only on a system that implements EL3, since mach-virt's default reset vector is 0x0. > > > In this case, NorFlashQemuLib should not expose the first flash bank > > > at all. > > > > > > To prevent introducing too much internal knowledge about which flash > > > bank is accessible under which circumstances, let's switch to using > > > the DTB to decide which flash banks to expose to the NOR flash driver. > > Does this mean we as a side effect get rid of the limitation that the > pflash image needs to be exactly 64MB. Or does that require further > changes on the QEMU side? > No that is a QEMU thing. > If it does, please add a comment to the commit message. > Either way: > Reviewed-by: Leif Lindholm > Thanks > > > > > > Contributed-under: TianoCore Contribution Agreement 1.1 > > > Signed-off-by: Ard Biesheuvel > > > --- > > > ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c | 84 +++++++++++++++----- > > > ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf | 12 +++ > > > 2 files changed, 75 insertions(+), 21 deletions(-) > > > > > > diff --git a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c > > > index e3bbae5b06c5..dc0a15e77170 100644 > > > --- a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c > > > +++ b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.c > > > @@ -1,6 +1,6 @@ > > > /** @file > > > > > > - Copyright (c) 2014, Linaro Ltd. All rights reserved.
> > > + Copyright (c) 2014-2018, 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 > > > @@ -12,13 +12,16 @@ > > > > > > **/ > > > > > > +#include > > > +#include > > > #include > > > +#include > > > + > > > +#include > > > > > > #define QEMU_NOR_BLOCK_SIZE SIZE_256KB > > > -#define QEMU_NOR0_BASE 0x0 > > > -#define QEMU_NOR0_SIZE SIZE_64MB > > > -#define QEMU_NOR1_BASE 0x04000000 > > > -#define QEMU_NOR1_SIZE SIZE_64MB > > > + > > > +#define MAX_FLASH_BANKS 4 > > > > > > EFI_STATUS > > > NorFlashPlatformInitialization ( > > > @@ -28,21 +31,7 @@ NorFlashPlatformInitialization ( > > > return EFI_SUCCESS; > > > } > > > > > > -NOR_FLASH_DESCRIPTION mNorFlashDevices[] = { > > > - { > > > - QEMU_NOR0_BASE, > > > - QEMU_NOR0_BASE, > > > - QEMU_NOR0_SIZE, > > > - QEMU_NOR_BLOCK_SIZE, > > > - {0xF9B94AE2, 0x8BA6, 0x409B, {0x9D, 0x56, 0xB9, 0xB4, 0x17, 0xF5, 0x3C, 0xB3}} > > > - }, { > > > - QEMU_NOR1_BASE, > > > - QEMU_NOR1_BASE, > > > - QEMU_NOR1_SIZE, > > > - QEMU_NOR_BLOCK_SIZE, > > > - {0x8047DB4B, 0x7E9C, 0x4C0C, {0x8E, 0xBC, 0xDF, 0xBB, 0xAA, 0xCA, 0xCE, 0x8F}} > > > - } > > > -}; > > > +NOR_FLASH_DESCRIPTION mNorFlashDevices[MAX_FLASH_BANKS]; > > > > > > EFI_STATUS > > > NorFlashPlatformGetDevices ( > > > @@ -50,7 +39,60 @@ NorFlashPlatformGetDevices ( > > > OUT UINT32 *Count > > > ) > > > { > > > + FDT_CLIENT_PROTOCOL *FdtClient; > > > + INT32 Node; > > > + EFI_STATUS Status; > > > + EFI_STATUS FindNodeStatus; > > > + CONST UINT64 *Reg; > > > + UINT32 RegSize; > > > + CONST CHAR8 *NodeStatus; > > > + UINTN Num; > > > + > > > + Status = gBS->LocateProtocol (&gFdtClientProtocolGuid, NULL, > > > + (VOID **)&FdtClient); > > > + ASSERT_EFI_ERROR (Status); > > > + > > > + Num = 0; > > > + for (FindNodeStatus = FdtClient->FindCompatibleNode (FdtClient, > > > + "cfi-flash", &Node); > > > + !EFI_ERROR (FindNodeStatus); > > > + FindNodeStatus = FdtClient->FindNextCompatibleNode (FdtClient, > > > + "cfi-flash", Node, &Node)) { > > > + > > > + Status = FdtClient->GetNodeProperty (FdtClient, Node, "status", > > > + (CONST VOID **)&NodeStatus, NULL); > > > + if (!EFI_ERROR (Status) && AsciiStrnCmp (NodeStatus, "ok", 2) != 0) { > > > + continue; > > > + } > > > + > > > + Status = FdtClient->GetNodeProperty (FdtClient, Node, "reg", > > > + (CONST VOID **)&Reg, &RegSize); > > > + if (EFI_ERROR (Status)) { > > > + DEBUG ((EFI_D_ERROR, "%a: GetNodeProperty () failed (Status == %r)\n", > > > + __FUNCTION__, Status)); > > > + continue; > > > + } > > > + > > > + ASSERT ((RegSize % (2 * sizeof(UINT64))) == 0); > > > + > > > + while (RegSize > 0) { > > > + mNorFlashDevices[Num].DeviceBaseAddress = (UINTN)SwapBytes64 (Reg[0]); > > > + mNorFlashDevices[Num].RegionBaseAddress = (UINTN)SwapBytes64 (Reg[0]); > > > + mNorFlashDevices[Num].Size = (UINTN)SwapBytes64 (Reg[1]); > > > + mNorFlashDevices[Num].BlockSize = QEMU_NOR_BLOCK_SIZE; > > > + > > > + Num++; > > > + Reg += 2; > > > + RegSize -= 2 * sizeof(UINT64); > > > + > > > + if (Num >= MAX_FLASH_BANKS) { > > > + goto Finished; > > > + } > > > + } > > > + } > > > + > > > +Finished: > > > *NorFlashDescriptions = mNorFlashDevices; > > > - *Count = ARRAY_SIZE (mNorFlashDevices); > > > + *Count = Num; > > > return EFI_SUCCESS; > > > } > > > diff --git a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf > > > index 126d1671f544..d86ff36dbd58 100644 > > > --- a/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf > > > +++ b/ArmVirtPkg/Library/NorFlashQemuLib/NorFlashQemuLib.inf > > > @@ -28,3 +28,15 @@ > > > [Packages] > > > MdePkg/MdePkg.dec > > > ArmPlatformPkg/ArmPlatformPkg.dec > > > + ArmVirtPkg/ArmVirtPkg.dec > > > + > > > +[LibraryClasses] > > > + BaseLib > > > + DebugLib > > > + UefiBootServicesTableLib > > > + > > > +[Protocols] > > > + gFdtClientProtocolGuid ## CONSUMES > > > + > > > +[Depex] > > > + gFdtClientProtocolGuid > > > -- > > > 2.17.1 > > >