|
@@ -1797,6 +1797,27 @@ static void ahash_done(struct device *dev,
|
|
areq->base.complete(&areq->base, err);
|
|
areq->base.complete(&areq->base, err);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+/*
|
|
|
|
+ * SEC1 doesn't like hashing of 0 sized message, so we do the padding
|
|
|
|
+ * ourself and submit a padded block
|
|
|
|
+ */
|
|
|
|
+void talitos_handle_buggy_hash(struct talitos_ctx *ctx,
|
|
|
|
+ struct talitos_edesc *edesc,
|
|
|
|
+ struct talitos_ptr *ptr)
|
|
|
|
+{
|
|
|
|
+ static u8 padded_hash[64] = {
|
|
|
|
+ 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
+ pr_err_once("Bug in SEC1, padding ourself\n");
|
|
|
|
+ edesc->desc.hdr &= ~DESC_HDR_MODE0_MDEU_PAD;
|
|
|
|
+ map_single_talitos_ptr(ctx->dev, ptr, sizeof(padded_hash),
|
|
|
|
+ (char *)padded_hash, DMA_TO_DEVICE);
|
|
|
|
+}
|
|
|
|
+
|
|
static int common_nonsnoop_hash(struct talitos_edesc *edesc,
|
|
static int common_nonsnoop_hash(struct talitos_edesc *edesc,
|
|
struct ahash_request *areq, unsigned int length,
|
|
struct ahash_request *areq, unsigned int length,
|
|
void (*callback) (struct device *dev,
|
|
void (*callback) (struct device *dev,
|
|
@@ -1857,6 +1878,9 @@ static int common_nonsnoop_hash(struct talitos_edesc *edesc,
|
|
/* last DWORD empty */
|
|
/* last DWORD empty */
|
|
desc->ptr[6] = zero_entry;
|
|
desc->ptr[6] = zero_entry;
|
|
|
|
|
|
|
|
+ if (is_sec1 && from_talitos_ptr_len(&desc->ptr[3], true) == 0)
|
|
|
|
+ talitos_handle_buggy_hash(ctx, edesc, &desc->ptr[3]);
|
|
|
|
+
|
|
ret = talitos_submit(dev, ctx->ch, desc, callback, areq);
|
|
ret = talitos_submit(dev, ctx->ch, desc, callback, areq);
|
|
if (ret != -EINPROGRESS) {
|
|
if (ret != -EINPROGRESS) {
|
|
common_nonsnoop_hash_unmap(dev, edesc, areq);
|
|
common_nonsnoop_hash_unmap(dev, edesc, areq);
|