From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 540AAA0A0C; Mon, 28 Jun 2021 18:36:10 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2A2534119B; Mon, 28 Jun 2021 18:35:03 +0200 (CEST) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id E9B9B4117E for ; Mon, 28 Jun 2021 18:35:01 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10029"; a="206165958" X-IronPort-AV: E=Sophos;i="5.83,306,1616482800"; d="scan'208";a="206165958" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Jun 2021 09:35:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,306,1616482800"; d="scan'208";a="456395720" Received: from silpixa00399302.ir.intel.com ([10.237.214.136]) by fmsmga008.fm.intel.com with ESMTP; 28 Jun 2021 09:35:00 -0700 From: Arek Kusztal To: dev@dpdk.org Cc: gakhil@marvell.com, fiona.trahe@intel.com, roy.fan.zhang@intel.com, Arek Kusztal Date: Mon, 28 Jun 2021 17:34:31 +0100 Message-Id: <20210628163434.77741-14-arkadiuszx.kusztal@intel.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20210628163434.77741-1-arkadiuszx.kusztal@intel.com> References: <20210628163434.77741-1-arkadiuszx.kusztal@intel.com> Subject: [dpdk-dev] [PATCH v2 13/16] common/qat: add service discovery to qat gen4 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This commit adds service discovery to generation four of Intel QuickAssist Technology devices. Signed-off-by: Arek Kusztal --- drivers/common/qat/qat_common.h | 8 ++++++ drivers/common/qat/qat_device.c | 20 ++++++++++++--- drivers/common/qat/qat_device.h | 3 +++ drivers/common/qat/qat_qp.c | 43 +++++++++++++++++++++++++-------- drivers/common/qat/qat_qp.h | 3 +-- 5 files changed, 62 insertions(+), 15 deletions(-) diff --git a/drivers/common/qat/qat_common.h b/drivers/common/qat/qat_common.h index 845c8d99ab..23715085f4 100644 --- a/drivers/common/qat/qat_common.h +++ b/drivers/common/qat/qat_common.h @@ -29,6 +29,14 @@ enum qat_service_type { QAT_SERVICE_INVALID }; +enum qat_svc_list { + QAT_SVC_UNUSED = 0, + QAT_SVC_CRYPTO = 1, + QAT_SVC_COMPRESSION = 2, + QAT_SVC_SYM = 3, + QAT_SVC_ASYM = 4, +}; + #define QAT_MAX_SERVICES (QAT_SERVICE_INVALID) /**< Common struct for scatter-gather list operations */ diff --git a/drivers/common/qat/qat_device.c b/drivers/common/qat/qat_device.c index e52d90fcd7..1b967cbcf7 100644 --- a/drivers/common/qat/qat_device.c +++ b/drivers/common/qat/qat_device.c @@ -148,6 +148,22 @@ qat_gen4_reset_ring_pair(struct qat_pci_device *qat_pci_dev) return 0; } +int qat_query_svc(struct qat_pci_device *qat_dev, uint8_t *val) +{ + int ret = -(EINVAL); + struct qat_pf2vf_msg pf2vf_msg; + + if (qat_dev->qat_dev_gen == QAT_GEN4) { + pf2vf_msg.msg_type = ADF_VF2PF_MSGTYPE_GET_SMALL_BLOCK_REQ; + pf2vf_msg.block_hdr = ADF_VF2PF_BLOCK_MSG_GET_RING_TO_SVC_REQ; + pf2vf_msg.msg_data = 2; + ret = qat_pf2vf_exch_msg(qat_dev, pf2vf_msg, 2, val); + } + + return ret; +} + + static void qat_dev_parse_cmd(const char *str, struct qat_dev_cmd_param *qat_dev_cmd_param) { @@ -296,9 +312,7 @@ qat_pci_device_allocate(struct rte_pci_device *pci_dev, qat_dev_parse_cmd(devargs->drv_str, qat_dev_cmd_param); if (qat_dev->qat_dev_gen >= QAT_GEN4) { - int ret = qat_read_qp_config(qat_dev, qat_dev->qat_dev_gen); - - if (ret) { + if (qat_read_qp_config(qat_dev)) { QAT_LOG(ERR, "Cannot acquire ring configuration for QAT_%d", qat_dev_id); diff --git a/drivers/common/qat/qat_device.h b/drivers/common/qat/qat_device.h index 05e164baa7..228c057d1e 100644 --- a/drivers/common/qat/qat_device.h +++ b/drivers/common/qat/qat_device.h @@ -159,4 +159,7 @@ qat_comp_dev_create(struct qat_pci_device *qat_pci_dev __rte_unused, int qat_comp_dev_destroy(struct qat_pci_device *qat_pci_dev __rte_unused); +int +qat_query_svc(struct qat_pci_device *qat_pci_dev, uint8_t *ret); + #endif /* _QAT_DEVICE_H_ */ diff --git a/drivers/common/qat/qat_qp.c b/drivers/common/qat/qat_qp.c index 8be59779f9..026ea5ee01 100644 --- a/drivers/common/qat/qat_qp.c +++ b/drivers/common/qat/qat_qp.c @@ -504,20 +504,43 @@ qat_select_valid_queue(struct qat_pci_device *qat_dev, int qp_id, } int -qat_read_qp_config(struct qat_pci_device *qat_dev, - enum qat_device_gen qat_dev_gen) +qat_read_qp_config(struct qat_pci_device *qat_dev) { + int i = 0; + enum qat_device_gen qat_dev_gen = qat_dev->qat_dev_gen; + if (qat_dev_gen == QAT_GEN4) { - /* Read default configuration, - * until some probe of it can be done - */ - int i = 0; + uint16_t svc = 0; + if (qat_query_svc(qat_dev, (uint8_t *)&svc)) + return -(EFAULT); for (; i < QAT_GEN4_BUNDLE_NUM; i++) { struct qat_qp_hw_data *hw_data = &qat_dev->qp_gen4_data[i][0]; - enum qat_service_type service_type = - (QAT_GEN4_QP_DEFCON >> (8 * i)) & 0xFF; + uint8_t svc1 = (svc >> (3 * i)) & 0x7; + enum qat_service_type service_type = QAT_SERVICE_INVALID; + + if (svc1 == QAT_SVC_SYM) { + service_type = QAT_SERVICE_SYMMETRIC; + QAT_LOG(DEBUG, + "Discovered SYMMETRIC service on bundle %d", + i); + } else if (svc1 == QAT_SVC_COMPRESSION) { + service_type = QAT_SERVICE_COMPRESSION; + QAT_LOG(DEBUG, + "Discovered COPRESSION service on bundle %d", + i); + } else if (svc1 == QAT_SVC_ASYM) { + service_type = QAT_SERVICE_ASYMMETRIC; + QAT_LOG(DEBUG, + "Discovered ASYMMETRIC service on bundle %d", + i); + } else { + QAT_LOG(ERR, + "Unrecognized service on bundle %d", + i); + return -(EFAULT); + } memset(hw_data, 0, sizeof(*hw_data)); hw_data->service_type = service_type; @@ -534,9 +557,9 @@ qat_read_qp_config(struct qat_pci_device *qat_dev, hw_data->rx_ring_num = 1; hw_data->hw_bundle_num = i; } + return 0; } - /* With default config will always return success */ - return 0; + return -(EINVAL); } static int qat_qp_check_queue_alignment(uint64_t phys_addr, diff --git a/drivers/common/qat/qat_qp.h b/drivers/common/qat/qat_qp.h index 3d9a757349..e1627197fa 100644 --- a/drivers/common/qat/qat_qp.h +++ b/drivers/common/qat/qat_qp.h @@ -134,7 +134,6 @@ qat_select_valid_queue(struct qat_pci_device *qat_dev, int qp_id, enum qat_service_type service_type); int -qat_read_qp_config(struct qat_pci_device *qat_dev, - enum qat_device_gen qat_dev_gen); +qat_read_qp_config(struct qat_pci_device *qat_dev); #endif /* _QAT_QP_H_ */ -- 2.30.2