From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D9B401A1E3E for ; Thu, 29 Sep 2016 19:42:36 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP; 29 Sep 2016 19:42:36 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,418,1473145200"; d="scan'208";a="767404060" Received: from jyao1-mobl.ccr.corp.intel.com ([10.254.213.40]) by FMSMGA003.fm.intel.com with ESMTP; 29 Sep 2016 19:42:35 -0700 From: Jiewen Yao To: edk2-devel@lists.01.org Cc: Feng Tian , Eric Dong Date: Fri, 30 Sep 2016 10:42:26 +0800 Message-Id: <1475203346-16788-1-git-send-email-jiewen.yao@intel.com> X-Mailer: git-send-email 2.7.4.windows.1 Subject: [PATCH] MdeModulePkg/CdExpressPei: Fix capsule size mismatch issue. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Sep 2016 02:42:37 -0000 Current PeiCdExpress driver will return capsule size to be block aligned. It will fail if we check the capsuleImageSize field. The patch correct the returned capsule size. Tested-by: Eric Dong Cc: Feng Tian Cc: Eric Dong Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiewen Yao --- MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c | 9 +++++---- MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c index f78118a..371ab73 100644 --- a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c +++ b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.c @@ -1,7 +1,7 @@ /** @file Source file for CD recovery PEIM -Copyright (c) 2006 - 2015, Intel Corporation. All rights reserved.
+Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
This program and the accompanying materials are licensed and made available under the terms and conditions @@ -477,13 +477,14 @@ RetrieveCapsuleFileFromRoot ( } PrivateData->CapsuleData[PrivateData->CapsuleCount].CapsuleStartLBA = FileRecord->LocationOfExtent[0]; - PrivateData->CapsuleData[PrivateData->CapsuleCount].CapsuleSize = + PrivateData->CapsuleData[PrivateData->CapsuleCount].CapsuleBlockAlignedSize = ( FileRecord->DataLength[0] / PEI_CD_BLOCK_SIZE + 1 ) * PEI_CD_BLOCK_SIZE; + PrivateData->CapsuleData[PrivateData->CapsuleCount].CapsuleSize = FileRecord->DataLength[0]; return EFI_SUCCESS; } @@ -659,7 +660,7 @@ LoadRecoveryCapsule ( BlockIo2Ppi, PrivateData->CapsuleData[CapsuleInstance - 1].IndexBlock, PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleStartLBA, - PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleSize, + PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleBlockAlignedSize, Buffer ); } else { @@ -668,7 +669,7 @@ LoadRecoveryCapsule ( BlockIoPpi, PrivateData->CapsuleData[CapsuleInstance - 1].IndexBlock, PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleStartLBA, - PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleSize, + PrivateData->CapsuleData[CapsuleInstance - 1].CapsuleBlockAlignedSize, Buffer ); } diff --git a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h index 5ca2672..91f34dc 100644 --- a/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h +++ b/MdeModulePkg/Universal/Disk/CdExpressPei/PeiCdExpress.h @@ -66,6 +66,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. typedef struct { UINTN CapsuleStartLBA; UINTN CapsuleSize; + UINTN CapsuleBlockAlignedSize; UINTN IndexBlock; EFI_PEI_RECOVERY_BLOCK_IO_PPI *BlockIo; EFI_PEI_RECOVERY_BLOCK_IO2_PPI *BlockIo2; -- 2.7.4.windows.1