From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from EUR04-HE1-obe.outbound.protection.outlook.com (EUR04-HE1-obe.outbound.protection.outlook.com [40.107.7.70]) by mx.groups.io with SMTP id smtpd.web10.4367.1594184281973736013 for ; Tue, 07 Jul 2020 21:58:02 -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=FF4w6i16; spf=pass (domain: oss.nxp.com, ip: 40.107.7.70, mailfrom: pankaj.bansal@oss.nxp.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E0zEbicY4DhOHlfWlRfNEbSlZ6PqkePhzdxusNqG3WN9c0xwRig91FYwzegqMXazQU43Ccvr73ssmlO/NM2mZPev0LrVS/bwFQJ36Io7CB6GbfPBPNBBz135cB9cso9vl8fofWXID0HD/deg7L/l9MmTqsX0+Zp/c7Htl5RYTTh8nXXKs2Swo82nYY7Z2E7k9Bd1xdWzv4GKgK4tkrTsMNxf1pJJ1LXjHuQhwbS5NFAfhi5dVzYPFUYba9Cp4Wc2cIuVFJbcpw9yQYNPl+mKTN9mHUt4Ncgqwnnhho85WeGJwi3L9MhzyYlJLAVYpBQyyIsRxuhQnJQxX66s7UXH9w== 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=9WMUubFyyRqrmqB+AsLldN4ctzLvemS/PiOVIg6GaSo=; b=EwAutNSeCg1119XsvH9BRz1l6gpys/Bj1Znw7x8e6rX1ORPxJ7vqktlOxucTeDvVaIq0wskuOa8lcWRDQ5+NBeSNeAxjc/e8ADM62DU2Jag0i7wR9Q7REua4Yh6PkGkAa2zMXEH6LzJdLUYSei9yZnWNwMSLYMKgNg87j9nao4pXyCAUHPKA/kFPmJsGh6+u+7sfRcnS3kxSEBpJTYaJQezYv7ONkiNwfQd5kBuR8LV2ZI+no4szWGxvHRWmbv9ACnssCYlM6Vf2SNmCL87O7Edlc81Q0eRm+6nYao1p+Z8rbh/+z+LicGaGJ7dKwM6KbY0zWbfUfN8Z+SAlgDSQng== 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=9WMUubFyyRqrmqB+AsLldN4ctzLvemS/PiOVIg6GaSo=; b=FF4w6i16AgWAeSGtmIaaeyJPliFzgkWGEeHWmRqa1ap/qxaFIbTWHn2U3TJX4c5IDFpvKZg3m4jYzx7fM6PD9TNd1mXpPHXXALdlF2WJ/KYgSac5YkrfCTFMF7FpNnwvJ3sRax0Alpn0RU/lpQWcoKSFdZwZDC3DP71IBloNvv0= 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 VI1PR04MB5933.eurprd04.prod.outlook.com (2603:10a6:803:ec::16) by VI1PR04MB6781.eurprd04.prod.outlook.com (2603:10a6:803:13d::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.21; Wed, 8 Jul 2020 04:57:59 +0000 Received: from VI1PR04MB5933.eurprd04.prod.outlook.com ([fe80::4521:b667:cf06:b79b]) by VI1PR04MB5933.eurprd04.prod.outlook.com ([fe80::4521:b667:cf06:b79b%7]) with mapi id 15.20.3174.021; Wed, 8 Jul 2020 04:57:59 +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 v3 5/5] Platform/NXP/LS1046aFrwyPkg: Add VarStore Date: Tue, 7 Jul 2020 23:57:19 -0500 Message-ID: <20200708045719.2648-6-pankaj.bansal@oss.nxp.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200708045719.2648-1-pankaj.bansal@oss.nxp.com> References: <20200708045719.2648-1-pankaj.bansal@oss.nxp.com> X-ClientProxiedBy: BY3PR05CA0001.namprd05.prod.outlook.com (2603:10b6:a03:254::6) To VI1PR04MB5933.eurprd04.prod.outlook.com (2603:10a6:803:ec::16) Return-Path: pankaj.bansal@oss.nxp.com MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from TFTPTOUEFI.am.freescale.net (64.157.242.222) by BY3PR05CA0001.namprd05.prod.outlook.com (2603:10b6:a03:254::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3174.12 via Frontend Transport; Wed, 8 Jul 2020 04:57:56 +0000 X-Mailer: git-send-email 2.17.1 X-Originating-IP: [64.157.242.222] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5246cf27-4f15-4f9b-77f1-08d822fb7c5a X-MS-TrafficTypeDiagnostic: VI1PR04MB6781: 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-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: CmW5+HFNJBUsKS5SxdqQvolsB/H215TayD8BtQAn7VId1eOar9JHu9VW9ma+KcCjTnyXBdTI0EQgo0vIhvkCFQQMTlB3hnSlr5v2WOSfPQ2ppNei4oFw8Q+OdZzyLunlD0vmn5tMCCbp3cHD50zh3sOunWL6QJizHIaDEiRjSNOOXn6LlR2bQu2as0LnBxrxoARQeBV8I7hyYLyiJJNSvymPbn6zhXKNAWgGQxhtw6p7f73KvaHVmi170THFsYEncHL1CVrqa5TQR3Y1POsKE9leUU9CiHcTRDq7RfZSmgLgwwFDt3n7zenswD8lRGBTwpQLrXYOpYKyO7MX4byJe7CdtqQkWRC7ChZgDtRJ5sbDtD9kn0zGD39ts87/G2Rx X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:VI1PR04MB5933.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFTY:;SFS:(4636009)(366004)(39860400002)(396003)(346002)(136003)(376002)(6512007)(52116002)(6666004)(83380400001)(66556008)(66476007)(5660300002)(6506007)(316002)(44832011)(66946007)(2906002)(19627235002)(16526019)(8936002)(110136005)(86362001)(186003)(8676002)(1076003)(478600001)(956004)(6486002)(26005)(2616005)(921003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData: 3o7RXVEUhlOws+mrMNCTrk3D4GLxzQrLi8BdEh6grhbZduURuYvWmmm02hXIE0Ccd6LQROMV+O/Pl3U564RdayBcBMDmSIGikh4gxhlmYUg6gEbdHJk5oBOV3ukKm6qd2tAjHscyeWnSvsKL54vRzloCAE9vydVmgnaIeGOJD39mqvXj1Guu1MY1IMECSOMCG+j9iuDx7H1pMNC3/w8OheqCVZk5IzqkfD9srOoBK7P1lDKazWetc8bDhh+Oek8d5dxnS0p21BXb60mxhXNRo+suESuBOT84a3Yv0E4Kh3CVHBGfZF6ceanTAzg8za3ekrZBgPyKGUsxVBqh0bJ/OutmN2EjK1+vXto3I7b5RyruMmT+IOyeGP0dLrWvZWG9O7fFhVlR9/8x1H34FCn4VLq5K7qG0QicKApiIZoSbAql8mHPmEDIbW+ePGlfQxaLahuZu5w6IYwb3lMgGruoFvi5n8pe4Ft3Cn3cRsKVy/0= X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5246cf27-4f15-4f9b-77f1-08d822fb7c5a X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5933.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2020 04:57:59.5052 (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: 7dwRIL19yxRJh3ur327SM1J7jSg3WN8KP3+wz0ft5oakzrdYobaUpF8TEuf4sMCSsVZkFKYLrWdD11uF9ldYqQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR04MB6781 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 Reviewed-by: Leif Lindholm --- Notes: V3: - Added Reviewed-by: Leif Lindholm =20 V2: - No change 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 @@ [FD.LS1046AFRWY_EFI] 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