1 files changed, 59 insertions, 58 deletions

diff --git a/sys/dev/ixgbe/if_ixv.c b/sys/dev/ixgbe/if_ixv.c
index d58541e0..0b147d4 100644
--- a/sys/dev/ixgbe/if_ixv.c
+++ b/sys/dev/ixgbe/if_ixv.c
@@ -43,7 +43,7 @@
 /*********************************************************************
  *  Driver version
  *********************************************************************/
-char ixv_driver_version[] = "1.4.0";
+char ixv_driver_version[] = "1.4.6-k";
 
 /*********************************************************************
  *  PCI Device ID Table
@@ -292,7 +292,7 @@ ixv_attach(device_t dev)
 
 	/* Allocate, clear, and link in our adapter structure */
 	adapter = device_get_softc(dev);
-	adapter->dev = adapter->osdep.dev = dev;
+	adapter->dev = dev;
 	hw = &adapter->hw;
 
 #ifdef DEV_NETMAP
@@ -322,7 +322,7 @@ ixv_attach(device_t dev)
 
 	/* Do base PCI setup - map BAR0 */
 	if (ixv_allocate_pci_resources(adapter)) {
-		device_printf(dev, "Allocation of PCI resources failed\n");
+		device_printf(dev, "ixv_allocate_pci_resources() failed!\n");
 		error = ENXIO;
 		goto err_out;
 	}
@@ -353,6 +353,7 @@ ixv_attach(device_t dev)
 
 	/* Allocate our TX/RX Queues */
 	if (ixgbe_allocate_queues(adapter)) {
+		device_printf(dev, "ixgbe_allocate_queues() failed!\n");
 		error = ENOMEM;
 		goto err_out;
 	}
@@ -363,7 +364,7 @@ ixv_attach(device_t dev)
 	*/
 	error = ixgbe_init_shared_code(hw);
 	if (error) {
-		device_printf(dev,"Shared Code Initialization Failure\n");
+		device_printf(dev, "ixgbe_init_shared_code() failed!\n");
 		error = EIO;
 		goto err_late;
 	}
@@ -371,23 +372,37 @@ ixv_attach(device_t dev)
 	/* Setup the mailbox */
 	ixgbe_init_mbx_params_vf(hw);
 
-	ixgbe_reset_hw(hw);
+	/* Reset mbox api to 1.0 */
+	error = ixgbe_reset_hw(hw);
+	if (error == IXGBE_ERR_RESET_FAILED)
+		device_printf(dev, "ixgbe_reset_hw() failure: Reset Failed!\n");
+	else if (error)
+		device_printf(dev, "ixgbe_reset_hw() failed with error %d\n", error);
+	if (error) {
+		error = EIO;
+		goto err_late;
+	}
 
-	/* Get the Mailbox API version */
-	device_printf(dev,"MBX API %d negotiation: %d\n",
-	    ixgbe_mbox_api_11,
-	    ixgbevf_negotiate_api_version(hw, ixgbe_mbox_api_11));
+	/* Negotiate mailbox API version */
+	error = ixgbevf_negotiate_api_version(hw, ixgbe_mbox_api_11);
+	if (error) {
+		device_printf(dev, "MBX API 1.1 negotiation failed! Error %d\n", error);
+		error = EIO;
+		goto err_late;
+	}
 
 	error = ixgbe_init_hw(hw);
 	if (error) {
-		device_printf(dev,"Hardware Initialization Failure\n");
+		device_printf(dev, "ixgbe_init_hw() failed!\n");
 		error = EIO;
 		goto err_late;
 	}
 	
 	error = ixv_allocate_msix(adapter); 
