crypto/ccp: fix fd leak on probe failure

[dpdk.git] / drivers / crypto / ccp / ccp_dev.c

diff --git a/drivers/crypto/ccp/ccp_dev.c b/drivers/crypto/ccp/ccp_dev.c
index 34e44b3..7d98b2e 100644 (file)
--- a/drivers/crypto/ccp/ccp_dev.c
+++ b/drivers/crypto/ccp/ccp_dev.c
@@ -35,6 +35,53 @@ ccp_dev_start(struct rte_cryptodev *dev)
        return 0;
 }
 
+struct ccp_queue *
+ccp_allot_queue(struct rte_cryptodev *cdev, int slot_req)
+{
+       int i, ret = 0;
+       struct ccp_device *dev;
+       struct ccp_private *priv = cdev->data->dev_private;
+
+       dev = TAILQ_NEXT(priv->last_dev, next);
+       if (unlikely(dev == NULL))
+               dev = TAILQ_FIRST(&ccp_list);
+       priv->last_dev = dev;
+       if (dev->qidx >= dev->cmd_q_count)
+               dev->qidx = 0;
+       ret = rte_atomic64_read(&dev->cmd_q[dev->qidx].free_slots);
+       if (ret >= slot_req)
+               return &dev->cmd_q[dev->qidx];
+       for (i = 0; i < dev->cmd_q_count; i++) {
+               dev->qidx++;
+               if (dev->qidx >= dev->cmd_q_count)
+                       dev->qidx = 0;
+               ret = rte_atomic64_read(&dev->cmd_q[dev->qidx].free_slots);
+               if (ret >= slot_req)
+                       return &dev->cmd_q[dev->qidx];
+       }
+       return NULL;
+}
+
+int
+ccp_read_hwrng(uint32_t *value)
+{
+       struct ccp_device *dev;
+
+       TAILQ_FOREACH(dev, &ccp_list, next) {
+               void *vaddr = (void *)(dev->pci.mem_resource[2].addr);
+
+               while (dev->hwrng_retries++ < CCP_MAX_TRNG_RETRIES) {
+                       *value = CCP_READ_REG(vaddr, TRNG_OUT_REG);
+                       if (*value) {
+                               dev->hwrng_retries = 0;
+                               return 0;
+                       }
+               }
+               dev->hwrng_retries = 0;
+       }
+       return -1;
+}
+
 static const struct rte_memzone *
 ccp_queue_dma_zone_reserve(const char *queue_name,
                           uint32_t queue_size,
@@ -713,7 +760,7 @@ ccp_probe_device(const char *dirname, uint16_t domain,
        return 0;
 fail:
        CCP_LOG_ERR("CCP Device probe failed");
-       if (uio_fd > 0)
+       if (uio_fd >= 0)
                close(uio_fd);
        if (ccp_dev)
                rte_free(ccp_dev);