bus/fslmc: remove workaround for smmu mapping

[dpdk.git] / drivers / bus / fslmc / portal / dpaa2_hw_dpio.c

diff --git a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
index b667388..283441b 100644 (file)
--- a/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
+++ b/drivers/bus/fslmc/portal/dpaa2_hw_dpio.c
@@ -2,7 +2,7 @@
  *   BSD LICENSE
  *
  *   Copyright (c) 2016 Freescale Semiconductor, Inc. All rights reserved.
- *   Copyright (c) 2016 NXP. All rights reserved.
+ *   Copyright 2016 NXP.
  *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
@@ -57,7 +57,6 @@
 #include <rte_cycles.h>
 #include <rte_kvargs.h>
 #include <rte_dev.h>
-#include <rte_ethdev.h>
 
 #include <fslmc_logs.h>
 #include <fslmc_vfio.h>
@@ -122,7 +121,7 @@ static void dpaa2_affine_dpio_intr_to_respective_core(int32_t dpio_id)
        snprintf(string, STRING_LEN, "dpio.%d", dpio_id);
        file = fopen("/proc/interrupts", "r");
        if (!file) {
-               PMD_DRV_LOG(WARN, "Failed to open /proc/interrupts file\n");
+               PMD_DRV_LOG(WARNING, "Failed to open /proc/interrupts file\n");
                return;
        }
        while (getline(&temp, &len, file) != -1) {
@@ -133,7 +132,7 @@ static void dpaa2_affine_dpio_intr_to_respective_core(int32_t dpio_id)
        }
 
        if (!token) {
-               PMD_DRV_LOG(WARN, "Failed to get interrupt id for dpio.%d\n",
+               PMD_DRV_LOG(WARNING, "Failed to get interrupt id for dpio.%d\n",
                            dpio_id);
                if (temp)
                        free(temp);
@@ -146,10 +145,10 @@ static void dpaa2_affine_dpio_intr_to_respective_core(int32_t dpio_id)
                 cpu_mask, token);
        ret = system(command);
        if (ret < 0)
-               PMD_DRV_LOG(WARN,
+               PMD_DRV_LOG(WARNING,
                        "Failed to affine interrupts on respective core\n");
        else
-               PMD_DRV_LOG(WARN, " %s command is executed\n", command);
+               PMD_DRV_LOG(WARNING, " %s command is executed\n", command);
 
        free(temp);
        fclose(file);
@@ -470,16 +469,6 @@ dpaa2_create_dpio_device(struct fslmc_vfio_device *vdev,
                                PROT_WRITE | PROT_READ, MAP_SHARED,
                                vfio_dev_fd, reg_info.offset);
 
-       /* Create Mapping for QBMan Cache Enabled area. This is a fix for
-        * SMMU fault for DQRR statshing transaction.
-        */
-       if (vfio_dmamap_mem_region(dpio_dev->qbman_portal_ce_paddr,
-                                  reg_info.offset, reg_info.size)) {
-               PMD_INIT_LOG(ERR, "DMAMAP for Portal CE area failed.\n");
-               rte_free(dpio_dev);
-               return -1;
-       }
-
        reg_info.index = 1;
        if (ioctl(vfio_dev_fd, VFIO_DEVICE_GET_REGION_INFO, &reg_info)) {
                PMD_INIT_LOG(ERR, "vfio: error getting region info\n");
@@ -503,7 +492,7 @@ dpaa2_create_dpio_device(struct fslmc_vfio_device *vdev,
        io_space_count++;
        dpio_dev->index = io_space_count;
        TAILQ_INSERT_TAIL(&dpio_dev_list, dpio_dev, next);
-       PMD_INIT_LOG(DEBUG, "DPAA2: Added [dpio-%d]", object_id);
+       PMD_INIT_LOG(DEBUG, "DPAA2: Added [dpio.%d]", object_id);
 
        return 0;
 }