From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR04-DB3-obe.outbound.protection.outlook.com (EUR04-DB3-obe.outbound.protection.outlook.com [40.107.6.61]) by mx.groups.io with SMTP id smtpd.web10.10525.1591104408141825773 for ; Tue, 02 Jun 2020 06:26:48 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@nxp1.onmicrosoft.com header.s=selector2-nxp1-onmicrosoft-com header.b=Q38jRryX; spf=pass (domain: oss.nxp.com, ip: 40.107.6.61, mailfrom: pankaj.bansal@oss.nxp.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nopEZftIHZaPPUiazRGtT07UwTIWoGl2c/FVozBo+okqNgP7ik3Pl4FJSDwQ4tglGK9JqfXS2vgm3fIMdgZgUFBEu+XI9UGP0I2FZWJhynlQl+UE6QbjHShPIcyN+NM+Osw562vjT/iNCU+R+9RVw2F5cuN/QKUzZQ9rWgkE9e8tGOT87ZkmfmfjjHAI3HjC2tWhIOBGYvGHGZsG6dMjRwR4IAzwPb6yjLqCCd56LmMKiTh9wkOqtjb+vcU5mKMoRcBfeqAnuoQ/eozo650oyliyncjV14MuPkHaJFLCothXj4AikVmw/BgalSo/UTSyZl+9oKrzR/TzdfOE1dq47g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QFsuNa7JIWvuZKTb8wjBL47pc1fd5CXkmUPcBg2sMPY=; b=PBgnN12kwvS1tDr5tVt9k8McNWk/9pWckkHkhwLzb54SkwfBrIF/yHJdxEyTWquwqclXDKtrT+O+cNqUhvnnBj31FKfIsKhQl9hwNB2WlZ5iNCBZQJLeGlMf2wihH/Acp4BJqyGIN+vyXaZjT9nfFdq3sQ/G/DyBP6Fhxid0A8eJ9/RlkdCoWm1iScoR8CffBQUkKL4wneFZvrVLttG1cX6frI2w4PrYZduliUfzcDNYRvSkJr4GpplcU5P+Fh8na+42PMsjX5Tih/fyYCOBHx3LhXRUFLsyzTzpErLvC5fwDY18vrUHSC44JiOwFe+JtuUcybE5J560dkHYV0px7Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QFsuNa7JIWvuZKTb8wjBL47pc1fd5CXkmUPcBg2sMPY=; b=Q38jRryXm4tOXEEOWS3Qy9tPrGvAiyOPD9+0q/d4DZcPBISQvaHs+46dbEzzYlJlOsn0DFEpfp0hMLkFnMg2gDltE3I0Xb/UjSLe7hy89zMrqlUUkYFdqS1o+AAoUcKK3csajLACxQfrJhGiFpckJgYstZ3yiSrISFAP4J5GBsw= Authentication-Results: nuviainc.com; dkim=none (message not signed) header.d=none;nuviainc.com; dmarc=none action=none header.from=oss.nxp.com; Received: from AM6PR04MB5926.eurprd04.prod.outlook.com (2603:10a6:20b:af::31) by AM6PR04MB5702.eurprd04.prod.outlook.com (2603:10a6:20b:b0::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3045.17; Tue, 2 Jun 2020 13:26:46 +0000 Received: from AM6PR04MB5926.eurprd04.prod.outlook.com ([fe80::64fa:9421:3ffb:eed7]) by AM6PR04MB5926.eurprd04.prod.outlook.com ([fe80::64fa:9421:3ffb:eed7%4]) with mapi id 15.20.3066.018; Tue, 2 Jun 2020 13:26:46 +0000 From: "Pankaj Bansal" To: Leif Lindholm , Meenakshi Aggarwal , Michael D Kinney , devel@edk2.groups.io, Varun Sethi , Samer El-Haj-Mahmoud , Augustine Philips , Ard Biesheuvel , Arokia Samy , Kuldip Dwivedi Subject: [PATCH edk2-platforms 5/5] Platform/NXP/LS1046aFrwyPkg: Add VarStore Date: Tue, 2 Jun 2020 18:55:03 +0530 Message-ID: <20200602132503.27154-6-pankaj.bansal@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200602132503.27154-1-pankaj.bansal@oss.nxp.com> References: <20200602132503.27154-1-pankaj.bansal@oss.nxp.com> X-ClientProxiedBy: SG2PR02CA0109.apcprd02.prod.outlook.com (2603:1096:4:92::25) To AM6PR04MB5926.eurprd04.prod.outlook.com (2603:10a6:20b:af::31) Return-Path: pankaj.bansal@oss.nxp.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from uefi-workstation.ap.freescale.net (92.120.0.69) by SG2PR02CA0109.apcprd02.prod.outlook.com (2603:1096:4:92::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3066.18 via Frontend Transport; Tue, 2 Jun 2020 13:26:42 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [92.120.0.69] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 09ae5781-dd04-4633-e0eb-08d806f898b6 X-MS-TrafficTypeDiagnostic: AM6PR04MB5702: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-LD-Processed: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635,ExtAddr X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-Forefront-PRVS: 0422860ED4 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: B1cnkVFIXoM0+EKsgWkyUJg/gwg5wZGEPX2BjbPwTxWilUETLY7ea+vPywXXxs8FOXlN7+OuylpJBRU/pen/xaWSYtvC3It5TUcnarM8W/IJNpqztGvPPz2BD5M1C4l5eYyj6Xm2AhbAVlzeQ0+yr9ZVeetnHkc2ozLITQPbVI5m4bD92nal2f376JFkLUY9Z6yU86hsAbkcgZ8sfARmJI5KQndh93CGX8KV9KaZCvLeYohni8Tuj2wKxJPWiHXNbsjAr7jkNPM0im1uAGA5a4wqiMe5j8nbFSkWYTZSxWgDsiyCVR5bzJncwVG4Fw6aeU1i1ZeCbmUK26AdGUJJJlSMgi4fr9ST71zagGMaheKof9i9uC/LyQ0gFo/+aBid X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM6PR04MB5926.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(2906002)(66946007)(2616005)(956004)(498600001)(66476007)(66556008)(8936002)(83380400001)(8676002)(19627235002)(5660300002)(186003)(86362001)(6666004)(16526019)(44832011)(110136005)(1076003)(6486002)(6506007)(6512007)(26005)(52116002)(921003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: zII7+HP8YM5xfmxTKGY7oB38OthCTgKZbVbukctoRCpvERvOaWJWDjryiBpnR7M6H0Vz54xJ1ln+ULfjxxitaCSex6eSzSXo9g7dfYITUQn/GvMzX+vUOL2ZriQKAuf9Gz5uU43PNEwO8QiOw5DJxqjP/awnfUFGuaZZNIuL+n8b8Xz45+Ag8Y1CC14nNbNC/vh+58XrbpzMmmXgmZP49/k9GanpBZ8bQbTvwmpcRh3aZEZbHZeGMRFlwSonZEh8oSeu/sSZzwmKelzUBufSSWfB0rbflQ0gC4wkVje1Yw0vXEBKQzAITScKZqeTEsO6DcL41L+yTb3fx58AHYqYuVYKd427GE/nkwifYt1vR3uIE++NZO3TU1fBIcsEgjJQ9NLWoEC+FGelbCh/p9nv/hF7oEQvoilbbTSKOVkMi4aqXeh9A1hZyD/O0s7z4PLWSJNLas6PU8pB/3H+1EQ80lfo9vfw3+axBOp6mP6dK18= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 09ae5781-dd04-4633-e0eb-08d806f898b6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jun 2020 13:26:45.9591 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: h/+A4iGevQqYMW/4iOIOJ4PCeKVqxyPO9tk2rtTWkJT23swQkQd+5dVu+IcVC7Cvx9mgrLRnrp7B94NZ269esg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR04MB5702 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain From: Pankaj Bansal Add VarStore Fd. This Fd is used to store non volatile variables in flash. Signed-off-by: Pankaj Bansal --- Platform/NXP/LS1046aFrwyPkg/LS1046aFrwyPkg.fdf | 1 + Platform/NXP/LS1046aFrwyPkg/VarStore.fdf.inc | 91 ++++++++++++++++++++ 2 files changed, 92 insertions(+) diff --git a/Platform/NXP/LS1046aFrwyPkg/LS1046aFrwyPkg.fdf b/Platform/NXP/= LS1046aFrwyPkg/LS1046aFrwyPkg.fdf index 8da5b57cb49e..24af547729c7 100644 --- a/Platform/NXP/LS1046aFrwyPkg/LS1046aFrwyPkg.fdf +++ b/Platform/NXP/LS1046aFrwyPkg/LS1046aFrwyPkg.fdf @@ -48,6 +48,7 @@ gArmTokenSpaceGuid.PcdFvBaseAddress|gArmTokenSpaceGuid.Pc= dFvSize FV =3D FVMAIN_COMPACT =20 !include Platform/NXP/FVRules.fdf.inc +!include VarStore.fdf.inc ##########################################################################= ###### # # FV Section diff --git a/Platform/NXP/LS1046aFrwyPkg/VarStore.fdf.inc b/Platform/NXP/LS= 1046aFrwyPkg/VarStore.fdf.inc new file mode 100644 index 000000000000..727705feaea1 --- /dev/null +++ b/Platform/NXP/LS1046aFrwyPkg/VarStore.fdf.inc @@ -0,0 +1,91 @@ +## @file +# FDF include file with FD definition that defines an empty variable stor= e. +# +# Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved. +# Copyright (C) 2014, Red Hat, Inc. +# Copyright (c) 2016, Linaro, Ltd. All rights reserved. +# Copyright (c) 2016, Freescale Semiconductor. All rights reserved. +# Copyright 2017-2020 NXP +# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +## + +[FD.LS1046aFrwyNv_EFI] +BaseAddress =3D 0x40500000 #The base address of the FLASH device +Size =3D 0x000C0000 #The size in bytes of the FLASH device +ErasePolarity =3D 1 +BlockSize =3D 0x1000 +NumBlocks =3D 0xC0 + +# +# Place NV Storage just above Platform Data Base +# +DEFINE NVRAM_AREA_VARIABLE_BASE =3D 0x00000000 +DEFINE NVRAM_AREA_VARIABLE_SIZE =3D 0x00040000 +DEFINE FTW_WORKING_BASE =3D $(NVRAM_AREA_VARIABLE_B= ASE) + $(NVRAM_AREA_VARIABLE_SIZE) +DEFINE FTW_WORKING_SIZE =3D 0x00040000 +DEFINE FTW_SPARE_BASE =3D $(FTW_WORKING_BASE) + $= (FTW_WORKING_SIZE) +DEFINE FTW_SPARE_SIZE =3D 0x00040000 + +##########################################################################= ### +# LS1046AFRWY NVRAM Area +# LS1046AFRWY NVRAM Area contains: Variable + FTW Working + FTW Spare +##########################################################################= ### + + +$(NVRAM_AREA_VARIABLE_BASE)|$(NVRAM_AREA_VARIABLE_SIZE) +gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64|gEfiMdeModu= lePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize +#NV_VARIABLE_STORE +DATA =3D { + ## This is the EFI_FIRMWARE_VOLUME_HEADER + # ZeroVector [] + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + # FileSystemGuid: gEfiSystemNvDataFvGuid =3D + # { 0xFFF12B8D, 0x7696, 0x4C8B, + # { 0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50 }} + 0x8D, 0x2B, 0xF1, 0xFF, 0x96, 0x76, 0x8B, 0x4C, + 0xA9, 0x85, 0x27, 0x47, 0x07, 0x5B, 0x4F, 0x50, + # FvLength: Flash Size : 0x4000000 + 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, + # Signature "_FVH" # Attributes + 0x5f, 0x46, 0x56, 0x48, 0x36, 0x0E, 0x00, 0x00, + # HeaderLength # CheckSum # ExtHeaderOffset #Reserved #Revision + 0x48, 0x00, 0x08, 0xA6, 0x00, 0x00, 0x00, 0x02, + # Blockmap[0]: 0x4000 Blocks * 0x1000 Bytes / Block =3D SIZE_64MB + 0x00, 0x40, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, + # Blockmap[1]: End + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + ## This is the VARIABLE_STORE_HEADER + # It is compatible with SECURE_BOOT_ENABLE =3D=3D FALSE as well. + # Signature: gEfiVariableGuid =3D + # { 0xddcf3616, 0x3275, 0x4164, + # { 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d }} + 0x16, 0x36, 0xcf, 0xdd, 0x75, 0x32, 0x64, 0x41, + 0x98, 0xb6, 0xfe, 0x85, 0x70, 0x7f, 0xfe, 0x7d, + # Size: 0x40000 (gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariabl= eSize) - + # 0x48 (size of EFI_FIRMWARE_VOLUME_HEADER) =3D 0x3ffb8 + # This can speed up the Variable Dispatch a bit. + 0xB8, 0xFF, 0x03, 0x00, + # FORMATTED: 0x5A #HEALTHY: 0xFE #Reserved: UINT16 #Reserved1: UINT32 + 0x5A, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 +} + +$(FTW_WORKING_BASE)|$(FTW_WORKING_SIZE) +gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase64|gEfiMdeMo= dulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize +#NV_FTW_WORKING +DATA =3D { + # EFI_FAULT_TOLERANT_WORKING_BLOCK_HEADER->Signature =3D gEdkiiWorkingBl= ockSignatureGuid =3D + # { 0x9e58292b, 0x7c68, 0x497d, { 0xa0, 0xce, 0x65, 0x0, 0xfd, 0x9f, 0= x1b, 0x95 }} + 0x2b, 0x29, 0x58, 0x9e, 0x68, 0x7c, 0x7d, 0x49, + 0xa0, 0xce, 0x65, 0x0, 0xfd, 0x9f, 0x1b, 0x95, + # Crc:UINT32 #WorkingBlockValid:1, WorkingBlockInvalid:1, Res= erved + 0x5b, 0xe7, 0xc6, 0x86, 0xFE, 0xFF, 0xFF, 0xFF, + # WriteQueueSize: UINT64 + 0xE0, 0xFF, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00 +} + +$(FTW_SPARE_BASE)|$(FTW_SPARE_SIZE) +gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase64|gEfiMdeModu= lePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize +#NV_FTW_SPARE --=20 2.17.1