dma/idxd: fix error code for PCI device commands

[dpdk.git] / drivers / bus / fslmc / fslmc_vfio.c

diff --git a/drivers/bus/fslmc/fslmc_vfio.c b/drivers/bus/fslmc/fslmc_vfio.c
index 852fcfc..3d4e71a 100644 (file)
--- a/drivers/bus/fslmc/fslmc_vfio.c
+++ b/drivers/bus/fslmc/fslmc_vfio.c
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
  *   Copyright (c) 2015-2016 Freescale Semiconductor, Inc. All rights reserved.
- *   Copyright 2016-2019 NXP
+ *   Copyright 2016-2021 NXP
  *
  */
 
@@ -599,7 +599,7 @@ int rte_dpaa2_intr_enable(struct rte_intr_handle *intr_handle, int index)
        int len, ret;
        char irq_set_buf[IRQ_SET_BUF_LEN];
        struct vfio_irq_set *irq_set;
-       int *fd_ptr;
+       int *fd_ptr, vfio_dev_fd;
 
        len = sizeof(irq_set_buf);
 
@@ -611,12 +611,14 @@ int rte_dpaa2_intr_enable(struct rte_intr_handle *intr_handle, int index)
        irq_set->index = index;
        irq_set->start = 0;
        fd_ptr = (int *)&irq_set->data;
-       *fd_ptr = intr_handle->fd;
+       *fd_ptr = rte_intr_fd_get(intr_handle);
 
-       ret = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
+       vfio_dev_fd = rte_intr_dev_fd_get(intr_handle);
+       ret = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
        if (ret) {
                DPAA2_BUS_ERR("Error:dpaa2 SET IRQs fd=%d, err = %d(%s)",
-                             intr_handle->fd, errno, strerror(errno));
+                             rte_intr_fd_get(intr_handle), errno,
+                             strerror(errno));
                return ret;
        }
 
@@ -627,7 +629,7 @@ int rte_dpaa2_intr_disable(struct rte_intr_handle *intr_handle, int index)
 {
        struct vfio_irq_set *irq_set;
        char irq_set_buf[IRQ_SET_BUF_LEN];
-       int len, ret;
+       int len, ret, vfio_dev_fd;
 
        len = sizeof(struct vfio_irq_set);
 
@@ -638,11 +640,12 @@ int rte_dpaa2_intr_disable(struct rte_intr_handle *intr_handle, int index)
        irq_set->start = 0;
        irq_set->count = 0;
 
-       ret = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
+       vfio_dev_fd = rte_intr_dev_fd_get(intr_handle);
+       ret = ioctl(vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
        if (ret)
                DPAA2_BUS_ERR(
                        "Error disabling dpaa2 interrupts for fd %d",
-                       intr_handle->fd);
+                       rte_intr_fd_get(intr_handle));
 
        return ret;
 }
@@ -684,9 +687,14 @@ rte_dpaa2_vfio_setup_intr(struct rte_intr_handle *intr_handle,
                        return -1;
                }
 
-               intr_handle->fd = fd;
-               intr_handle->type = RTE_INTR_HANDLE_VFIO_MSI;
-               intr_handle->vfio_dev_fd = vfio_dev_fd;
+               if (rte_intr_fd_set(intr_handle, fd))
+                       return -rte_errno;
+
+               if (rte_intr_type_set(intr_handle, RTE_INTR_HANDLE_VFIO_MSI))
+                       return -rte_errno;
+
+               if (rte_intr_dev_fd_set(intr_handle, vfio_dev_fd))
+                       return -rte_errno;
 
                return 0;
        }
@@ -711,7 +719,7 @@ fslmc_process_iodevices(struct rte_dpaa2_device *dev)
 
        switch (dev->dev_type) {
        case DPAA2_ETH:
-               rte_dpaa2_vfio_setup_intr(&dev->intr_handle, dev_fd,
+               rte_dpaa2_vfio_setup_intr(dev->intr_handle, dev_fd,
                                          device_info.num_irqs);
                break;
        case DPAA2_CON:
@@ -720,6 +728,7 @@ fslmc_process_iodevices(struct rte_dpaa2_device *dev)
        case DPAA2_BPOOL:
        case DPAA2_DPRTC:
        case DPAA2_MUX:
+       case DPAA2_DPRC:
                TAILQ_FOREACH(object, &dpaa2_obj_list, next) {
                        if (dev->dev_type == object->dev_type)
                                object->create(dev_fd, &device_info,
@@ -873,6 +882,21 @@ fslmc_vfio_process_group(void)
                return -1;
        }
 
+       /* Search for DPRC device next as it updates endpoint of
+        * other devices.
+        */
+       current_device = 0;
+       RTE_TAILQ_FOREACH_SAFE(dev, &rte_fslmc_bus.device_list, next, dev_temp) {
+               if (dev->dev_type == DPAA2_DPRC) {
+                       ret = fslmc_process_iodevices(dev);
+                       if (ret) {
+                               DPAA2_BUS_ERR("Unable to process dprc");
+                               return -1;
+                       }
+                       TAILQ_REMOVE(&rte_fslmc_bus.device_list, dev, next);
+               }
+       }
+
        current_device = 0;
        RTE_TAILQ_FOREACH_SAFE(dev, &rte_fslmc_bus.device_list, next,
                dev_temp) {
@@ -971,6 +995,7 @@ fslmc_vfio_setup_group(void)
 {
        int groupid;
        int ret;
+       int vfio_container_fd;
        struct vfio_group_status status = { .argsz = sizeof(status) };
 
        /* if already done once */
@@ -989,8 +1014,15 @@ fslmc_vfio_setup_group(void)
                return 0;
        }
 
+       ret = rte_vfio_container_create();
+       if (ret < 0) {
+               DPAA2_BUS_ERR("Failed to open VFIO container");
+               return ret;
+       }
+       vfio_container_fd = ret;
+
        /* Get the actual group fd */
-       ret = rte_vfio_get_group_fd(groupid);
+       ret = rte_vfio_container_group_bind(vfio_container_fd, groupid);
        if (ret < 0)
                return ret;
        vfio_group.fd = ret;