-	if (error) 
+	if (error) {
+		device_printf(dev, "ixv_allocate_msix() failed!\n");
 		goto err_late;
+	}
 
 	/* If no mac address was assigned, make a random one */
 	if (!ixv_check_ether_addr(hw->mac.addr)) {
@@ -447,7 +462,7 @@ ixv_detach(device_t dev)
 
 	/* Make sure VLANS are not using driver */
 	if (adapter->ifp->if_vlantrunk != NULL) {
-		device_printf(dev,"Vlan in use, detach first\n");
+		device_printf(dev, "Vlan in use, detach first\n");
 		return (EBUSY);
 	}
 
@@ -556,13 +571,13 @@ ixv_ioctl(struct ifnet * ifp, u_long command, caddr_t data)
 #endif
 	case SIOCSIFMTU:
 		IOCTL_DEBUGOUT("ioctl: SIOCSIFMTU (Set Interface MTU)");
-		if (ifr->ifr_mtu > IXGBE_MAX_FRAME_SIZE - ETHER_HDR_LEN) {
+		if (ifr->ifr_mtu > IXGBE_MAX_FRAME_SIZE - IXGBE_MTU_HDR) {
 			error = EINVAL;
 		} else {
 			IXGBE_CORE_LOCK(adapter);
 			ifp->if_mtu = ifr->ifr_mtu;
 			adapter->max_frame_size =
-				ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN;
+				ifp->if_mtu + IXGBE_MTU_HDR;
 			ixv_init_locked(adapter);
 			IXGBE_CORE_UNLOCK(adapter);
 		}
@@ -643,9 +658,9 @@ ixv_init_locked(struct adapter *adapter)
 	struct ifnet	*ifp = adapter->ifp;
 	device_t 	dev = adapter->dev;
 	struct ixgbe_hw *hw = &adapter->hw;
-	u32		mhadd, gpie;
+	int error = 0;
 
-	INIT_DEBUGOUT("ixv_init: begin");
+	INIT_DEBUGOUT("ixv_init_locked: begin");
 	mtx_assert(&adapter->core_mtx, MA_OWNED);
 	hw->adapter_stopped = FALSE;
 	ixgbe_stop_adapter(hw);
@@ -662,12 +677,17 @@ ixv_init_locked(struct adapter *adapter)
 
 	/* Prepare transmit descriptors and buffers */
 	if (ixgbe_setup_transmit_structures(adapter)) {
-		device_printf(dev,"Could not setup transmit structures\n");
+		device_printf(dev, "Could not setup transmit structures\n");
 		ixv_stop(adapter);
 		return;
 	}
 
+	/* Reset VF and renegotiate mailbox API version */
 	ixgbe_reset_hw(hw);
+	error = ixgbevf_negotiate_api_version(hw, ixgbe_mbox_api_11);
+	if (error)
+		device_printf(dev, "MBX API 1.1 negotiation failed! Error %d\n", error);
+
 	ixv_initialize_transmit_units(adapter);
 
 	/* Setup Multicast table */
@@ -684,7 +704,7 @@ ixv_init_locked(struct adapter *adapter)
 
 	/* Prepare receive descriptors and buffers */
 	if (ixgbe_setup_receive_structures(adapter)) {
-		device_printf(dev,"Could not setup receive structures\n");
+		device_printf(dev, "Could not setup receive structures\n");
 		ixv_stop(adapter);
 		return;
 	}
@@ -692,12 +712,6 @@ ixv_init_locked(struct adapter *adapter)
 	/* Configure RX settings */
 	ixv_initialize_receive_units(adapter);
 
-	/* Enable Enhanced MSIX mode */
-	gpie = IXGBE_READ_REG(&adapter->hw, IXGBE_GPIE);
-	gpie |= IXGBE_GPIE_MSIX_MODE | IXGBE_GPIE_EIAME;
-	gpie |= IXGBE_GPIE_PBA_SUPPORT | IXGBE_GPIE_OCD;
-        IXGBE_WRITE_REG(hw, IXGBE_GPIE, gpie);
-
 	/* Set the various hardware offload abilities */
 	ifp->if_hwassist = 0;
 	if (ifp->if_capenable & IFCAP_TSO4)
@@ -709,19 +723,9 @@ ixv_init_locked(struct adapter *adapter)
 #endif
 	}
 	
-	/* Set MTU size */
-	if (ifp->if_mtu > ETHERMTU) {
-		mhadd = IXGBE_READ_REG(hw, IXGBE_MHADD);
-		mhadd &= ~IXGBE_MHADD_MFS_MASK;
-		mhadd |= adapter->max_frame_size << IXGBE_MHADD_MFS_SHIFT;
-		IXGBE_WRITE_REG(hw, IXGBE_MHADD, mhadd);
-	}
-
 	/* Set up VLAN offload and filter */
 	ixv_setup_vlan_support(adapter);
 
-	callout_reset(&adapter->timer, hz, ixv_local_timer, adapter);
-
 	/* Set up MSI/X routing */
 	ixv_configure_ivars(adapter);
 
@@ -737,6 +741,9 @@ ixv_init_locked(struct adapter *adapter)
 	/* Config/Enable Link */
 	ixv_config_link(adapter);
 
+	/* Start watchdog */
+	callout_reset(&adapter->timer, hz, ixv_local_timer, adapter);
+
 	/* And now turn on interrupts */
 	ixv_enable_intr(adapter);
 
@@ -1414,7 +1421,7 @@ ixv_allocate_pci_resources(struct adapter *adapter)
 	    &rid, RF_ACTIVE);
 
 	if (!(adapter->pci_mem)) {
-		device_printf(dev,"Unable to allocate bus resource: memory\n");
+		device_printf(dev, "Unable to allocate bus resource: memory\n");
 		return (ENXIO);
 	}
 
@@ -1422,12 +1429,11 @@ ixv_allocate_pci_resources(struct adapter *adapter)
 		rman_get_bustag(adapter->pci_mem);
 	adapter->osdep.mem_bus_space_handle =
 		rman_get_bushandle(adapter->pci_mem);
-	adapter->hw.hw_addr = (u8 *) &adapter->osdep.mem_bus_space_handle;
+	adapter->hw.hw_addr = (u8 *)&adapter->osdep.mem_bus_space_handle;
 
 	/* Pick up the tuneable queues */
 	adapter->num_queues = ixv_num_queues;
