From patchwork Wed Nov 10 17:26:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Kasatkin X-Patchwork-Id: 314852 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAAHRbu2010372 for ; Wed, 10 Nov 2010 17:27:38 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757270Ab0KJR12 (ORCPT ); Wed, 10 Nov 2010 12:27:28 -0500 Received: from smtp.nokia.com ([147.243.128.24]:20040 "EHLO mgw-da01.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757259Ab0KJR1Z (ORCPT ); Wed, 10 Nov 2010 12:27:25 -0500 Received: from localhost.localdomain (esdhcp04040.research.nokia.com [172.21.40.40]) by mgw-da01.nokia.com (Switch-3.4.3/Switch-3.4.3) with ESMTP id oAAHQKHH029001; Wed, 10 Nov 2010 19:26:22 +0200 From: Dmitry Kasatkin To: herbert@gondor.hengli.com.au Cc: linux-crypto@vger.kernel.org, linux-omap@vger.kernel.org Subject: [PATCH 1/5] crypto: omap-aes: change in prevention of OCP bus error Date: Wed, 10 Nov 2010 19:26:52 +0200 Message-Id: <78e86640037f10904b37250f0c578c6e0ca2c256.1289409924.git.dmitry.kasatkin@nokia.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: References: In-Reply-To: References: X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 10 Nov 2010 17:27:38 +0000 (UTC) diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c index 799ca51..9d65611 100644 --- a/drivers/crypto/omap-aes.c +++ b/drivers/crypto/omap-aes.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -187,11 +188,12 @@ static int omap_aes_hw_init(struct omap_aes_dev *dd) omap_aes_write_mask(dd, AES_REG_MASK, AES_REG_MASK_SOFTRESET, AES_REG_MASK_SOFTRESET); /* - * prevent OCP bus error (SRESP) in case an access to the module - * is performed while the module is coming out of soft reset + * prevent OCP bus error (SRESP) on OMAP3630 in case an access + * to the module is performed while the module is + * coming out of soft reset */ - __asm__ __volatile__("nop"); - __asm__ __volatile__("nop"); + if (cpu_is_omap3630()) + udelay(1); err = omap_aes_wait(dd, AES_REG_SYSSTATUS, AES_REG_SYSSTATUS_RESETDONE);