dpdk: enable igc devices

[vpp.git] / src / plugins / dpdk / device / init.c

diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c
index cf32687..cf0203d 100644 (file)
--- a/src/plugins/dpdk/device/init.c
+++ b/src/plugins/dpdk/device/init.c
@@ -452,6 +452,7 @@ dpdk_lib_init (dpdk_main_t * dm)
              xd->flags |= DPDK_DEVICE_FLAG_INT_UNMASKABLE;
            case VNET_DPDK_PMD_E1000EM:
            case VNET_DPDK_PMD_IGB:
+           case VNET_DPDK_PMD_IGC:
            case VNET_DPDK_PMD_IXGBE:
            case VNET_DPDK_PMD_ICE:
              xd->port_type = port_type_from_speed_capa (&dev_info);
@@ -495,7 +496,7 @@ dpdk_lib_init (dpdk_main_t * dm)
                    DPDK_DEVICE_FLAG_TX_OFFLOAD |
                    DPDK_DEVICE_FLAG_INTEL_PHDR_CKSUM;
                }
-             /* sDPDK bug in multiqueue... */
+             /* DPDK bug in multiqueue... */
              /* xd->port_conf.intr_conf.rxq = 1; */
              break;
 
@@ -517,7 +518,8 @@ dpdk_lib_init (dpdk_main_t * dm)
                    DPDK_DEVICE_FLAG_TX_OFFLOAD |
                    DPDK_DEVICE_FLAG_INTEL_PHDR_CKSUM;
                }
-             xd->port_conf.intr_conf.rxq = 1;
+             /* DPDK bug in multiqueue... */
+             /* xd->port_conf.intr_conf.rxq = 1; */
              break;
 
            case VNET_DPDK_PMD_THUNDERX:
@@ -1136,6 +1138,25 @@ dpdk_bind_vmbus_devices_to_uio (dpdk_config_main_t * conf)
   /* *INDENT-ON* */
 }
 
+uword
+unformat_max_simd_bitwidth (unformat_input_t *input, va_list *va)
+{
+  uword *max_simd_bitwidth = va_arg (*va, uword *);
+
+  while (unformat_check_input (input) != UNFORMAT_END_OF_INPUT)
+    {
+      if (!unformat (input, "%u", max_simd_bitwidth))
+       goto error;
+
+      if (*max_simd_bitwidth != DPDK_MAX_SIMD_BITWIDTH_256 &&
+         *max_simd_bitwidth != DPDK_MAX_SIMD_BITWIDTH_512)
+       goto error;
+    }
+  return 1;
+error:
+  return 0;
+}
+
 static clib_error_t *
 dpdk_device_config (dpdk_config_main_t *conf, void *addr,
                    dpdk_device_addr_type_t addr_type, unformat_input_t *input,
@@ -1347,7 +1368,9 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
 
       else if (unformat (input, "no-multi-seg"))
        conf->no_multi_seg = 1;
-
+      else if (unformat (input, "max-simd-bitwidth %U",
+                        unformat_max_simd_bitwidth, &conf->max_simd_bitwidth))
+       ;
       else if (unformat (input, "dev default %U", unformat_vlib_cli_sub_input,
                         &sub_input))
        {
@@ -1691,8 +1714,14 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input)
                      (char **) conf->eal_init_args);
 
   /* enable the AVX-512 vPMDs in DPDK */
-  if (clib_cpu_supports_avx512_bitalg ())
+  if (clib_cpu_supports_avx512_bitalg () &&
+      conf->max_simd_bitwidth == DPDK_MAX_SIMD_BITWIDTH_DEFAULT)
     rte_vect_set_max_simd_bitwidth (RTE_VECT_SIMD_512);
+  else if (conf->max_simd_bitwidth != DPDK_MAX_SIMD_BITWIDTH_DEFAULT)
+    rte_vect_set_max_simd_bitwidth (conf->max_simd_bitwidth ==
+                                       DPDK_MAX_SIMD_BITWIDTH_256 ?
+                                     RTE_VECT_SIMD_256 :
+                                     RTE_VECT_SIMD_512);
 
   /* lazy umount hugepages */
   umount2 ((char *) huge_dir_path, MNT_DETACH);
@@ -1814,11 +1843,15 @@ dpdk_process (vlib_main_t * vm, vlib_node_runtime_t * rt, vlib_frame_t * f)
   if (error)
     clib_error_report (error);
 
-  error = dpdk_cryptodev_init (vm);
-  if (error)
+  if (dpdk_cryptodev_init)
     {
-      vlib_log_warn (dpdk_main.log_cryptodev, "%U", format_clib_error, error);
-      clib_error_free (error);
+      error = dpdk_cryptodev_init (vm);
+      if (error)
+       {
+         vlib_log_warn (dpdk_main.log_cryptodev, "%U", format_clib_error,
+                        error);
+         clib_error_free (error);
+       }
     }
 
   tm->worker_thread_release = 1;