git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ethdev: change allmulticast callbacks to return status
[dpdk.git]
/
drivers
/
crypto
/
qat
/
qat_sym_pmd.c
diff --git
a/drivers/crypto/qat/qat_sym_pmd.c
b/drivers/crypto/qat/qat_sym_pmd.c
index
28e579b
..
71f21ce
100644
(file)
--- a/
drivers/crypto/qat/qat_sym_pmd.c
+++ b/
drivers/crypto/qat/qat_sym_pmd.c
@@
-33,27
+33,23
@@
static int qat_sym_qp_release(struct rte_cryptodev *dev,
static int qat_sym_dev_config(__rte_unused struct rte_cryptodev *dev,
__rte_unused struct rte_cryptodev_config *config)
{
static int qat_sym_dev_config(__rte_unused struct rte_cryptodev *dev,
__rte_unused struct rte_cryptodev_config *config)
{
- PMD_INIT_FUNC_TRACE();
return 0;
}
static int qat_sym_dev_start(__rte_unused struct rte_cryptodev *dev)
{
return 0;
}
static int qat_sym_dev_start(__rte_unused struct rte_cryptodev *dev)
{
- PMD_INIT_FUNC_TRACE();
return 0;
}
static void qat_sym_dev_stop(__rte_unused struct rte_cryptodev *dev)
{
return 0;
}
static void qat_sym_dev_stop(__rte_unused struct rte_cryptodev *dev)
{
-
PMD_INIT_FUNC_TRACE()
;
+
return
;
}
static int qat_sym_dev_close(struct rte_cryptodev *dev)
{
int i, ret;
}
static int qat_sym_dev_close(struct rte_cryptodev *dev)
{
int i, ret;
- PMD_INIT_FUNC_TRACE();
-
for (i = 0; i < dev->data->nb_queue_pairs; i++) {
ret = qat_sym_qp_release(dev, i);
if (ret < 0)
for (i = 0; i < dev->data->nb_queue_pairs; i++) {
ret = qat_sym_qp_release(dev, i);
if (ret < 0)
@@
-71,15
+67,14
@@
static void qat_sym_dev_info_get(struct rte_cryptodev *dev,
qat_gen_config[internals->qat_dev->qat_dev_gen]
.qp_hw_data[QAT_SERVICE_SYMMETRIC];
qat_gen_config[internals->qat_dev->qat_dev_gen]
.qp_hw_data[QAT_SERVICE_SYMMETRIC];
- PMD_INIT_FUNC_TRACE();
if (info != NULL) {
info->max_nb_queue_pairs =
qat_qps_per_service(sym_hw_qps, QAT_SERVICE_SYMMETRIC);
info->feature_flags = dev->feature_flags;
info->capabilities = internals->qat_dev_capabilities;
if (info != NULL) {
info->max_nb_queue_pairs =
qat_qps_per_service(sym_hw_qps, QAT_SERVICE_SYMMETRIC);
info->feature_flags = dev->feature_flags;
info->capabilities = internals->qat_dev_capabilities;
- info->sym.max_nb_sessions = RTE_QAT_PMD_MAX_NB_SESSIONS;
info->driver_id = cryptodev_qat_driver_id;
info->driver_id = cryptodev_qat_driver_id;
- info->pci_dev = RTE_DEV_TO_PCI(dev->device);
+ /* No limit of number of sessions */
+ info->sym.max_nb_sessions = 0;
}
}
}
}
@@
-90,7
+85,7
@@
static void qat_sym_stats_get(struct rte_cryptodev *dev,
struct qat_sym_dev_private *qat_priv;
if (stats == NULL || dev == NULL) {
struct qat_sym_dev_private *qat_priv;
if (stats == NULL || dev == NULL) {
-
PMD_DRV
_LOG(ERR, "invalid ptr: stats %p, dev %p", stats, dev);
+
QAT
_LOG(ERR, "invalid ptr: stats %p, dev %p", stats, dev);
return;
}
qat_priv = dev->data->dev_private;
return;
}
qat_priv = dev->data->dev_private;
@@
-107,7
+102,7
@@
static void qat_sym_stats_reset(struct rte_cryptodev *dev)
struct qat_sym_dev_private *qat_priv;
if (dev == NULL) {
struct qat_sym_dev_private *qat_priv;
if (dev == NULL) {
-
PMD_DRV
_LOG(ERR, "invalid cryptodev ptr %p", dev);
+
QAT
_LOG(ERR, "invalid cryptodev ptr %p", dev);
return;
}
qat_priv = dev->data->dev_private;
return;
}
qat_priv = dev->data->dev_private;
@@
-120,7
+115,7
@@
static int qat_sym_qp_release(struct rte_cryptodev *dev, uint16_t queue_pair_id)
{
struct qat_sym_dev_private *qat_private = dev->data->dev_private;
{
struct qat_sym_dev_private *qat_private = dev->data->dev_private;
-
PMD_DRV
_LOG(DEBUG, "Release sym qp %u on device %d",
+
QAT
_LOG(DEBUG, "Release sym qp %u on device %d",
queue_pair_id, dev->data->dev_id);
qat_private->qat_dev->qps_in_use[QAT_SERVICE_SYMMETRIC][queue_pair_id]
queue_pair_id, dev->data->dev_id);
qat_private->qat_dev->qps_in_use[QAT_SERVICE_SYMMETRIC][queue_pair_id]
@@
-132,7
+127,7
@@
static int qat_sym_qp_release(struct rte_cryptodev *dev, uint16_t queue_pair_id)
static int qat_sym_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
const struct rte_cryptodev_qp_conf *qp_conf,
static int qat_sym_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
const struct rte_cryptodev_qp_conf *qp_conf,
- int socket_id
, struct rte_mempool *session_pool __rte_unused
)
+ int socket_id)
{
struct qat_qp *qp;
int ret = 0;
{
struct qat_qp *qp;
int ret = 0;
@@
-154,13
+149,12
@@
static int qat_sym_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id,
return ret;
}
if (qp_id >= qat_qps_per_service(sym_hw_qps, QAT_SERVICE_SYMMETRIC)) {
return ret;
}
if (qp_id >= qat_qps_per_service(sym_hw_qps, QAT_SERVICE_SYMMETRIC)) {
-
PMD_DRV
_LOG(ERR, "qp_id %u invalid for this device", qp_id);
+
QAT
_LOG(ERR, "qp_id %u invalid for this device", qp_id);
return -EINVAL;
}
qat_qp_conf.hw = qp_hw_data;
qat_qp_conf.build_request = qat_sym_build_request;
return -EINVAL;
}
qat_qp_conf.hw = qp_hw_data;
qat_qp_conf.build_request = qat_sym_build_request;
- qat_qp_conf.process_response = qat_sym_process_response;
qat_qp_conf.cookie_size = sizeof(struct qat_sym_op_cookie);
qat_qp_conf.nb_descriptors = qp_conf->nb_descriptors;
qat_qp_conf.socket_id = socket_id;
qat_qp_conf.cookie_size = sizeof(struct qat_sym_op_cookie);
qat_qp_conf.nb_descriptors = qp_conf->nb_descriptors;
qat_qp_conf.socket_id = socket_id;
@@
-208,14
+202,12
@@
static struct rte_cryptodev_ops crypto_qat_ops = {
.stats_reset = qat_sym_stats_reset,
.queue_pair_setup = qat_sym_qp_setup,
.queue_pair_release = qat_sym_qp_release,
.stats_reset = qat_sym_stats_reset,
.queue_pair_setup = qat_sym_qp_setup,
.queue_pair_release = qat_sym_qp_release,
- .queue_pair_start = NULL,
- .queue_pair_stop = NULL,
.queue_pair_count = NULL,
/* Crypto related operations */
.queue_pair_count = NULL,
/* Crypto related operations */
- .s
ession_get_size
= qat_sym_session_get_private_size,
- .s
ession_configure
= qat_sym_session_configure,
- .s
ession_clear
= qat_sym_session_clear
+ .s
ym_session_get_size
= qat_sym_session_get_private_size,
+ .s
ym_session_configure
= qat_sym_session_configure,
+ .s
ym_session_clear
= qat_sym_session_clear
};
static uint16_t
};
static uint16_t
@@
-250,8
+242,7
@@
qat_sym_dev_create(struct qat_pci_device *qat_pci_dev)
struct rte_cryptodev_pmd_init_params init_params = {
.name = "",
.socket_id = qat_pci_dev->pci_dev->device.numa_node,
struct rte_cryptodev_pmd_init_params init_params = {
.name = "",
.socket_id = qat_pci_dev->pci_dev->device.numa_node,
- .private_data_size = sizeof(struct qat_sym_dev_private),
- .max_nb_sessions = RTE_QAT_PMD_MAX_NB_SESSIONS
+ .private_data_size = sizeof(struct qat_sym_dev_private)
};
char name[RTE_CRYPTODEV_NAME_MAX_LEN];
struct rte_cryptodev *cryptodev;
};
char name[RTE_CRYPTODEV_NAME_MAX_LEN];
struct rte_cryptodev *cryptodev;
@@
-259,7
+250,7
@@
qat_sym_dev_create(struct qat_pci_device *qat_pci_dev)
snprintf(name, RTE_CRYPTODEV_NAME_MAX_LEN, "%s_%s",
qat_pci_dev->name, "sym");
snprintf(name, RTE_CRYPTODEV_NAME_MAX_LEN, "%s_%s",
qat_pci_dev->name, "sym");
-
PMD_DRV
_LOG(DEBUG, "Creating QAT SYM device %s", name);
+
QAT
_LOG(DEBUG, "Creating QAT SYM device %s", name);
/* Populate subset device to use in cryptodev device creation */
qat_pci_dev->sym_rte_dev.driver = &cryptodev_qat_sym_driver;
/* Populate subset device to use in cryptodev device creation */
qat_pci_dev->sym_rte_dev.driver = &cryptodev_qat_sym_driver;
@@
-283,7
+274,12
@@
qat_sym_dev_create(struct qat_pci_device *qat_pci_dev)
cryptodev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |
RTE_CRYPTODEV_FF_HW_ACCELERATED |
RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |
cryptodev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |
RTE_CRYPTODEV_FF_HW_ACCELERATED |
RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |
- RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER;
+ RTE_CRYPTODEV_FF_IN_PLACE_SGL |
+ RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT |
+ RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT |
+ RTE_CRYPTODEV_FF_OOP_LB_IN_SGL_OUT |
+ RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT |
+ RTE_CRYPTODEV_FF_DIGEST_ENCRYPTED;
internals = cryptodev->data->dev_private;
internals->qat_dev = qat_pci_dev;
internals = cryptodev->data->dev_private;
internals->qat_dev = qat_pci_dev;
@@
-295,17
+291,18
@@
qat_sym_dev_create(struct qat_pci_device *qat_pci_dev)
internals->qat_dev_capabilities = qat_gen1_sym_capabilities;
break;
case QAT_GEN2:
internals->qat_dev_capabilities = qat_gen1_sym_capabilities;
break;
case QAT_GEN2:
+ case QAT_GEN3:
internals->qat_dev_capabilities = qat_gen2_sym_capabilities;
break;
default:
internals->qat_dev_capabilities = qat_gen2_sym_capabilities;
internals->qat_dev_capabilities = qat_gen2_sym_capabilities;
break;
default:
internals->qat_dev_capabilities = qat_gen2_sym_capabilities;
-
PMD_DRV
_LOG(DEBUG,
+
QAT
_LOG(DEBUG,
"QAT gen %d capabilities unknown, default to GEN2",
qat_pci_dev->qat_dev_gen);
break;
}
"QAT gen %d capabilities unknown, default to GEN2",
qat_pci_dev->qat_dev_gen);
break;
}
-
PMD_DRV
_LOG(DEBUG, "Created QAT SYM device %s as cryptodev instance %d",
+
QAT
_LOG(DEBUG, "Created QAT SYM device %s as cryptodev instance %d",
cryptodev->data->name, internals->sym_dev_id);
return 0;
}
cryptodev->data->name, internals->sym_dev_id);
return 0;
}
@@
-329,7
+326,6
@@
qat_sym_dev_destroy(struct qat_pci_device *qat_pci_dev)
return 0;
}
return 0;
}
-
static struct cryptodev_driver qat_crypto_drv;
RTE_PMD_REGISTER_CRYPTO_DRIVER(qat_crypto_drv,
cryptodev_qat_sym_driver,
static struct cryptodev_driver qat_crypto_drv;
RTE_PMD_REGISTER_CRYPTO_DRIVER(qat_crypto_drv,
cryptodev_qat_sym_driver,