From nobody Thu Dec 26 22:28:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 152890731647132.44023680718885; Wed, 13 Jun 2018 09:28:36 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 566BF2127421C; Wed, 13 Jun 2018 09:28:35 -0700 (PDT) Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) (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 D88D521251133 for ; Wed, 13 Jun 2018 09:28:32 -0700 (PDT) Received: by mail-wr0-x242.google.com with SMTP id x4-v6so3400879wro.11 for ; Wed, 13 Jun 2018 09:28:32 -0700 (PDT) Received: from dogfood.home ([2a01:cb1d:112:6f00:6dfc:b76c:4240:35ff]) by smtp.gmail.com with ESMTPSA id s191-v6sm6234782wmd.27.2018.06.13.09.28.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 09:28:30 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::242; helo=mail-wr0-x242.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ruT8nGqvlrGiu50lPEI5hgpeH8sVwtDye3H6eJT+KL0=; b=ZDMI1HMW1vcsPg+C048sB3PBT3Zf6MbnzlnfMw1pLF0oVf9j9eVIiGaooL3jU8ZvPJ NvitaffTIv1r9kg90H8sko8JgLOtgvjSrdGIXS9sO+zpdejkv21cLxYxLJPev40cAD/W d+Zh9h1p1gqqgzyL/33bwyvRVLf8Hypyg1V+w= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ruT8nGqvlrGiu50lPEI5hgpeH8sVwtDye3H6eJT+KL0=; b=YmPkGyUNuHObyxQwBIO7rbDxaXrO1LvMpCbrT8J0pn3nklTm9j5P6N8kmBQJ1hnjAH g0BC1gV5dL4XbOt27JSKzGAIAThF77xvxhhdpRaDNRG4rAKKYlbLI0zgHuDLYFuiQ9wQ I3L9dwk7IIHlVASx3yFDjx/g8iXn+Uz1UrVstdxw9sPpoLUdX2SXegcoOMMMEy0cYbyT QPMLSLL0XBy3in8RBEn1WBUzSRbqVkf7Xh4FBGhqW5ke2J6WWc5DaHV8WktoXyTT15Km 6xIsDv20L+gtWriT/50nY9dqcl+5eqLDcl41T5DZtUgnJIKQ0/+a1GAL5EfJWoX6WJ6I SxGA== X-Gm-Message-State: APt69E27NhLCJ0LqT8lxxUNvb2G8NRG83GsVtG+dQyyGtDttjeksNJOu oYg5gcyWRRse8pxU0dsNnmTCfugGLbQ= X-Google-Smtp-Source: ADUXVKI4xjjJ+9vdOlvXx0mVXguUmRCFOXf8xhKKXAVaAaFx05FcIOTwMMdc6+ZCQ6KTtk/B91W6Kw== X-Received: by 2002:adf:b258:: with SMTP id y24-v6mr4469725wra.168.1528907311184; Wed, 13 Jun 2018 09:28:31 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 13 Jun 2018 18:28:25 +0200 Message-Id: <20180613162826.19986-2-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180613162826.19986-1-ard.biesheuvel@linaro.org> References: <20180613162826.19986-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms v2 1/2] Silicon/SynQuacerPlatformFlashAccessLib: relax FV address check X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" In commit 913fdda9f4b9 ("Silicon/SynQuacerPlatformFlashAccessLib: don't dereference FVB header fields"), we dropped all accesses to FVB header field, which was necessary because the flash partition may not in fact contain such a header. Instead, only an exact match on the base address of the FV compared to the base address of the capsule payload would result in a match, making it difficult to create capsules that only update a subset of the flash contents. Given that the FVB protocol provides a GetBlockSize() method that also returns the number of consecutive blocks of that size, and does not rely on the FVB header contents, we can actually infer the size of the flash partition, and use it to decide whether a capsule payload targets an area that is covered by this partition entirely. This optimization allows us to extend the FV description to include the SCP firmware partition without requiring us to actually provide a payload for that partition immediately, which is useful as a preparatory step. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformFlashAccessLib/SynQua= cerPlatformFlashAccessLib.c | 56 ++++++++++---------- 1 file changed, 27 insertions(+), 29 deletions(-) diff --git a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformFlashAcce= ssLib/SynQuacerPlatformFlashAccessLib.c b/Silicon/Socionext/SynQuacer/Libra= ry/SynQuacerPlatformFlashAccessLib/SynQuacerPlatformFlashAccessLib.c index 48d385993b38..51bf9f62457f 100644 --- a/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformFlashAccessLib/S= ynQuacerPlatformFlashAccessLib.c +++ b/Silicon/Socionext/SynQuacer/Library/SynQuacerPlatformFlashAccessLib/S= ynQuacerPlatformFlashAccessLib.c @@ -45,8 +45,10 @@ STATIC EFI_STATUS GetFvbByAddress ( IN EFI_PHYSICAL_ADDRESS Address, + IN UINTN Length, OUT EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL **OutFvb, - OUT EFI_PHYSICAL_ADDRESS *FvbBaseAddress + OUT EFI_LBA *Lba, + OUT UINTN *BlockSize ) { EFI_STATUS Status; @@ -55,6 +57,8 @@ GetFvbByAddress ( UINTN Index; EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *Fvb; EFI_FVB_ATTRIBUTES_2 Attributes; + EFI_PHYSICAL_ADDRESS FvbBaseAddress; + UINTN NumberOfBlocks; =20 // // Locate all handles with Firmware Volume Block protocol @@ -85,7 +89,7 @@ GetFvbByAddress ( // // Checks if the address range of this handle contains parameter Addre= ss // - Status =3D Fvb->GetPhysicalAddress (Fvb, FvbBaseAddress); + Status =3D Fvb->GetPhysicalAddress (Fvb, &FvbBaseAddress); if (EFI_ERROR (Status)) { continue; } @@ -103,9 +107,27 @@ GetFvbByAddress ( continue; } =20 - if (Address =3D=3D *FvbBaseAddress) { + Status =3D Fvb->GetBlockSize (Fvb, 0, BlockSize, &NumberOfBlocks); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_INFO, "%a: failed to get FVB blocksize - %r, ignoring\= n", + __FUNCTION__, Status)); + continue; + } + + if ((Length % *BlockSize) !=3D 0) { + DEBUG ((DEBUG_INFO, + "%a: Length 0x%lx is not a multiple of the blocksize 0x%lx, ignori= ng\n", + __FUNCTION__, Length, *BlockSize)); + Status =3D EFI_INVALID_PARAMETER; + continue; + } + + if ((Address >=3D FvbBaseAddress) && + ((Address + Length) <=3D + (FvbBaseAddress + (*BlockSize * NumberOfBlocks)))) { *OutFvb =3D Fvb; - Status =3D EFI_SUCCESS; + *Lba =3D (Address - FvbBaseAddress) / *BlockSize; + Status =3D EFI_SUCCESS; break; } =20 @@ -191,9 +213,7 @@ PerformFlashWriteWithProgress ( EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL *Fvb; EFI_STATUS Status; UINTN BlockSize; - UINTN NumberOfBlocks; EFI_LBA Lba; - EFI_PHYSICAL_ADDRESS FvbBaseAddress; UINTN NumBytes; EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION Black; EFI_GRAPHICS_OUTPUT_BLT_PIXEL_UNION White; @@ -227,7 +247,7 @@ PerformFlashWriteWithProgress ( // that covers the system firmware // Fvb =3D NULL; - Status =3D GetFvbByAddress (FlashAddress, &Fvb, &FvbBaseAddress); + Status =3D GetFvbByAddress (FlashAddress, Length, &Fvb, &Lba, &BlockSize= ); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "%a: failed to locate FVB handle for address 0x%llx - %r\n", @@ -235,28 +255,6 @@ PerformFlashWriteWithProgress ( return Status; } =20 - Status =3D Fvb->GetBlockSize(Fvb, 0, &BlockSize, &NumberOfBlocks); - if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "%a: failed to get FVB blocksize - %r\n", - __FUNCTION__, Status)); - return Status; - } - - if ((Length % BlockSize) !=3D 0) { - DEBUG ((DEBUG_ERROR, - "%a: Length 0x%lx is not a multiple of the blocksize 0x%lx\n", - __FUNCTION__, Length, BlockSize)); - return EFI_INVALID_PARAMETER; - } - - Lba =3D (FlashAddress - FvbBaseAddress) / BlockSize; - if (Lba > NumberOfBlocks - 1) { - DEBUG ((DEBUG_ERROR, - "%a: flash device with non-uniform blocksize not supported\n", - __FUNCTION__)); - return EFI_UNSUPPORTED; - } - // // Remap the region as device rather than uncached. // --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel From nobody Thu Dec 26 22:28:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 152890731904942.6799408971973; Wed, 13 Jun 2018 09:28:39 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 90017212746E5; Wed, 13 Jun 2018 09:28:35 -0700 (PDT) Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) (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 E9BA7212733E4 for ; Wed, 13 Jun 2018 09:28:33 -0700 (PDT) Received: by mail-wm0-x244.google.com with SMTP id n5-v6so6547417wmc.5 for ; Wed, 13 Jun 2018 09:28:33 -0700 (PDT) Received: from dogfood.home ([2a01:cb1d:112:6f00:6dfc:b76c:4240:35ff]) by smtp.gmail.com with ESMTPSA id s191-v6sm6234782wmd.27.2018.06.13.09.28.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Jun 2018 09:28:31 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::244; helo=mail-wm0-x244.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=oSC3QiYXuo7vF2NE8qh7dnb1L7wt+1/sR2zveKZmqmE=; b=Otqr7Wk7REka1PD/VX/XezYNtGYONKTIL+GQmVPRVWE12hReDB9xVcOByflVsfVwrb ATGrOMmAuUJ2eyBlHPabStyOLwIiAmc6ob2xaLcSguMA2as802+z42tr4nqTKC6PYaMw jCOYMwiTZ5sAi3VOtqUuOcBHxrmsMfKVP8OsE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=oSC3QiYXuo7vF2NE8qh7dnb1L7wt+1/sR2zveKZmqmE=; b=XDgzaHoX+wMFunPDD+B38psMjd8GmmDJoq/36/Ez6sMqE9eK+1ee2aRob4sthYd1Kh O5345IzrnsXbDJpjxR5wBm4nJi+Y5qrn2lF+esxt+mNG0okIZJ7f+5/I8TPUyCS+Tu0w e/uN5lJcudi/wlIpZBqtSHfCzhA1MwmG+dWkP+DAbuwKbzOIu4CvCbKf3GPAzqbiwBRa gBVq88F9BvphnjQ1bF03gFVDVId+xF2qBHTfMwY1bKaPLbeGjyl3/g0mtOBdDk9RHNx2 teQiLiaMR9AKQAanvKK+QaJgNWI1uQGcF4VA1SS2LJzau2p7W5ANjykmDLTF6qf7cHxr lYag== X-Gm-Message-State: APt69E0pJEq5qahXbOSpbWURHBv4AJoj8oPbaPnnHw4Hn+o9Q+C2UlR6 fm1A13qchCmo0gnDGCK3rJli/d+QiRk= X-Google-Smtp-Source: ADUXVKIRYrpZ6znJKJ+ZF55vDTiOiQKqLaSQGWhFwIuw26Q/LdIIgngRvQlx+Bh+V75tRXDXuA77xw== X-Received: by 2002:a1c:903:: with SMTP id 3-v6mr4087677wmj.130.1528907312289; Wed, 13 Jun 2018 09:28:32 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 13 Jun 2018 18:28:26 +0200 Message-Id: <20180613162826.19986-3-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180613162826.19986-1-ard.biesheuvel@linaro.org> References: <20180613162826.19986-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms v2 2/2] Silicon/NorFlashSynQuacerLib: describe entire firmware region as FV X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: leif.lindholm@linaro.org, Ard Biesheuvel MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" In order to allow for more flexibility when updating parts of the firmware via capsule update, expand the description of the code FV to cover the entire 4 MB region at the base of the NOR flash. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/NorFlashSynQuacer= .c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/NorFl= ashSynQuacer.c b/Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/N= orFlashSynQuacer.c index 816d8ba33f8c..d44fe3e4e94c 100644 --- a/Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/NorFlashSynQ= uacer.c +++ b/Silicon/Socionext/SynQuacer/Library/NorFlashSynQuacerLib/NorFlashSynQ= uacer.c @@ -19,12 +19,20 @@ =20 #include =20 +#define FW_CODE_REGION_BASE SYNQUACER_SPI_NOR_BASE +#define FW_CODE_REGION_SIZE (FW_ENV_REGION_BASE - FW_CODE_REGION_BASE) + +#define FW_ENV_REGION_BASE FixedPcdGet32 (PcdFlashNvStorageVariableBase) +#define FW_ENV_REGION_SIZE (FixedPcdGet32 (PcdFlashNvStorageVariableSize)= + \ + FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSiz= e) + \ + FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize)) + STATIC NOR_FLASH_DESCRIPTION mNorFlashDevices[] =3D { { // UEFI code region SYNQUACER_SPI_NOR_BASE, // device base - FixedPcdGet64 (PcdFdBaseAddress), // region base - FixedPcdGet32 (PcdFdSize), // region size + FW_CODE_REGION_BASE, // region base + FW_CODE_REGION_SIZE, // region size SIZE_64KB, // block size { 0x19c118b0, 0xc423, 0x42be, { 0xb8, 0x0f, 0x70, 0x6f, 0x1f, 0xcb, 0x= 59, 0x9a } @@ -33,10 +41,8 @@ STATIC NOR_FLASH_DESCRIPTION mNorFlashDevices[] =3D { { // Environment variable region SYNQUACER_SPI_NOR_BASE, // device base - FixedPcdGet32 (PcdFlashNvStorageVariableBase), // region base - FixedPcdGet32 (PcdFlashNvStorageVariableSize) + - FixedPcdGet32 (PcdFlashNvStorageFtwWorkingSize) + - FixedPcdGet32 (PcdFlashNvStorageFtwSpareSize), // region size + FW_ENV_REGION_BASE, // region base + FW_ENV_REGION_SIZE, // region size SIZE_64KB, // block size { 0x3105bd7a, 0x82c3, 0x486f, { 0xb1, 0x03, 0x1e, 0x09, 0x54, 0xec, 0x= 85, 0x75 } --=20 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel