From 1c4415bfa5541200cd35211096461dd52e52771d Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 18 Jan 2022 15:51:21 +0000 Subject: [PATCH] dpdk: add qat gen4-b device support Type: feature This patch adds the GEN4-b support to DPDK Cryptodev PMD and fixes a problem on its raw api AEAD enqueue. Signed-off-by: Fan Zhang Change-Id: I3a1a9b0ae51a5725ce9d5265a059e26ceb16c49e --- .../0001-common-qat-add-gen4-b-support.patch | 35 ++++++++++++++++ .../0002-crypto-qat-fix-raw-data-path-aead.patch | 47 ++++++++++++++++++++++ 2 files changed, 82 insertions(+) create mode 100644 build/external/patches/dpdk_21.11/0001-common-qat-add-gen4-b-support.patch create mode 100644 build/external/patches/dpdk_21.11/0002-crypto-qat-fix-raw-data-path-aead.patch diff --git a/build/external/patches/dpdk_21.11/0001-common-qat-add-gen4-b-support.patch b/build/external/patches/dpdk_21.11/0001-common-qat-add-gen4-b-support.patch new file mode 100644 index 00000000000..3bb1430883f --- /dev/null +++ b/build/external/patches/dpdk_21.11/0001-common-qat-add-gen4-b-support.patch @@ -0,0 +1,35 @@ +From 939eb3d245e794679abc3c90be035e073a756b78 Mon Sep 17 00:00:00 2001 +From: Fan Zhang +Date: Thu, 13 Jan 2022 09:44:46 +0000 +Subject: [PATCH] common/qat: add gen4 b support + +Signed-off-by: Fan Zhang +--- + drivers/common/qat/qat_device.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/drivers/common/qat/qat_device.c b/drivers/common/qat/qat_device.c +index 437996f2e8..1f870d689a 100644 +--- a/drivers/common/qat/qat_device.c ++++ b/drivers/common/qat/qat_device.c +@@ -47,6 +47,9 @@ static const struct rte_pci_id pci_id_qat_map[] = { + { + RTE_PCI_DEVICE(0x8086, 0x4941), + }, ++ { ++ RTE_PCI_DEVICE(0x8086, 0x4943), ++ }, + {.device_id = 0}, + }; + +@@ -192,6 +195,7 @@ qat_pci_device_allocate(struct rte_pci_device *pci_dev, + qat_dev_gen = QAT_GEN3; + break; + case 0x4941: ++ case 0x4943: + qat_dev_gen = QAT_GEN4; + break; + default: +-- +2.25.1 + diff --git a/build/external/patches/dpdk_21.11/0002-crypto-qat-fix-raw-data-path-aead.patch b/build/external/patches/dpdk_21.11/0002-crypto-qat-fix-raw-data-path-aead.patch new file mode 100644 index 00000000000..5e74f26c359 --- /dev/null +++ b/build/external/patches/dpdk_21.11/0002-crypto-qat-fix-raw-data-path-aead.patch @@ -0,0 +1,47 @@ +From 27c5c59aaf29236ba178ad18e399d3d6d9574739 Mon Sep 17 00:00:00 2001 +From: Fan Zhang +Date: Mon, 17 Jan 2022 15:22:18 +0000 +Subject: [PATCH] crypto/qat: fix raw data path aead + +This patch fixes raw data path AEAD operation for 4th QAT +generation. + +Fixes: 328d690d2f60 ("crypto/qat: update raw data path") + +Signed-off-by: Fan Zhang +--- + drivers/crypto/qat/qat_sym_hw_dp.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) + +diff --git a/drivers/crypto/qat/qat_sym_hw_dp.c b/drivers/crypto/qat/qat_sym_hw_dp.c +index 12825e448b..02875b822e 100644 +--- a/drivers/crypto/qat/qat_sym_hw_dp.c ++++ b/drivers/crypto/qat/qat_sym_hw_dp.c +@@ -520,6 +520,8 @@ enqueue_one_aead_job(struct qat_sym_session *ctx, + { + struct icp_qat_fw_la_cipher_req_params *cipher_param = + (void *)&req->serv_specif_rqpars; ++ struct icp_qat_fw_la_cipher_20_req_params *cipher_param20 = ++ (void *)&req->serv_specif_rqpars; + struct icp_qat_fw_la_auth_req_params *auth_param = + (void *)((uint8_t *)&req->serv_specif_rqpars + + ICP_QAT_FW_HASH_REQUEST_PARAMETERS_OFFSET); +@@ -533,8 +535,13 @@ enqueue_one_aead_job(struct qat_sym_session *ctx, + /* CPM 1.7 uses single pass to treat AEAD as cipher operation */ + if (ctx->is_single_pass) { + enqueue_one_cipher_job(ctx, req, iv, ofs, data_len); +- cipher_param->spc_aad_addr = aad->iova; +- cipher_param->spc_auth_res_addr = digest->iova; ++ if (ctx->is_ucs) { ++ cipher_param20->spc_aad_addr = aad->iova; ++ cipher_param20->spc_auth_res_addr = digest->iova; ++ } else { ++ cipher_param->spc_aad_addr = aad->iova; ++ cipher_param->spc_auth_res_addr = digest->iova; ++ } + return; + } + +-- +2.25.1 + -- 2.16.6