From patchwork Wed Aug 31 12:55:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Garg X-Patchwork-Id: 664475 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 3sPKLW1mb2z9snm for ; Wed, 31 Aug 2016 19:08:35 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4214A4B951; Wed, 31 Aug 2016 11:08:33 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UZv9NfOXkHTX; Wed, 31 Aug 2016 11:08:32 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 43C9B4B68A; Wed, 31 Aug 2016 11:08:32 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E912F4B68A for ; Wed, 31 Aug 2016 11:08:28 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2EWG1IjGYtYW for ; Wed, 31 Aug 2016 11:08:28 +0200 (CEST) X-Greylist: delayed 8271 seconds by postgrey-1.34 at theia; Wed, 31 Aug 2016 11:08:25 CEST X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from NAM02-BL2-obe.outbound.protection.outlook.com (mail-bl2nam02on0082.outbound.protection.outlook.com [104.47.38.82]) by theia.denx.de (Postfix) with ESMTPS id 4A1A54B656 for ; Wed, 31 Aug 2016 11:08:25 +0200 (CEST) Received: from BN3PR0301CA0011.namprd03.prod.outlook.com (10.160.180.149) by CY4PR03MB2437.namprd03.prod.outlook.com (10.168.163.139) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.599.9; Wed, 31 Aug 2016 06:34:33 +0000 Received: from BY2FFO11FD042.protection.gbl (2a01:111:f400:7c0c::131) by BN3PR0301CA0011.outlook.office365.com (2a01:111:e400:4000::21) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.609.9 via Frontend Transport; Wed, 31 Aug 2016 06:34:32 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11FD042.mail.protection.outlook.com (10.1.14.227) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.587.6 via Frontend Transport; Wed, 31 Aug 2016 06:34:32 +0000 Received: from localhost.localdomain.ap.freescale.net ([10.232.14.31]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u7V6YTBV029304; Tue, 30 Aug 2016 23:34:30 -0700 From: Sumit Garg To: Date: Wed, 31 Aug 2016 08:55:00 -0400 Message-ID: <1472648100-7748-1-git-send-email-sumit.garg@nxp.com> X-Mailer: git-send-email 1.8.1.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131170988732407521; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(15404003)(86362001)(8666005)(2906002)(356003)(106466001)(87936001)(97736004)(2351001)(7846002)(305945005)(4326007)(36756003)(85426001)(229853001)(50986999)(586003)(47776003)(81156014)(19580395003)(8936002)(68736007)(33646002)(105606002)(189998001)(110136002)(8676002)(11100500001)(81166006)(50226002)(5003940100001)(50466002)(5660300001)(19580405001)(48376002)(626004)(77096005)(104016004)(92566002)(7059030)(21314002)(4720700001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2437; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD042; 1:iqHcaqNQfEzfnI7ZzDQSv/lxKLU0QKqWaf6DoeT7Waw75pk7AVTW2B1oXikPO/0SaN9D2TXWRWqi0QCqFAUXhEiL+gSa1xilswsmaEK2jyNFvnk4nbGcEF6Y72DTzWUHnUx+Z9iva0eaKIahq7GcHV3gY40h1EfwK0aeoGqwhmOXhbKtiJ/sRW+m17bXH8pjYkIRJgbLeoJKIUeYLdh51prY13G991rfd1T0ECdTqB17Y/VHqBWl/+rwJU3ulkCubWuir5Y5pitZaunWGDYiik0sQ9B7CfljweUveAF0rWqMUsxj7MBCO7CLfKBv4s7NaQzChaCgeRrCTeP5TGKQUQ0V/Ams1x+A8t7BiiESC0RNsLQ3/OCCgxtUHqWGkJaew6V1PRcL8UvBuvJqDf/DEMRDAr7a62xMzP1wcfmMC7zv2iqKGbZb7u7d0BpudLr9SKFBkte67Plkqe1Pr7eSDHmekSxtlYS6PJemoB1Qbuh7pUVcLBdGICfGlEgUCgay2f00tentS6qqt4OyBGst9Fue6oMsGhkuOcfz0/yi6XAzz8AGsDmLJIbnLuc5i15W1SyOeFjlptUWyQhrBiQpx6C3PrQJAwx2ZfDQwZlZESiUizVXRr7+WDNWigqL7JVCZCbpGL8dj2twqFr/OvS/Vnzzql/0RRqmJfxQLddSDaYOFCKjziCrD0QdiSc9iUHFMN3JIGn0IjrZkmS6fsYwms/prjyt/QP6IB5686prseM= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 6dd7eb93-2570-4404-53d9-08d3d168de9f X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2437; 2:SvhU8yMowDO4IWfF3OdwUZ114sb0u2lhWeM0616HRvDNvjouU/yRA9InYx2ZVp2gkh0VfOQKNyTjE4T1hx2KTrqyNMW6NDt9Opqpp5CVlgPTONnUCh53BH/YvS4DPuCfLkLM7mv05p/usyDpe2Jf7pKiaZWzlvyTpXSq4gInhwK2/mbrth0vf5wM1+C2iuGo; 3:ojMRDcuzz+wlvr7kkpH81OfHfHfTs1r8jUl4jekQx43G6mbzTdjycDnUaEz6MgodTOJq/fRBm85BE8WsrLo8v/pIb144uM/JGSl9Ry9NlqhcAHOqkXWUcRLirTdTUORGgoEIc/VnsRQQlmm8kSfFdwZDyTPsO8qo7YFGaudVjkCQ6v9w/FH8MPrbyWEh2roVJQgmD+m+sMpAxTqKYQ3EW27lhHYdKkcNCTHQFGsn+Ao= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY4PR03MB2437; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2437; 25:DRvNDP2lKghccOvIj7jOqtB/B6B2/xSPTD6Q0u+Abmti5bMzsh8NTe370zzUCxJ9mTcNefUPFcz66HNyhh0ZLpWeOcZGJ3Vue2OLVHoVpV1rj0ef2buXDx7FJSII3G87J1nhxTSWwkd17x7HZg1iWgsJXKpYEmz10oAbFDLmghOZ1cUDSh0EIOki/Y2ISXrwT++8fL0BRliFFKvS+NqUaTj9CKWAbqxEY78zGQUTgNYeduiRjuR/Ko7YmHFONHeEVUgXpJ6f1Wp/mk5TPe/+5d1LhN5Y0SXc3LxDxlgtQrjo/KUxYY5Xu+O3YRGUFbNndAY8sLWmQNiP94tsdc2BdMwzdpQrNJ/ER9eB0y3mPSjOtn2giq0+Vu+mydilJ2BmwupLqzZcFLl5TuAAEdxc73rfKopLm1f5FrTq3SR8Z1pfnwSrANJaUAiRmvb3PaC50LYOKcPKfghLejdBX7315u7c/WJQPVEo79F7y/4bHhgGncWnyZI3567LwmP0if3d7dFcSNG4bbVJrDzMZbDYDSKf7+QmSjZQCMtkzeOxLbAjlWDuG7oXVWlF3X9Hls2xxQrqXfkDa6FpBO9pUCnWkpn/G9N9hcjaiBLXlKFc9BmNsu+YT7scJ0PlktYoK9cLDouZ+9usGGFHEgTQGxJ+PIzPxYxDvM2DdP6dZLJiPo8xGlbbLDuXl396cTYIloHdWxGBJQTtmEZbQ4dQm0CKodHozti7eKQUBh6WxQg3GTIZkM2MJZ+/M6kvfHY9EEu5 X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2437; 31:0vCxRBp+Hy9+nofxw3WRUCVvjF6IGNqs/19k0mWktzJ6UdcSKLlzItrpJDfkf69VIvz/6rOf53sSZgOq8kbrtyix7PmHwmeojBkiVv+UckrQ6DYIqGf9UWCL/9u7U0AFKsSz0k4zira8l2M3bbF9gA4jYCWaj8w0Y5XxCI1tWyfVcDyqpw2ldTxcZOmgUQtIwhb6vCdKX5EeLcJpYVK/7FOOH9wHaZjCAu10cav+LgU=; 4:3SpbwV3x1/alfWACnPRnEHEoQ27ATcFJS6QRkwgdR1nCBSk7xnxZNeloC5hN68UeYIRuHBRRSg4B7DQVN9TZnwb+6S+MLgk8B5/P+xuz9ckZlmg9tzaBhlF/jn91ZFZV4FE4nMrVux2GhTabP75KGVqCj5L/ZFEicoPuaJej7hb8djQS3PTGvo1J4kTnNwyCz32br3EyYkQC6n2ehfQv07C3XZJVr7A4PVVMmIr/oMo668G6l7FNFbbya9HqjJ9ix5NH4hm6QY1DNvtn7QSO41t227rsep2HLYT7PDKsWjd8hdbfC2TyCzeIMMby/KrVhBCTVjQbD7fW4h0HVn7N2pLA0tqclgq0NCfIIr2kYxWe5Zwck0eW0cfChsV55Z48LHVZa+uP+HeP0mAP+G7xr0N89xsCSU4QbPll4rzwtHllscm9Lxs/pVvh7t2W6f9r7XZAxwWb88kp10xqdWqZJgCSHFcp3rzwedGyJytQbQIpCZoOr2jT3qAb7nGzPC09U5RnGW7gEvz7ECUOvm7xCh4NMCce18HoGMvar6auIq7HRzzVNQJ/UUMIu7fAYdOiRuOfGJGl99NEhM8BMe1OFw== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(192374486261705)(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(8121501046)(5005006)(13015025)(13017025)(13024025)(13023025)(13018025)(10201501046)(3002001)(6055026); SRVR:CY4PR03MB2437; BCL:0; PCL:0; RULEID:(400006); SRVR:CY4PR03MB2437; X-Forefront-PRVS: 00514A2FE6 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2437; 23:t8vb1R5fn+TlUOY0WlQx0yaMTvyEivyah4/GNR1A0?= =?us-ascii?Q?DRrzjp4dIiePfIN2jpe0EvNA9JfrmZfZomx1xo7jioJj4H+/YxKAa+FvRu5U?= =?us-ascii?Q?Ui4DtgDfslcbmLDPEEvzCXW7TCZ9Sut5VaBM16lmOw/LcXqPk2fUoz9rnh3c?= =?us-ascii?Q?MsVRitv1Y+hNQKhTNRBOuoYuCuW9ObGgMg47J/5rGaAt+ZMnZwA/FXY0wJSc?= =?us-ascii?Q?s4qs7kCt4NbEqDxGwx8AVzSPgTxA48UbKRamgTO8JVRxd53u8htkAAVUri4R?= =?us-ascii?Q?7uv9ysHn6/bD6MX90gKWxEl9ztXWSuJe1yCHJhfb5JNTdUR0WDtTM18o1FA+?= =?us-ascii?Q?u2JLzgXZbjOQs/ZH3NMPaAZJ9KXFfo12mRhZRRdgetGQo4ckZ9ufZYzsneLH?= =?us-ascii?Q?088qfnFkwnRaJa6yT6LWAV3Q456WQVj94YxTrSDq0G7YuVd4UL2zmYoSW4bF?= =?us-ascii?Q?HVj++hPRYfEpZtVdo9vRPMfRF6cFRRbMlCgukaV2XG76m0mS2SbKkVwJxVaD?= =?us-ascii?Q?dlwz/smGc3Pn1OW8q+8awSF53FIRsFfdLPa0SMUnK6eSPNoLqbA3Puw6qxjd?= =?us-ascii?Q?V1xvZLEcHuKhn+TF2uIMHGZt5O0xNLaIOb0CSVLpmptr4XRA7CLJBARt0/ZM?= =?us-ascii?Q?VIQ9M4qxPEAW8pwOo3Wz/jgzXzMqwBaJPx17bkjyFEJNCwhmgOXKmmfz8cbZ?= =?us-ascii?Q?6HO2BmR4YE73pUNzTXR9MLBoiV4zqUxIlU1BD4FG/U8UPukIiBRjB1wABTRz?= =?us-ascii?Q?6xIb48m9+3/oOKPfN1Mx0c92T1YhjhPDwm3kHPkEAJHNhqtOoHtLyH56ARQ5?= =?us-ascii?Q?C4FdvS0HqqMA5RofmyUndlERI5VZcs/lWVfwjqSOa/OXxzLPxk8J1TA9O+Ve?= =?us-ascii?Q?1/4k0caiRcV9SfYweTj4aZOoUVpgTk3yDn9gNxeryPdVALY6mnz4uxJuFXTj?= =?us-ascii?Q?I0BKCBlfYwtWwG3Uld2ZaUbd7CYk4dt+AwxWBlXictVGnvrIiC+nhNBELEN7?= =?us-ascii?Q?C2ceWlBF5l8hV0sVy1JPxxMIwiRByXnBc6pllSnfEFGHviUP7CtuxpRCd6la?= =?us-ascii?Q?ZeGceJJF/gvuIgHMcl/0DDLSzTyH7b8LhvP5/K+JUGoBqzZMmPigyfMUsmyh?= =?us-ascii?Q?RCr5SqHJOu8e2bc5RdBPqPtjaNoG6vDR43Z5SqDrtf8IFXvZFo9e1Twvva5p?= =?us-ascii?Q?xe4SiI1n2vXA2r9lzlzXyY2mZqlzddr/VtQ?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2437; 6:S7oSWmc5/NYXFO2YCXh2KQ69GZ+uHMRJSR5Wv12T0jMG5J0JcFAA44FI4DSje96NYtUVdSmpbNBcfUv0p4Tzp3Ukvk80f2VIHZ0xI4uruzTtdX7COQuOAlmN3dtghWtbmU/JhPhDLM9u7yWTGlXdoCij+quFnYLPUdL3NFdpcvEb/VhqOPZqO59X8hSILVDiAneJhqwCPrSgqlyULG5zZFsXmtDHIxRJniIngUwiHxVBXPBNkqUIzuOMFQGpewZKqxuhRIblsRG0e/xC63jRXVd6uNwOu4YLNBUz5/R/PUs=; 5:M2eObJP/Z9/HP7zW+LiFlDtY8KRA6XGc84D9T5ccamkxjGXzJlA9i7XwzNQTshY5KfrBEP+YiYqIZCos45cjL6gtWOE50fcOnJNcFe9ofQ//KoV+q7FHPqlAmJ0VhCbXP13cwdc994WoTWJnu6K3MvjnK1wJPyWiH7xXD+VQhMU=; 24:wo8vkHLgDHPwesTIuWA4wEppmRotOkxvtOT01DlO4lqZrmW4eCWyOoZdqW3U4R6lhnLyPy1cv3BWggCp0qbgTVd7jnTrGZdb6VuRULL2WVg=; 7:Pw5TNLoWTxx14Q1tO7DnGKauOBVemkYLmy/1O+yGQvAvJ9k2S5Y0AJHi34moCVg4pj9T7nSaUuXsXnv5UKqVbgbMZH5Ctehe1Ehq0s8vANdMkSBhZsyjI3MZj07dpNCNMOfaKo+cLHheMN/6KeGj4kSJkWpyZH3Q/uyDiemn+bm2Zx1GRSVbgixe970AsyQTIRDokKNMUQcNFf8Yllsw10QKlv8W5tZEQNxGNTORD6dUdAGHWbc0qPI5R0friaYe SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2016 06:34:32.9287 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR03MB2437 Cc: ruchika.gupta@nxp.com Subject: [U-Boot] [PATCH] fsl_sfp : Modify macros as per changes in SFP v3.4 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" In SFP v3.4 support for 8 keys in SRK table has been added which leads to corresponding changes in OSPR key revocation field. So modify OSPR_KEY_REVOC_XXX macros accordingly. Signed-off-by: Sumit Garg --- include/fsl_sfp.h | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/include/fsl_sfp.h b/include/fsl_sfp.h index 2976a2c..42ff942 100644 --- a/include/fsl_sfp.h +++ b/include/fsl_sfp.h @@ -32,7 +32,7 @@ /* Number of SRKH registers */ #define NUM_SRKH_REGS 8 -#if defined(CONFIG_SYS_FSL_SFP_VER_3_2) || \ +#if defined(CONFIG_SYS_FSL_SFP_VER_3_2) || \ defined(CONFIG_SYS_FSL_SFP_VER_3_4) struct ccsr_sfp_regs { u32 ospr; /* 0x200 */ @@ -57,7 +57,7 @@ struct ccsr_sfp_regs { u32 srk_hash[NUM_SRKH_REGS]; /* 0x23c Super Root Key Hash */ u32 oem_uid; /* 0x9c OEM Unique ID */ u8 reserved2[0x04]; - u32 ovpr; /* 0xA4 Intent To Secure */ + u32 ovpr; /* 0xA4 Intent To Secure */ u8 reserved4[0x08]; u32 fsl_uid; /* 0xB0 FSL Unique ID */ u8 reserved5[0x04]; @@ -68,19 +68,26 @@ struct ccsr_sfp_regs { #else struct ccsr_sfp_regs { u8 reserved0[0x40]; - u32 ospr; /* 0x40 OEM Security Policy Register */ + u32 ospr; /* 0x40 OEM Security Policy Register */ u8 reserved2[0x38]; u32 srk_hash[8]; /* 0x7c Super Root Key Hash */ - u32 oem_uid; /* 0x9c OEM Unique ID */ + u32 oem_uid; /* 0x9c OEM Unique ID */ u8 reserved4[0x4]; - u32 ovpr; /* 0xA4 OEM Validation Policy Register */ + u32 ovpr; /* 0xA4 OEM Validation Policy Register */ u8 reserved8[0x8]; - u32 fsl_uid; /* 0xB0 FSL Unique ID */ + u32 fsl_uid; /* 0xB0 FSL Unique ID */ }; #endif + #define ITS_MASK 0x00000004 #define ITS_BIT 2 -#define OSPR_KEY_REVOC_SHIFT 13 -#define OSPR_KEY_REVOC_MASK 0x0000e000 + +#if defined(CONFIG_SYS_FSL_SFP_VER_3_4) +#define OSPR_KEY_REVOC_SHIFT 9 +#define OSPR_KEY_REVOC_MASK 0x0000fe00 +#else +#define OSPR_KEY_REVOC_SHIFT 13 +#define OSPR_KEY_REVOC_MASK 0x0000e000 +#endif /* CONFIG_SYS_FSL_SFP_VER_3_4 */ #endif