examples/ip_pipeline: add TAP port example
[dpdk.git] / drivers / bus / fslmc / fslmc_vfio.c
index a1309b3..62499de 100644 (file)
@@ -1,34 +1,8 @@
-/*-
- *   BSD LICENSE
+/* SPDX-License-Identifier: BSD-3-Clause
  *
  *   Copyright (c) 2015-2016 Freescale Semiconductor, Inc. All rights reserved.
- *   Copyright 2016 NXP.
+ *   Copyright 2016 NXP
  *
- *   Redistribution and use in source and binary forms, with or without
- *   modification, are permitted provided that the following conditions
- *   are met:
- *
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in
- *       the documentation and/or other materials provided with the
- *       distribution.
- *     * Neither the name of Freescale Semiconductor, Inc nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <unistd.h>
@@ -46,8 +20,9 @@
 #include <dirent.h>
 #include <sys/eventfd.h>
 
+#include <eal_filesystem.h>
 #include <rte_mbuf.h>
-#include <rte_ethdev.h>
+#include <rte_ethdev_driver.h>
 #include <rte_malloc.h>
 #include <rte_memcpy.h>
 #include <rte_string_fns.h>
 
 #include "rte_fslmc.h"
 #include "fslmc_vfio.h"
+#include "fslmc_logs.h"
+#include <mc/fsl_dpmng.h>
 
 #include "portal/dpaa2_hw_pvt.h"
 #include "portal/dpaa2_hw_dpio.h"
 
-#define FSLMC_VFIO_LOG(level, fmt, args...) \
-       RTE_LOG(level, EAL, fmt "\n", ##args)
-
 /** Pathname of FSL-MC devices directory. */
 #define SYSFS_FSL_MC_DEVICES "/sys/bus/fsl-mc/devices"
 
@@ -100,19 +74,18 @@ fslmc_get_container_group(int *groupid)
        if (!g_container) {
                container = getenv("DPRC");
                if (container == NULL) {
-                       RTE_LOG(WARNING, EAL, "DPAA2: DPRC not available\n");
+                       DPAA2_BUS_INFO("DPAA2: DPRC not available");
                        return -EINVAL;
                }
 
                if (strlen(container) >= FSLMC_CONTAINER_MAX_LEN) {
-                       FSLMC_VFIO_LOG(ERR, "Invalid container name: %s\n",
-                                      container);
+                       DPAA2_BUS_ERR("Invalid container name: %s", container);
                        return -1;
                }
 
                g_container = strdup(container);
                if (!g_container) {
-                       FSLMC_VFIO_LOG(ERR, "Out of memory.");
+                       DPAA2_BUS_ERR("Mem alloc failure; Container name");
                        return -ENOMEM;
                }
        }
@@ -120,13 +93,12 @@ fslmc_get_container_group(int *groupid)
        /* get group number */
        ret = vfio_get_group_no(SYSFS_FSL_MC_DEVICES, g_container, groupid);
        if (ret <= 0) {
-               FSLMC_VFIO_LOG(ERR, "Unable to find %s IOMMU group",
-                              g_container);
+               DPAA2_BUS_ERR("Unable to find %s IOMMU group", g_container);
                return -1;
        }
 
-       FSLMC_VFIO_LOG(DEBUG, "Container: %s has VFIO iommu group id = %d",
-                      g_container, *groupid);
+       DPAA2_BUS_DEBUG("Container: %s has VFIO iommu group id = %d",
+                       g_container, *groupid);
 
        return 0;
 }
