crypto: sun4i-ss - fix big endian issues (d1d787bc) · Commits · 戴 / test

drivers/crypto/allwinner/sun4i-ss/sun4i-ss-hash.c

+11 −10

Original line number	Diff line number	Diff line
		@@ -187,7 +187,7 @@ static int sun4i_hash(struct ahash_request *areq)
		*/
		unsigned int i = 0, end, fill, min_fill, nwait, nbw = 0, j = 0, todo;
		unsigned int in_i = 0;
		u32 spaces, rx_cnt = SS_RX_DEFAULT, bf[32] = {0}, wb = 0, v, ivmode = 0;
		u32 spaces, rx_cnt = SS_RX_DEFAULT, bf[32] = {0}, v, ivmode = 0;
		struct sun4i_req_ctx *op = ahash_request_ctx(areq);
		struct crypto_ahash *tfm = crypto_ahash_reqtfm(areq);
		struct sun4i_tfm_ctx *tfmctx = crypto_ahash_ctx(tfm);
		@@ -196,6 +196,7 @@ static int sun4i_hash(struct ahash_request *areq)
		struct sg_mapping_iter mi;
		int in_r, err = 0;
		size_t copied = 0;
		__le32 wb = 0;

		dev_dbg(ss->dev, "%s %s bc=%llu len=%u mode=%x wl=%u h0=%0x",
		__func__, crypto_tfm_alg_name(areq->base.tfm),
		@@ -407,7 +408,7 @@ hash_final:

		nbw = op->len - 4 * nwait;
		if (nbw) {
		wb = (u32 )(op->buf + nwait * 4);
		wb = cpu_to_le32((u32 )(op->buf + nwait * 4));
		wb &= GENMASK((nbw * 8) - 1, 0);

		op->byte_count += nbw;
		@@ -416,7 +417,7 @@ hash_final:

		/* write the remaining bytes of the nbw buffer */
		wb \|= ((1 << 7) << (nbw * 8));
		bf[j++] = wb;
		bf[j++] = le32_to_cpu(wb);

		/*
		* number of space to pad to obtain 64o minus 8(size) minus 4 (final 1)
		@@ -435,13 +436,13 @@ hash_final:

		/* write the length of data */
		if (op->mode == SS_OP_SHA1) {
		__be64 bits = cpu_to_be64(op->byte_count << 3);
		bf[j++] = lower_32_bits(bits);
		bf[j++] = upper_32_bits(bits);
		__be64 bits = (__be64 )&bf[j];
		*bits = cpu_to_be64(op->byte_count << 3);
		j += 2;
		} else {
		__le64 bits = op->byte_count << 3;
		bf[j++] = lower_32_bits(bits);
		bf[j++] = upper_32_bits(bits);
		__le64 bits = (__le64 )&bf[j];
		*bits = cpu_to_le64(op->byte_count << 3);
		j += 2;
		}
		writesl(ss->base + SS_RXFIFO, bf, j);

		@@ -483,7 +484,7 @@ hash_final:
		}
		} else {
		for (i = 0; i < 4; i++) {
		v = readl(ss->base + SS_MD0 + i * 4);
		v = cpu_to_le32(readl(ss->base + SS_MD0 + i * 4));
		memcpy(areq->result + i * 4, &v, 4);
		}
		}

Admin message