X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fplugins%2Fdpdk%2Fdevice%2Finit.c;h=e8718f73ab9ff414ef3f0738f70d9f119aa7a8c3;hb=384a336849e031883425532029458d0f89a08c09;hp=9c54641cb578ef350e8e0de2fc81189318342bc1;hpb=380c1676e25e8df3e5449247e3d6f8414bdae509;p=vpp.git

diff --git a/src/plugins/dpdk/device/init.c b/src/plugins/dpdk/device/init.c
index 9c54641cb57..e8718f73ab9 100644
--- a/src/plugins/dpdk/device/init.c
+++ b/src/plugins/dpdk/device/init.c
@@ -363,6 +363,12 @@ dpdk_lib_init (dpdk_main_t * dm)
       clib_memcpy (&xd->tx_conf, &dev_info.default_txconf,
 		   sizeof (struct rte_eth_txconf));
 
+      if (dev_info.rx_offload_capa & DEV_RX_OFFLOAD_IPV4_CKSUM)
+	{
+	  xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_IPV4_CKSUM;
+	  xd->flags |= DPDK_DEVICE_FLAG_RX_IP4_CKSUM;
+	}
+
       if (dm->conf->no_multi_seg)
 	{
 #if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0)
@@ -500,6 +506,19 @@ dpdk_lib_init (dpdk_main_t * dm)
 #elif RTE_VERSION < RTE_VERSION_NUM(18, 11, 0, 0)
 	      xd->port_conf.rxmode.offloads |= DEV_RX_OFFLOAD_CRC_STRIP;
 #endif
+
+	      if (dm->conf->no_tx_checksum_offload == 0)
+		{
+#if RTE_VERSION < RTE_VERSION_NUM(18, 8, 0, 0)
+		  xd->tx_conf.txq_flags &= ~(ETH_TXQ_FLAGS_NOXSUMUDP |
+				                     ETH_TXQ_FLAGS_NOXSUMTCP);
+#else
+	          xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_TCP_CKSUM;
+	          xd->port_conf.txmode.offloads |= DEV_TX_OFFLOAD_UDP_CKSUM;
+#endif
+		  xd->flags |=
+		    DPDK_DEVICE_FLAG_TX_OFFLOAD;
+		}
 	      break;
 
 	    case VNET_DPDK_PMD_ENA:
@@ -888,7 +907,20 @@ dpdk_bind_devices_to_uio (dpdk_config_main_t * conf)
       ;
     /* vmxnet3 */
     else if (d->vendor_id == 0x15ad && d->device_id == 0x07b0)
-      ;
+      {
+	/*
+	 * For vmxnet3 PCI, unless it is explicitly specified in the whitelist,
+	 * the default is to put it in the blacklist.
+	 */
+	if (devconf == 0)
+	  {
+	    pool_get (conf->dev_confs, devconf);
+	    hash_set (conf->device_config_index_by_pci_addr, addr->as_u32,
+		      devconf - conf->dev_confs);
+	    devconf->pci_addr.as_u32 = addr->as_u32;
+	    devconf->is_blacklisted = 1;
+	  }
+      }
     /* all Intel network devices */
     else if (d->vendor_id == 0x8086 && d->device_class == PCI_CLASS_NETWORK_ETHERNET)
       ;
@@ -1571,54 +1603,10 @@ dpdk_update_link_state (dpdk_device_t * xd, f64 now)
 	  break;
 	}
     }
-  if (hw_flags_chg || (xd->link.link_speed != prev_link.link_speed))
-    {
-      hw_flags_chg = 1;
-      switch (xd->link.link_speed)
-	{
-	case ETH_SPEED_NUM_10M:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_10M;
-	  break;
-	case ETH_SPEED_NUM_100M:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_100M;
-	  break;
-	case ETH_SPEED_NUM_1G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_1G;
-	  break;
-	case ETH_SPEED_NUM_2_5G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_2_5G;
-	  break;
-	case ETH_SPEED_NUM_5G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_5G;
-	  break;
-	case ETH_SPEED_NUM_10G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_10G;
-	  break;
-	case ETH_SPEED_NUM_20G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_20G;
-	  break;
-	case ETH_SPEED_NUM_25G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_25G;
-	  break;
-	case ETH_SPEED_NUM_40G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_40G;
-	  break;
-	case ETH_SPEED_NUM_50G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_50G;
-	  break;
-	case ETH_SPEED_NUM_56G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_56G;
-	  break;
-	case ETH_SPEED_NUM_100G:
-	  hw_flags |= VNET_HW_INTERFACE_FLAG_SPEED_100G;
-	  break;
-	case 0:
-	  break;
-	default:
-	  dpdk_log_warn ("unknown link speed %d", xd->link.link_speed);
-	  break;
-	}
-    }
+  if (xd->link.link_speed != prev_link.link_speed)
+    vnet_hw_interface_set_link_speed (vnm, xd->hw_if_index,
+				      xd->link.link_speed * 1000);
+
   if (hw_flags_chg)
     {
       if (LINK_STATE_ELOGS)