From: Lokesh Vutla <lokeshvutla@ti.com>
To: <herbert@gondor.apana.org.au>, <linux-crypto@vger.kernel.org>,
<davem@davemloft.net>
Cc: <linux-omap@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<t-kristo@ti.com>, <nsekhar@ti.com>, <lokeshvutla@ti.com>
Subject: [PATCH 02/10] crypto: omap-aes: Fix configuring of AES mode
Date: Thu, 2 Jul 2015 10:48:32 +0530 [thread overview]
Message-ID: <1435814320-30347-3-git-send-email-lokeshvutla@ti.com> (raw)
In-Reply-To: <1435814320-30347-1-git-send-email-lokeshvutla@ti.com>
AES_CTRL_REG is used to configure AES mode. Before configuring
any mode we need to make sure all other modes are reset or else
driver will misbehave. So mask all modes before configuring
any AES mode.
Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
---
drivers/crypto/omap-aes.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
index a923101..96fc7f7 100644
--- a/drivers/crypto/omap-aes.c
+++ b/drivers/crypto/omap-aes.c
@@ -63,6 +63,7 @@
#define AES_REG_CTRL_DIRECTION (1 << 2)
#define AES_REG_CTRL_INPUT_READY (1 << 1)
#define AES_REG_CTRL_OUTPUT_READY (1 << 0)
+#define AES_REG_CTRL_MASK FLD_MASK(24, 2)
#define AES_REG_DATA_N(dd, x) ((dd)->pdata->data_ofs + ((x) * 0x04))
@@ -254,7 +255,7 @@ static int omap_aes_write_ctrl(struct omap_aes_dev *dd)
{
unsigned int key32;
int i, err;
- u32 val, mask = 0;
+ u32 val;
err = omap_aes_hw_init(dd);
if (err)
@@ -274,17 +275,13 @@ static int omap_aes_write_ctrl(struct omap_aes_dev *dd)
val = FLD_VAL(((dd->ctx->keylen >> 3) - 1), 4, 3);
if (dd->flags & FLAGS_CBC)
val |= AES_REG_CTRL_CBC;
- if (dd->flags & FLAGS_CTR) {
+ if (dd->flags & FLAGS_CTR)
val |= AES_REG_CTRL_CTR | AES_REG_CTRL_CTR_WIDTH_128;
- mask = AES_REG_CTRL_CTR | AES_REG_CTRL_CTR_WIDTH_MASK;
- }
+
if (dd->flags & FLAGS_ENCRYPT)
val |= AES_REG_CTRL_DIRECTION;
- mask |= AES_REG_CTRL_CBC | AES_REG_CTRL_DIRECTION |
- AES_REG_CTRL_KEY_SIZE;
-
- omap_aes_write_mask(dd, AES_REG_CTRL(dd), val, mask);
+ omap_aes_write_mask(dd, AES_REG_CTRL(dd), val, AES_REG_CTRL_MASK);
return 0;
}
--
1.7.9.5
next prev parent reply other threads:[~2015-07-02 5:22 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-02 5:18 [PATCH 00/10] crypto: omap-aes: Add support for GCM mode Lokesh Vutla
2015-07-02 5:18 ` [PATCH 01/10] crypto: omap-aes: Add support for lengths not aligned with AES_BLOCK_SIZE Lokesh Vutla
2015-07-02 7:53 ` Felipe Balbi
2015-07-02 9:26 ` Lokesh Vutla
2015-07-06 7:38 ` Herbert Xu
2015-07-02 5:18 ` Lokesh Vutla [this message]
2015-07-02 7:57 ` [PATCH 02/10] crypto: omap-aes: Fix configuring of AES mode Felipe Balbi
2015-07-02 9:43 ` Lokesh Vutla
2015-07-02 5:18 ` [PATCH 03/10] crypto: aead: Add aead_request_cast() api Lokesh Vutla
2015-07-02 7:58 ` Felipe Balbi
2015-07-02 9:46 ` Lokesh Vutla
2015-07-06 7:41 ` Herbert Xu
2015-07-02 5:18 ` [PATCH 04/10] crypto: omap-aes: Use BIT() macro Lokesh Vutla
2015-07-02 7:59 ` Felipe Balbi
2015-07-06 7:42 ` Herbert Xu
2015-07-02 5:18 ` [PATCH 05/10] crypto: omap-aes: Add support for GCM mode Lokesh Vutla
2015-07-02 8:04 ` Felipe Balbi
2015-07-02 10:10 ` Lokesh Vutla
2015-07-02 5:18 ` [PATCH 06/10] crypto: omap-aes: gcm: Handle inputs properly Lokesh Vutla
2015-07-02 8:04 ` Felipe Balbi
2015-07-02 10:13 ` Lokesh Vutla
2015-07-02 5:18 ` [PATCH 07/10] crypto: omap-aes: gcm: Add support for unaligned lengths Lokesh Vutla
2015-07-02 8:05 ` Felipe Balbi
2015-07-02 5:18 ` [PATCH 08/10] crypto: omap-aes: gmc: Add algo info Lokesh Vutla
2015-07-02 8:00 ` Stephan Mueller
2015-07-02 9:54 ` Lokesh Vutla
2015-07-02 9:56 ` Stephan Mueller
2015-07-06 7:35 ` Herbert Xu
2015-07-06 8:15 ` Lokesh Vutla
2015-07-02 5:18 ` [PATCH 09/10] crypto: omap-aes: gcm: Add support for PIO mode Lokesh Vutla
2015-07-02 8:06 ` Felipe Balbi
2015-07-02 10:17 ` Lokesh Vutla
2015-07-02 5:18 ` [PATCH 10/10] crypto: tcrypt: Added speed tests for Async AEAD crypto alogrithms Lokesh Vutla
2015-07-06 7:44 ` Herbert Xu
2015-07-06 8:45 ` Lokesh Vutla
2015-07-06 8:49 ` Herbert Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1435814320-30347-3-git-send-email-lokeshvutla@ti.com \
--to=lokeshvutla@ti.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=nsekhar@ti.com \
--cc=t-kristo@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®