@@ -137,14 +109,14 @@ vfio_connect_container(void)
        int fd, ret;
 
        if (vfio_container.used) {
-               FSLMC_VFIO_LOG(DEBUG, "No container available.");
+               DPAA2_BUS_DEBUG("No container available");
                return -1;
        }
 
        /* Try connecting to vfio container if already created */
        if (!ioctl(vfio_group.fd, VFIO_GROUP_SET_CONTAINER,
                &vfio_container.fd)) {
-               FSLMC_VFIO_LOG(INFO,
+               DPAA2_BUS_DEBUG(
                    "Container pre-exists with FD[0x%x] for this group",
                    vfio_container.fd);
                vfio_group.container = &vfio_container;
@@ -154,7 +126,7 @@ vfio_connect_container(void)
        /* Opens main vfio file descriptor which represents the "container" */
        fd = vfio_get_container_fd();
        if (fd < 0) {
-               FSLMC_VFIO_LOG(ERR, "Failed to open VFIO container");
+               DPAA2_BUS_ERR("Failed to open VFIO container");
                return -errno;
        }
 
@@ -163,19 +135,19 @@ vfio_connect_container(void)
                /* Connect group to container */
                ret = ioctl(vfio_group.fd, VFIO_GROUP_SET_CONTAINER, &fd);
                if (ret) {
-                       FSLMC_VFIO_LOG(ERR, "Failed to setup group container");
+                       DPAA2_BUS_ERR("Failed to setup group container");
                        close(fd);
                        return -errno;
                }
 
                ret = ioctl(fd, VFIO_SET_IOMMU, VFIO_TYPE1_IOMMU);
                if (ret) {
-                       FSLMC_VFIO_LOG(ERR, "Failed to setup VFIO iommu");
+                       DPAA2_BUS_ERR("Failed to setup VFIO iommu");
                        close(fd);
                        return -errno;
                }
        } else {
-               FSLMC_VFIO_LOG(ERR, "No supported IOMMU available");
+               DPAA2_BUS_ERR("No supported IOMMU available");
                close(fd);
                return -EINVAL;
        }
@@ -203,7 +175,7 @@ static int vfio_map_irq_region(struct fslmc_vfio_group *group)
        vaddr = (unsigned long *)mmap(NULL, 0x1000, PROT_WRITE |
                PROT_READ, MAP_SHARED, container_device_fd, 0x6030000);
        if (vaddr == MAP_FAILED) {
-               FSLMC_VFIO_LOG(ERR, "Unable to map region (errno = %d)", errno);
+               DPAA2_BUS_ERR("Unable to map region (errno = %d)", errno);
                return -errno;
        }
 
@@ -213,7 +185,7 @@ static int vfio_map_irq_region(struct fslmc_vfio_group *group)
        if (ret == 0)
                return 0;
 
-       FSLMC_VFIO_LOG(ERR, "VFIO_IOMMU_MAP_DMA fails (errno = %d)", errno);
+       DPAA2_BUS_ERR("Unable to map DMA address (errno = %d)", errno);
        return -errno;
 }
 
@@ -234,20 +206,23 @@ int rte_fslmc_vfio_dmamap(void)
 
        memseg = rte_eal_get_physmem_layout();
        if (memseg == NULL) {
-               FSLMC_VFIO_LOG(ERR, "Cannot get physical layout.");
+               DPAA2_BUS_ERR("Cannot get physical layout");
                return -ENODEV;
        }
 
        for (i = 0; i < RTE_MAX_MEMSEG; i++) {
                if (memseg[i].addr == NULL && memseg[i].len == 0) {
-                       FSLMC_VFIO_LOG(DEBUG, "Total %d segments found.", i);
+                       DPAA2_BUS_DEBUG("Total %d segments found", i);
                        break;
                }
 
                dma_map.size = memseg[i].len;
                dma_map.vaddr = memseg[i].addr_64;
 #ifdef RTE_LIBRTE_DPAA2_USE_PHYS_IOVA
-               dma_map.iova = memseg[i].phys_addr;
+               if (rte_eal_iova_mode() == RTE_IOVA_VA)
+                       dma_map.iova = dma_map.vaddr;
+               else
+                       dma_map.iova = memseg[i].iova;
 #else
                dma_map.iova = dma_map.vaddr;
 #endif
@@ -256,25 +231,25 @@ int rte_fslmc_vfio_dmamap(void)
                group = &vfio_group;
 
                if (!group->container) {
-                       FSLMC_VFIO_LOG(ERR, "Container is not connected ");
+                       DPAA2_BUS_ERR("Container is not connected");
                        return -1;
                }
 
-               FSLMC_VFIO_LOG(DEBUG, "-->Initial SHM Virtual ADDR %llX",
-                            dma_map.vaddr);
-               FSLMC_VFIO_LOG(DEBUG, "-----> DMA size 0x%llX", dma_map.size);
+               DPAA2_BUS_DEBUG("-->Initial SHM Virtual ADDR %llX",
+                               dma_map.vaddr);
+               DPAA2_BUS_DEBUG("-----> DMA size 0x%llX", dma_map.size);
                ret = ioctl(group->container->fd, VFIO_IOMMU_MAP_DMA,
                            &dma_map);
                if (ret) {
-                       FSLMC_VFIO_LOG(ERR, "VFIO_IOMMU_MAP_DMA API(errno = %d)",
-                                      errno);
+                       DPAA2_BUS_ERR("Unable to map DMA address (errno = %d)",
+                                     errno);
                        return ret;
                }
        }
 
        /* Verifying that at least single segment is available */
        if (i <= 0) {
-               FSLMC_VFIO_LOG(ERR, "No Segments found for VFIO Mapping");
+               DPAA2_BUS_ERR("No Segments found for VFIO Mapping");
                return -1;
        }
 