-
-	adapter->hw.back = &adapter->osdep;
+	adapter->hw.back = adapter;
 
 	/*
 	** Now setup MSI/X, should
@@ -1535,7 +1541,7 @@ ixv_setup_interface(device_t dev, struct adapter *adapter)
 	ether_ifattach(ifp, adapter->hw.mac.addr);
 
 	adapter->max_frame_size =
-	    ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN;
+	    ifp->if_mtu + IXGBE_MTU_HDR_VLAN;
 
 	/*
 	 * Tell the upper layer(s) we support long frames.
@@ -1556,7 +1562,6 @@ ixv_setup_interface(device_t dev, struct adapter *adapter)
 	 */
 	ifmedia_init(&adapter->media, IFM_IMASK, ixv_media_change,
 		     ixv_media_status);
-	ifmedia_add(&adapter->media, IFM_ETHER | IFM_FDX, 0, NULL);
 	ifmedia_add(&adapter->media, IFM_ETHER | IFM_AUTO, 0, NULL);
 	ifmedia_set(&adapter->media, IFM_ETHER | IFM_AUTO);
 
@@ -1567,19 +1572,11 @@ static void
 ixv_config_link(struct adapter *adapter)
 {
 	struct ixgbe_hw *hw = &adapter->hw;
-	u32	autoneg, err = 0;
+	u32	autoneg;
 
 	if (hw->mac.ops.check_link)
-		err = hw->mac.ops.check_link(hw, &autoneg,
+		hw->mac.ops.check_link(hw, &autoneg,
 		    &adapter->link_up, FALSE);
-	if (err)
-		goto out;
-
-	if (hw->mac.ops.setup_link)
-               	err = hw->mac.ops.setup_link(hw,
-		    autoneg, adapter->link_up);
-out:
-	return;
 }
 
 
@@ -1646,7 +1643,6 @@ ixv_initialize_receive_units(struct adapter *adapter)
 	struct ixgbe_hw	*hw = &adapter->hw;
 	struct ifnet	*ifp = adapter->ifp;
 	u32		bufsz, rxcsum, psrtype;
-	int		max_frame;
 
 	if (ifp->if_mtu > ETHERMTU)
 		bufsz = 4096 >> IXGBE_SRRCTL_BSIZEPKT_SHIFT;
@@ -1659,9 +1655,8 @@ ixv_initialize_receive_units(struct adapter *adapter)
 
 	IXGBE_WRITE_REG(hw, IXGBE_VFPSRTYPE, psrtype);
 
-	/* Tell PF our expected packet-size */
-	max_frame = ifp->if_mtu + IXGBE_MTU_HDR;
-	ixgbevf_rlpml_set_vf(hw, max_frame);
+	/* Tell PF our max_frame size */
+	ixgbevf_rlpml_set_vf(hw, adapter->max_frame_size);
 
 	for (int i = 0; i < adapter->num_queues; i++, rxr++) {
 		u64 rdba = rxr->rxdma.dma_paddr;
@@ -1763,7 +1758,7 @@ ixv_setup_vlan_support(struct adapter *adapter)
 {
 	struct ixgbe_hw *hw = &adapter->hw;
 	u32		ctrl, vid, vfta, retry;
-
+	struct rx_ring	*rxr;
 
 	/*
 	** We get here thru init_locked, meaning
@@ -1779,6 +1774,12 @@ ixv_setup_vlan_support(struct adapter *adapter)
 		ctrl = IXGBE_READ_REG(hw, IXGBE_VFRXDCTL(i));
 		ctrl |= IXGBE_RXDCTL_VME;
 		IXGBE_WRITE_REG(hw, IXGBE_VFRXDCTL(i), ctrl);
+		/*
+		 * Let Rx path know that it needs to store VLAN tag
+		 * as part of extra mbuf info.
+		 */
+		rxr = &adapter->rx_rings[i];
+		rxr->vtag_strip = TRUE;
 	}
 
 	/*
@@ -1794,7 +1795,7 @@ ixv_setup_vlan_support(struct adapter *adapter)
 		** based on the bits set in each
 		** of the array ints.
 		*/
-		for ( int j = 0; j < 32; j++) {
+		for (int j = 0; j < 32; j++) {
 			retry = 0;
 			if ((vfta & (1 << j)) == 0)
 				continue;
@@ -1821,10 +1822,10 @@ ixv_register_vlan(void *arg, struct ifnet *ifp, u16 vtag)
 	struct adapter	*adapter = ifp->if_softc;
 	u16		index, bit;
 
-	if (ifp->if_softc !=  arg)   /* Not our event */
+	if (ifp->if_softc != arg) /* Not our event */
 		return;
 
-	if ((vtag == 0) || (vtag > 4095))	/* Invalid */
+	if ((vtag == 0) || (vtag > 4095)) /* Invalid */
 		return;
 
 	IXGBE_CORE_LOCK(adapter);