From patchwork Wed Jul 8 14:24:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: horia.geanta@freescale.com X-Patchwork-Id: 493121 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 4471E140787 for ; Thu, 9 Jul 2015 05:28:08 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 77F1C4BA72; Wed, 8 Jul 2015 21:28:02 +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 1as6bf6O1SIG; Wed, 8 Jul 2015 21:28:01 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D46384BA6A; Wed, 8 Jul 2015 21:28:00 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 231304BA00 for ; Wed, 8 Jul 2015 16:41:05 +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 z9DdIEcjJ27k for ; Wed, 8 Jul 2015 16:41:05 +0200 (CEST) X-Greylist: delayed 880 seconds by postgrey-1.34 at theia; Wed, 08 Jul 2015 16:41:00 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 na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0144.outbound.protection.outlook.com [65.55.169.144]) by theia.denx.de (Postfix) with ESMTPS id 8C5A14B8C4 for ; Wed, 8 Jul 2015 16:41:00 +0200 (CEST) Received: from BY2PR03CA043.namprd03.prod.outlook.com (10.141.249.16) by BL2PR03MB387.namprd03.prod.outlook.com (10.141.91.152) with Microsoft SMTP Server (TLS) id 15.1.213.10; Wed, 8 Jul 2015 14:26:17 +0000 Received: from BY2FFO11OLC011.protection.gbl (2a01:111:f400:7c0c::190) by BY2PR03CA043.outlook.office365.com (2a01:111:e400:2c5d::16) with Microsoft SMTP Server (TLS) id 15.1.207.19 via Frontend Transport; Wed, 8 Jul 2015 14:26:17 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11OLC011.mail.protection.outlook.com (10.1.15.22) with Microsoft SMTP Server (TLS) id 15.1.213.8 via Frontend Transport; Wed, 8 Jul 2015 14:26:17 +0000 Received: from enigma.ea.freescale.net (enigma.ea.freescale.net [10.171.77.120]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t68EQ85r000968; Wed, 8 Jul 2015 07:26:15 -0700 From: =?UTF-8?q?Horia=20Geant=C4=83?= To: York Sun , Ruchika Gupta , Tom Rini Date: Wed, 8 Jul 2015 17:24:57 +0300 Message-ID: <1436365498-25890-2-git-send-email-horia.geanta@freescale.com> X-Mailer: git-send-email 2.4.4 In-Reply-To: <1436365498-25890-1-git-send-email-horia.geanta@freescale.com> References: <1436365498-25890-1-git-send-email-horia.geanta@freescale.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC011; 1:hb5Yyvv1zmtqaQl7hDp6y2UwFYTk8jY8/fz0lFmrV2GtyXXPPrZJaI3gF08K6ZV3Pw3b2eAzxrX+699xbMRKAYYl3e/eAlIGBjt+DBU/9dJRzCFsJH9Eh6We2/+KH2llyARxS70ITDE23N2wP2aBhbujOC1UALyhu9aWMqfg5QBBwhKBEiFBpbjFuqH1RIBX+k63yxXMNgH+FovkmADLzwqwq3GQ7cgGHYIvbm8jhRk4vequlMtiUpjvCytAGjHVpKBGGR5Q5dYOaAqC0XXUB4WBymLAJLVYvAMoRFvy+vyfOyfaQQjGIhZ1tTCsDNfiNXAyVn2uTa1hVN0h8yxmKGH8APWEVogJSj21ZYAricraYBtAcUncegOAtle/f+vfxrItZQRci8tqj9eguoXDg7iTQGYLmj+fcp4cy263HeSGGrN1QB57lkL186R7vu3g X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(199003)(189002)(5820100001)(36756003)(92566002)(50226001)(86362001)(2950100001)(77156002)(62966003)(87936001)(575784001)(77096005)(5001960100002)(189998001)(107886002)(104016003)(50986999)(47776003)(46102003)(85426001)(6806004)(76176999)(229853001)(50466002)(19580405001)(23676002)(33646002)(105606002)(5001770100001)(19580395003)(106466001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BL2PR03MB387; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB387; 2:RF9qHVGXW4xZBxLNsLCgOdNTfdQOdJU+n09Hob6GEHSBETM2/BoMzeO1tzn1j6yY; 3:dhii3auABLEVVbCn1Yk2qlh8baUDB8CYNlGjqGM5DpiTsZEbvUIDIQBIvnZL5z5dUthhfB2KGPPQ6chcAxJeTtEXIgQcH+lDBnwiOBZ+/oevbsPiMQhNS+uCnDx3+PJJokFXv7MHbsqQGOHFZy2fsBZ7u5YNKbUwl6w6JdRWcXZRv00XqoCLiUJv0z1IJHI+lNkf02ONFhjsQHhVSmOu4G1/PItIRsWXIYZJKnHRheQ=; 25:ED+Uq1J7mAVd8mQDXDFtn6mlPoz7XuzzpUNIEmMLk83tkiUP7LTPn+No48/CHqf5x65AuaoKoKMFDBCeUQDpUHKnj+omgoJMcOouqV9E+oAWkrLzIKDjMK9gxz0PUl+b/Zq6ctoy2SOPVvzpAINzyBlkAo+DP3LURVsCWbqfYmPzTcQDXmP5ChFkClk+FmiQU8eF7AtqkvqeyxTEPAcwmBfj9pCAXmgPZ+AsVILlO1swdH7FtBPikM2HCUh3aPRBp3IzWBhtLu6VL9K+aLZnlw==; 20:2D2OTC2rPbDDvYt/4Q2R6kAjshQ0+88rzUONDHJBTKmvzQT5L9VeMLwtiri5tQOHW+qZP/jfOlxryXWSX1cOHG5OFrr+VF8CqVR3q3Xh6pfhnxSHieqsh3RicY2efxUUSrTst6c0TkdLx4OcixaMxQeDNpmgpR5GONxzKoWaSHCcwjnpmHTZhEg+x2ma1VRG3Sz+HJRASD5kS2yd2blHuyQxjAe/NKqkPkCgJ6nHsCtqnXaxUCQrb6xPWnfz6PIWhSiKdJ7s4GbSEIfDqyXjbXydBmnsePwQoTMDbi3rYVtwbc/MLmTi86IuPNEY0addwitz2zLZJIfi0JM7991P8Z6ebW43IEHZOuvlQs6vW7A= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BL2PR03MB387; BL2PR03MB387: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BL2PR03MB387; BCL:0; PCL:0; RULEID:; SRVR:BL2PR03MB387; X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB387; 4:GilQlCvvbHZ8elf+nqILWx9BqrKv4Jrq/rd6h1STDzftbVxbZZDi45LVcIAxuAazQPjAwMGSUyZc12QEHsHJTDbLoeBk8EjzamYercOek9YOw2dZCM1FkuG2iaNsktoTp/D+y0yJD7Mnl5Z1A9M3e55qjVzQlFEOYPSoqpLHn1gss2qOHgW+3HpfzNyTZzDL/zulUY6rD8UiN+HrnugJT1LB3hzyL5BAw/j9REUlQu6itvfV47SDYC2mvt2CBMJfMO6mnpyFqp7YCIU+Z9pztbLQadXEDmCa/+40pDeVbe4= X-Forefront-PRVS: 0631F0BC3D X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTDJQUjAzTUIzODc7MjM6eXBSdTBWR0kxNzMrRlp3RmovTUNEMHBhdFFi?= =?utf-8?B?cUVPc3I5N2krM1dyMjl4bjBKekJZeDJ0am9ENjB1azVMcGgvREV6TDNDMUFo?= =?utf-8?B?TThtTlFNd041cFlzZjVuZ29xUDJPYVFGNjE3VWZpMXNiUitCWmhaSG1UVElw?= =?utf-8?B?Ni9ydWRHNzg3L0lZWFZ2TWRseEd4QnNoTTFNc1Btd3Q5NHkzTUlTOHg1VjJl?= =?utf-8?B?ZjRualdTU1dMRjlmOWg3SXFTUit3RGJXRFYwOFJOekdsVSsrdEFjRmdLU0l0?= =?utf-8?B?ditoaHFOZjlaSmZWZ0VkOENSWi9ZNG9RVzVlTGplT1dXSkhXNElnUndidktx?= =?utf-8?B?dGxDRHBJa0lUMzBuV3NEOTBjL1JTeUROODNGRm9hMnVLRWw0bWxMVHNVeTRP?= =?utf-8?B?OU9CZUtLRWdHbGszOGdLTE9pY0pFK1NMWGY5aFJzbGJJTThXaWpFbXFuQnFn?= =?utf-8?B?QmtoUGRDR011RzdNTFQwVll3TTZpSVV0eWpzVTZ6azd1dXk1NUREclZVaFNj?= =?utf-8?B?TUplUE9nNUxwbllUMjBUUTJoQXJ0V0FRbnRkQ1N4aE94Vk5qY3BGWXFCUndm?= =?utf-8?B?NTRaQU5tbEhiWkRsREI1Qm5RZEtKYnNUdGxERFZLdEltK2tOZkI2aDMwdFNy?= =?utf-8?B?NWNtS01Xa0RBcWNMak1lSWt1RTNCUHdTREpoUUF4UFBId1BWSTdiRlZ2Mmpp?= =?utf-8?B?N250dUl4bjJqbGlwYWlxU1RMN2pJVmNIM0VBSzdLcWZmUHpPTW1TOGhKYzY3?= =?utf-8?B?OUdjejlhWHo4aXNyNmkxL3E4cHJUd25Ea3krdG5pVVhieTJrV0VtVTJRTkVD?= =?utf-8?B?ZmZtdlVZd3M0VC92VnQyc0tOS2hBSk1vWjkvWGQvWXRoNXgxMkxnVlE0dUxl?= =?utf-8?B?c3lud0k2bm93QVBacTVKclhVVDhjdGdNWk1yM2tUMmsxQXJXMzNabHVIZ1lC?= =?utf-8?B?czNyYkRzUzhvUVVzRlZMdFZGS0tINi9lSVMrU2ZYTjNOWlBTc2swTEFicUMr?= =?utf-8?B?VnFMNnBLOVZ1K0p5dzlPbHYxamdiSmZTdGVoaTBQeThGYVZPMDlzZUZYeThI?= =?utf-8?B?cGg0SjdaWitxcUNwaWtVU0xVM2ErV0dYVXB2ZklCdzl2UEZ3cDN0T25aN1ox?= =?utf-8?B?ZEhUc2E4TXNPMm1IUjNHSFcrWmRna0o5MTZ3cEh2UW5OenVJNnplZURLbjBn?= =?utf-8?B?aFl4djJjeG53a1Y5MG1UUjJvZzBJS2V0MlVyOWRoSlcxNjBiT3EvODY2NDJO?= =?utf-8?B?OEtzL2pqTHBLREk2U001OFhrcXJSVjljZytJdllnQnFjaStzU25DRmNOSXBB?= =?utf-8?B?dm5VUWZnbDFIQT09?= X-Microsoft-Exchange-Diagnostics: 1; BL2PR03MB387; 5:sDjygo5AKmo4AooQXrz21tqTjpu6XiLoRdB7D6U9T1oooAUkOZZIH52wrauM4wGnOFjsaQL7bA6IMrIdNMTaNyZPreSbBoZCZsYK0IzhRPoT8RnweHnp5BvzadJvrVaa2xUbkoYFfV1XYWUofQ45Yg==; 24:zuMcKpxjBEdwJkkatJ0FYSZnRiJqt610hA2wXyxKS+HRbx2y/f8j9X74tvVHXnJ7/GkvSc1xsQNfQVn7UGUanuDcdulWczqeKD9+dYUjfmg=; 20:qrvUZrdDUbaWImQntaG2ViZLC09yBOtlRuM385haMVUHdBJTkGiHCUhDYRPvWLCtQAQFIHTZgs2jJ0qHzzfXzg== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Jul 2015 14:26:17.2706 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR03MB387 X-Mailman-Approved-At: Wed, 08 Jul 2015 21:27:58 +0200 Cc: u-boot@lists.denx.de, =?UTF-8?q?Horia=20Geant=C4=83?= Subject: [U-Boot] [PATCH 2/3] crypto/fsl: fix snooping for write transactions 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" HW coherency won't work properly for CAAM write transactions if AWCACHE is left to default (POR) value - 4'b0001. It has to be programmed to 4'b0010. For platforms that have HW coherency support: -PPC-based: the update has no effect; CAAM coherency already works due to the IOMMU (PAMU) driver setting the correct memory coherency attributes -ARM-based: the update fixes cache coherency issues, since IOMMU (SMMU) driver is not programmed to behave similar to PAMU Fixes: b9eebfade974c ("fsl_sec: Add hardware accelerated SHA256 and SHA1") Signed-off-by: Horia Geantă Reviewed-by: Aneesh Bansal Reviewed-by: Mingkai Hu Acked-by: Ruchika Gupta --- drivers/crypto/fsl/jr.c | 10 ++++++---- drivers/crypto/fsl/jr.h | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/fsl/jr.c b/drivers/crypto/fsl/jr.c index f99d59480c81..e2bd913aa259 100644 --- a/drivers/crypto/fsl/jr.c +++ b/drivers/crypto/fsl/jr.c @@ -459,14 +459,16 @@ static int rng_init(void) int sec_init(void) { - int ret = 0; - -#ifdef CONFIG_PHYS_64BIT ccsr_sec_t *sec = (void *)CONFIG_SYS_FSL_SEC_ADDR; uint32_t mcr = sec_in32(&sec->mcfgr); + int ret = 0; - sec_out32(&sec->mcfgr, mcr | 1 << MCFGR_PS_SHIFT); + mcr = (mcr & ~MCFGR_AWCACHE_MASK) | (0x2 << MCFGR_AWCACHE_SHIFT); +#ifdef CONFIG_PHYS_64BIT + mcr |= (1 << MCFGR_PS_SHIFT); #endif + sec_out32(&sec->mcfgr, mcr); + ret = jr_init(); if (ret < 0) { printf("SEC initialization failed\n"); diff --git a/drivers/crypto/fsl/jr.h b/drivers/crypto/fsl/jr.h index cce2c589ce0b..152606008845 100644 --- a/drivers/crypto/fsl/jr.h +++ b/drivers/crypto/fsl/jr.h @@ -21,6 +21,8 @@ #define MCFGR_SWRST ((uint32_t)(1)<<31) /* Software Reset */ #define MCFGR_DMA_RST ((uint32_t)(1)<<28) /* DMA Reset */ #define MCFGR_PS_SHIFT 16 +#define MCFGR_AWCACHE_SHIFT 8 +#define MCFGR_AWCACHE_MASK (0xf << MCFGR_AWCACHE_SHIFT) #define JR_INTMASK 0x00000001 #define JRCR_RESET 0x01 #define JRINT_ERR_HALT_INPROGRESS 0x4