crypto: mediatek - add support to OFB/CFB mode (069ec891) · Commits · 戴 / test

drivers/crypto/mediatek/mtk-aes.c

+78 −7

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@

		#define AES_CT_CTRL_HDR cpu_to_le32(0x00220000)

		/* AES-CBC/ECB/CTR command token */
		/* AES-CBC/ECB/CTR/OFB/CFB command token */
		#define AES_CMD0 cpu_to_le32(0x05000000)
		#define AES_CMD1 cpu_to_le32(0x2d060000)
		#define AES_CMD2 cpu_to_le32(0xe4a63806)
		@@ -50,6 +50,8 @@
		/* AES transform information word 1 fields */
		#define AES_TFM_ECB cpu_to_le32(0x0 << 0)
		#define AES_TFM_CBC cpu_to_le32(0x1 << 0)
		#define AES_TFM_OFB cpu_to_le32(0x4 << 0)
		#define AES_TFM_CFB128 cpu_to_le32(0x5 << 0)
		#define AES_TFM_CTR_INIT cpu_to_le32(0x2 << 0) /* init counter to 1 */
		#define AES_TFM_CTR_LOAD cpu_to_le32(0x6 << 0) /* load/reuse counter */
		#define AES_TFM_3IV cpu_to_le32(0x7 << 5) /* using IV 0-2 */
		@@ -58,13 +60,15 @@
		#define AES_TFM_ENC_HASH cpu_to_le32(0x1 << 17)

		/* AES flags */
		#define AES_FLAGS_CIPHER_MSK GENMASK(2, 0)
		#define AES_FLAGS_CIPHER_MSK GENMASK(4, 0)
		#define AES_FLAGS_ECB BIT(0)
		#define AES_FLAGS_CBC BIT(1)
		#define AES_FLAGS_CTR BIT(2)
		#define AES_FLAGS_GCM BIT(3)
		#define AES_FLAGS_ENCRYPT BIT(4)
		#define AES_FLAGS_BUSY BIT(5)
		#define AES_FLAGS_OFB BIT(3)
		#define AES_FLAGS_CFB128 BIT(4)
		#define AES_FLAGS_GCM BIT(5)
		#define AES_FLAGS_ENCRYPT BIT(6)
		#define AES_FLAGS_BUSY BIT(7)

		#define AES_AUTH_TAG_ERR cpu_to_le32(BIT(26))

		@@ -405,7 +409,7 @@ exit:
		return mtk_aes_complete(cryp, aes, -EINVAL);
		}

		/* Initialize transform information of CBC/ECB/CTR mode */
		/* Initialize transform information of CBC/ECB/CTR/OFB/CFB mode */
		static void mtk_aes_info_init(struct mtk_cryp cryp, struct mtk_aes_rec aes,
		size_t len)
		{
		@@ -434,7 +438,12 @@ static void mtk_aes_info_init(struct mtk_cryp cryp, struct mtk_aes_rec aes,
		case AES_FLAGS_CTR:
		info->tfm[1] = AES_TFM_CTR_LOAD;
		goto ctr;

		case AES_FLAGS_OFB:
		info->tfm[1] = AES_TFM_OFB;
		break;
		case AES_FLAGS_CFB128:
		info->tfm[1] = AES_TFM_CFB128;
		break;
		default:
		/* Should not happen... */
		return;
		@@ -697,6 +706,26 @@ static int mtk_aes_ctr_decrypt(struct ablkcipher_request *req)
		return mtk_aes_crypt(req, AES_FLAGS_CTR);
		}

		static int mtk_aes_ofb_encrypt(struct ablkcipher_request *req)
		{
		return mtk_aes_crypt(req, AES_FLAGS_ENCRYPT \| AES_FLAGS_OFB);
		}

		static int mtk_aes_ofb_decrypt(struct ablkcipher_request *req)
		{
		return mtk_aes_crypt(req, AES_FLAGS_OFB);
		}

		static int mtk_aes_cfb_encrypt(struct ablkcipher_request *req)
		{
		return mtk_aes_crypt(req, AES_FLAGS_ENCRYPT \| AES_FLAGS_CFB128);
		}

		static int mtk_aes_cfb_decrypt(struct ablkcipher_request *req)
		{
		return mtk_aes_crypt(req, AES_FLAGS_CFB128);
		}

		static int mtk_aes_cra_init(struct crypto_tfm *tfm)
		{
		struct mtk_aes_ctx *ctx = crypto_tfm_ctx(tfm);
		@@ -778,6 +807,48 @@ static struct crypto_alg aes_algs[] = {
		.decrypt = mtk_aes_ctr_decrypt,
		}
		},
		{
		.cra_name = "ofb(aes)",
		.cra_driver_name = "ofb-aes-mtk",
		.cra_priority = 400,
		.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER \|
		CRYPTO_ALG_ASYNC,
		.cra_init = mtk_aes_cra_init,
		.cra_blocksize = 1,
		.cra_ctxsize = sizeof(struct mtk_aes_ctx),
		.cra_alignmask = 0xf,
		.cra_type = &crypto_ablkcipher_type,
		.cra_module = THIS_MODULE,
		.cra_u.ablkcipher = {
		.min_keysize = AES_MIN_KEY_SIZE,
		.max_keysize = AES_MAX_KEY_SIZE,
		.ivsize = AES_BLOCK_SIZE,
		.setkey = mtk_aes_setkey,
		.encrypt = mtk_aes_ofb_encrypt,
		.decrypt = mtk_aes_ofb_decrypt,
		}
		},
		{
		.cra_name = "cfb(aes)",
		.cra_driver_name = "cfb-aes-mtk",
		.cra_priority = 400,
		.cra_flags = CRYPTO_ALG_TYPE_ABLKCIPHER \|
		CRYPTO_ALG_ASYNC,
		.cra_init = mtk_aes_cra_init,
		.cra_blocksize = 1,
		.cra_ctxsize = sizeof(struct mtk_aes_ctx),
		.cra_alignmask = 0xf,
		.cra_type = &crypto_ablkcipher_type,
		.cra_module = THIS_MODULE,
		.cra_u.ablkcipher = {
		.min_keysize = AES_MIN_KEY_SIZE,
		.max_keysize = AES_MAX_KEY_SIZE,
		.ivsize = AES_BLOCK_SIZE,
		.setkey = mtk_aes_setkey,
		.encrypt = mtk_aes_cfb_encrypt,
		.decrypt = mtk_aes_cfb_decrypt,
		}
		},
		};

		static inline struct mtk_aes_gcm_ctx *

Admin message