@@ -291,7 +266,7 @@ int rte_fslmc_vfio_dmamap(void)
 
 static int64_t vfio_map_mcp_obj(struct fslmc_vfio_group *group, char *mcp_obj)
 {
-       int64_t v_addr = (int64_t)MAP_FAILED;
+       intptr_t v_addr = (intptr_t)MAP_FAILED;
        int32_t ret, mc_fd;
 
        struct vfio_device_info d_info = { .argsz = sizeof(d_info) };
@@ -300,29 +275,29 @@ static int64_t vfio_map_mcp_obj(struct fslmc_vfio_group *group, char *mcp_obj)
        /* getting the mcp object's fd*/
        mc_fd = ioctl(group->fd, VFIO_GROUP_GET_DEVICE_FD, mcp_obj);
        if (mc_fd < 0) {
-               FSLMC_VFIO_LOG(ERR, "error in VFIO get dev %s fd from group %d",
-                              mcp_obj, group->fd);
+               DPAA2_BUS_ERR("Error in VFIO get dev %s fd from group %d",
+                             mcp_obj, group->fd);
                return v_addr;
        }
 
        /* getting device info*/
        ret = ioctl(mc_fd, VFIO_DEVICE_GET_INFO, &d_info);
        if (ret < 0) {
-               FSLMC_VFIO_LOG(ERR, "error in VFIO getting DEVICE_INFO");
+               DPAA2_BUS_ERR("Error in VFIO getting DEVICE_INFO");
                goto MC_FAILURE;
        }
 
        /* getting device region info*/
        ret = ioctl(mc_fd, VFIO_DEVICE_GET_REGION_INFO, &reg_info);
        if (ret < 0) {
-               FSLMC_VFIO_LOG(ERR, "error in VFIO getting REGION_INFO");
+               DPAA2_BUS_ERR("Error in VFIO getting REGION_INFO");
                goto MC_FAILURE;
        }
 
-       FSLMC_VFIO_LOG(DEBUG, "region offset = %llx  , region size = %llx",
-                      reg_info.offset, reg_info.size);
+       DPAA2_BUS_DEBUG("Region offset = %llx  , region size = %llx",
+                       reg_info.offset, reg_info.size);
 
-       v_addr = (uint64_t)mmap(NULL, reg_info.size,
+       v_addr = (size_t)mmap(NULL, reg_info.size,
                PROT_WRITE | PROT_READ, MAP_SHARED,
                mc_fd, reg_info.offset);
 
@@ -334,36 +309,105 @@ MC_FAILURE:
 
 #define IRQ_SET_BUF_LEN  (sizeof(struct vfio_irq_set) + sizeof(int))
 
-int rte_dpaa2_intr_enable(struct rte_intr_handle *intr_handle,
-                         uint32_t index)
+int rte_dpaa2_intr_enable(struct rte_intr_handle *intr_handle, int index)
 {
-       struct vfio_irq_set *irq_set;
+       int len, ret;
        char irq_set_buf[IRQ_SET_BUF_LEN];
-       int *fd_ptr, fd, ret;
+       struct vfio_irq_set *irq_set;
+       int *fd_ptr;
+
+       len = sizeof(irq_set_buf);
 
-       /* Prepare vfio_irq_set structure and SET the IRQ in VFIO */
-       /* Give the eventfd to VFIO */
-       fd = eventfd(0, 0);
        irq_set = (struct vfio_irq_set *)irq_set_buf;
-       irq_set->argsz = sizeof(irq_set_buf);
+       irq_set->argsz = len;
        irq_set->count = 1;
-       irq_set->flags = VFIO_IRQ_SET_DATA_EVENTFD |
-                        VFIO_IRQ_SET_ACTION_TRIGGER;
+       irq_set->flags =
+               VFIO_IRQ_SET_DATA_EVENTFD | VFIO_IRQ_SET_ACTION_TRIGGER;
        irq_set->index = index;
        irq_set->start = 0;
        fd_ptr = (int *)&irq_set->data;
-       *fd_ptr = fd;
+       *fd_ptr = intr_handle->fd;
 
        ret = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
-       if (ret < 0) {
-               FSLMC_VFIO_LOG(ERR, "Unable to set IRQ in VFIO, ret: %d\n",
-                              ret);
-               return -1;
+       if (ret) {
+               DPAA2_BUS_ERR("Error:dpaa2 SET IRQs fd=%d, err = %d(%s)",
+                             intr_handle->fd, errno, strerror(errno));
+               return ret;
        }
 
-       /* Set the FD and update the flags */
-       intr_handle->fd = fd;
-       return 0;
+       return ret;
+}
+
+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;
+
+       len = sizeof(struct vfio_irq_set);
+
+       irq_set = (struct vfio_irq_set *)irq_set_buf;
+       irq_set->argsz = len;
+       irq_set->flags = VFIO_IRQ_SET_DATA_NONE | VFIO_IRQ_SET_ACTION_TRIGGER;
+       irq_set->index = index;
+       irq_set->start = 0;
+       irq_set->count = 0;
+
+       ret = ioctl(intr_handle->vfio_dev_fd, VFIO_DEVICE_SET_IRQS, irq_set);
+       if (ret)
+               DPAA2_BUS_ERR(
+                       "Error disabling dpaa2 interrupts for fd %d",
+                       intr_handle->fd);
+
+       return ret;
+}
+
+/* set up interrupt support (but not enable interrupts) */
+int
+rte_dpaa2_vfio_setup_intr(struct rte_intr_handle *intr_handle,
+                         int vfio_dev_fd,
+                         int num_irqs)
+{
+       int i, ret;
+
+       /* start from MSI-X interrupt type */
+       for (i = 0; i < num_irqs; i++) {
+               struct vfio_irq_info irq_info = { .argsz = sizeof(irq_info) };
+               int fd = -1;
+
+               irq_info.index = i;
+
+               ret = ioctl(vfio_dev_fd, VFIO_DEVICE_GET_IRQ_INFO, &irq_info);
+               if (ret < 0) {
+                       DPAA2_BUS_ERR("Cannot get IRQ(%d) info, error %i (%s)",
+                                     i, errno, strerror(errno));
+                       return -1;
+               }
+
+               /* if this vector cannot be used with eventfd,
+                * fail if we explicitly
+                * specified interrupt type, otherwise continue
+                */
+               if ((irq_info.flags & VFIO_IRQ_INFO_EVENTFD) == 0)
+                       continue;
+
+               /* set up an eventfd for interrupts */
+               fd = eventfd(0, EFD_NONBLOCK | EFD_CLOEXEC);
+               if (fd < 0) {
+                       DPAA2_BUS_ERR("Cannot set up eventfd, error %i (%s)",
+                                     errno, strerror(errno));
+                       return -1;
+               }
+
+               intr_handle->fd = fd;
+               intr_handle->type = RTE_INTR_HANDLE_VFIO_MSI;
+               intr_handle->vfio_dev_fd = vfio_dev_fd;
+
+               return 0;
+       }
+
+       /* if we're here, we haven't found a suitable interrupt vector */
+       return -1;
 }
 
 /*
@@ -380,17 +424,22 @@ fslmc_process_iodevices(struct rte_dpaa2_device *dev)
        dev_fd = ioctl(vfio_group.fd, VFIO_GROUP_GET_DEVICE_FD,
                       dev->device.name);
        if (dev_fd <= 0) {
-               FSLMC_VFIO_LOG(ERR, "Unable to obtain device FD for device:%s",
-                              dev->device.name);
+               DPAA2_BUS_ERR("Unable to obtain device FD for device:%s",
+                             dev->device.name);
                return -1;
        }
 
        if (ioctl(dev_fd, VFIO_DEVICE_GET_INFO, &device_info)) {
-               FSLMC_VFIO_LOG(ERR, "DPAA2 VFIO_DEVICE_GET_INFO fail");
+               DPAA2_BUS_ERR("Unable to obtain information for device:%s",
+                             dev->device.name);
                return -1;
        }
 
        switch (dev->dev_type) {
+       case DPAA2_ETH:
+               rte_dpaa2_vfio_setup_intr(&dev->intr_handle, dev_fd,
+                                         device_info.num_irqs);
+               break;
        case DPAA2_CON:
        case DPAA2_IO:
        case DPAA2_CI:
@@ -407,40 +456,59 @@ fslmc_process_iodevices(struct rte_dpaa2_device *dev)
                break;
        }
 
-       FSLMC_VFIO_LOG(DEBUG, "Device (%s) abstracted from VFIO",
-                      dev->device.name);
+       DPAA2_BUS_DEBUG("Device (%s) abstracted from VFIO",
+                       dev->device.name);
        return 0;
 }
 
 static int
 fslmc_process_mcp(struct rte_dpaa2_device *dev)
 {
-       int64_t v_addr;
+       intptr_t v_addr;
        char *dev_name;
+       struct fsl_mc_io dpmng  = {0};
+       struct mc_version mc_ver_info = {0};
 
        rte_mcp_ptr_list = malloc(sizeof(void *) * 1);
        if (!rte_mcp_ptr_list) {
-               FSLMC_VFIO_LOG(ERR, "Out of memory");
+               DPAA2_BUS_ERR("Unable to allocate MC portal memory");
                return -ENOMEM;
        }
 
        dev_name = strdup(dev->device.name);
        if (!dev_name) {
-               FSLMC_VFIO_LOG(ERR, "Out of memory.");
+               DPAA2_BUS_ERR("Unable to allocate MC device name memory");
                free(rte_mcp_ptr_list);
                rte_mcp_ptr_list = NULL;
                return -ENOMEM;
        }
 
        v_addr = vfio_map_mcp_obj(&vfio_group, dev_name);
-       if (v_addr == (int64_t)MAP_FAILED) {
-               FSLMC_VFIO_LOG(ERR, "Error mapping region  (errno = %d)",
-                              errno);
+       if (v_addr == (intptr_t)MAP_FAILED) {
+               DPAA2_BUS_ERR("Error mapping region (errno = %d)", errno);
                free(rte_mcp_ptr_list);
                rte_mcp_ptr_list = NULL;
                return -1;
        }
 
+       /* check the MC version compatibility */
+       dpmng.regs = (void *)v_addr;
+       if (mc_get_version(&dpmng, CMD_PRI_LOW, &mc_ver_info)) {
+               DPAA2_BUS_ERR("Unable to obtain MC version");
+               return -1;
+       }
+
+       if ((mc_ver_info.major != MC_VER_MAJOR) ||
+           (mc_ver_info.minor < MC_VER_MINOR)) {
+               DPAA2_BUS_ERR("DPAA2 MC version not compatible!"
+                             " Expected %d.%d.x, Detected %d.%d.%d",
+                             MC_VER_MAJOR, MC_VER_MINOR,
+                             mc_ver_info.major, mc_ver_info.minor,
+                             mc_ver_info.revision);
+               free(rte_mcp_ptr_list);
+               rte_mcp_ptr_list = NULL;
+               return -1;
+       }
        rte_mcp_ptr_list[0] = (void *)v_addr;
 
        return 0;
@@ -458,7 +526,7 @@ fslmc_vfio_process_group(void)
                if (dev->dev_type == DPAA2_MPORTAL) {
                        ret = fslmc_process_mcp(dev);
                        if (ret) {
-                               FSLMC_VFIO_LOG(DEBUG, "Unable to map Portal.");
+                               DPAA2_BUS_ERR("Unable to map MC Portal");
                                return -1;
                        }
                        if (!found_mportal)
@@ -475,8 +543,7 @@ fslmc_vfio_process_group(void)
 
        /* Cannot continue if there is not even a single mportal */
        if (!found_mportal) {
-               FSLMC_VFIO_LOG(DEBUG,
-                              "No MC Portal device found. Not continuing.");
+               DPAA2_BUS_ERR("No MC Portal device found. Not continuing");
                return -1;
        }
 
@@ -489,9 +556,8 @@ fslmc_vfio_process_group(void)
                case DPAA2_CRYPTO:
                        ret = fslmc_process_iodevices(dev);
                        if (ret) {
-                               FSLMC_VFIO_LOG(DEBUG,
-                                              "Dev (%s) init failed.",
-                                              dev->device.name);
+                               DPAA2_BUS_DEBUG("Dev (%s) init failed",
+                                               dev->device.name);
                                return ret;
                        }
                        break;
@@ -504,9 +570,8 @@ fslmc_vfio_process_group(void)
                         */
                        ret = fslmc_process_iodevices(dev);
                        if (ret) {
-                               FSLMC_VFIO_LOG(DEBUG,
-                                              "Dev (%s) init failed.",
-                                              dev->device.name);
+                               DPAA2_BUS_DEBUG("Dev (%s) init failed",
+                                               dev->device.name);
                                return -1;
                        }
 
@@ -520,8 +585,8 @@ fslmc_vfio_process_group(void)
                case DPAA2_UNKNOWN:
                default:
                        /* Unknown - ignore */
-                       FSLMC_VFIO_LOG(DEBUG, "Found unknown device (%s).",
-                                      dev->device.name);
+                       DPAA2_BUS_DEBUG("Found unknown device (%s)",
+                                       dev->device.name);
                        TAILQ_REMOVE(&rte_fslmc_bus.device_list, dev, next);
                        free(dev);
                        dev = NULL;
@@ -550,7 +615,7 @@ fslmc_vfio_setup_group(void)
         * processing.
         */
        if (vfio_group.groupid == groupid) {
-               FSLMC_VFIO_LOG(ERR, "groupid already exists %d", groupid);
+               DPAA2_BUS_ERR("groupid already exists %d", groupid);
                return 0;
        }
 
@@ -563,14 +628,16 @@ fslmc_vfio_setup_group(void)
        /* Check group viability */
        ret = ioctl(vfio_group.fd, VFIO_GROUP_GET_STATUS, &status);
        if (ret) {
-               FSLMC_VFIO_LOG(ERR, "VFIO error getting group status");
+               DPAA2_BUS_ERR("VFIO error getting group status");
                close(vfio_group.fd);
+               rte_vfio_clear_group(vfio_group.fd);
                return ret;
        }
 
        if (!(status.flags & VFIO_GROUP_FLAGS_VIABLE)) {
-               FSLMC_VFIO_LOG(ERR, "VFIO group not viable");
+               DPAA2_BUS_ERR("VFIO group not viable");
                close(vfio_group.fd);
+               rte_vfio_clear_group(vfio_group.fd);
                return -EPERM;
        }
        /* Since Group is VIABLE, Store the groupid */
@@ -581,10 +648,11 @@ fslmc_vfio_setup_group(void)
                /* Now connect this IOMMU group to given container */
                ret = vfio_connect_container();
                if (ret) {
-                       FSLMC_VFIO_LOG(ERR,
+                       DPAA2_BUS_ERR(
                                "Error connecting container with groupid %d",
                                groupid);
                        close(vfio_group.fd);
+                       rte_vfio_clear_group(vfio_group.fd);
                        return ret;
                }
        }
@@ -592,14 +660,15 @@ fslmc_vfio_setup_group(void)
        /* Get Device information */
        ret = ioctl(vfio_group.fd, VFIO_GROUP_GET_DEVICE_FD, g_container);
        if (ret < 0) {
-               FSLMC_VFIO_LOG(ERR, "Error getting device %s fd from group %d",
-                              g_container, vfio_group.groupid);
+               DPAA2_BUS_ERR("Error getting device %s fd from group %d",
+                             g_container, vfio_group.groupid);
                close(vfio_group.fd);
+               rte_vfio_clear_group(vfio_group.fd);
                return ret;
        }
        container_device_fd = ret;
-       FSLMC_VFIO_LOG(DEBUG, "VFIO Container FD is [0x%X]",
-                      container_device_fd);
+       DPAA2_BUS_DEBUG("VFIO Container FD is [0x%X]",
+                       container_device_fd);
 
        return 0;
 }