Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a69e5a0d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2015-07-23

This series contains updates to e1000e, igb, ixgbevf, i40e and i40evf.

Emil extends the reporting of the RSS key and hash table by adding support
for x550 VFs.

Jia-Ju Bai fixes a QoS issue in e1000e where the error handling lacked a
call to pm_qos_remove_request() to cleanup the QoS request made in
e1000_open().

Todd updates igb to report unsupported for ethtool coalesce settings
that are not supported.  Also updated the driver to use the ARRAY_SIZE()
macro.

Carolyn fixes and refactors the dynamic ITR code for i40e and i40evf
which would never change dynamically.  So update the switch() statement
to have a default case and switch on "new_latency_range" versus the
current ITR setting.

Shannon cleans up i40e code, where there were un-needed goto's.  Also
clean up error status messages that were causing some confusion in
PHY and FCoE setup error reports.

Mitch updates the virtual channel interface to prepare for the x722 device
and other future devices, so that the VF driver can report what its
capable of supporting to the PF driver.  Updates the i40evf driver to
handle resets like Core or EMP resets, where the device is reinitialized
and the VF will not get the same VSI.

Jesse updates the i40e and i40evf driver to use the kernel BIT() and
BIT_ULL() macros.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6ca91c60 41a1d04b

drivers/net/ethernet/intel/e1000e/netdev.c

+1 −0
Original line number Diff line number Diff line
@@ -4588,6 +4588,7 @@ static int e1000_open(struct net_device *netdev) 
	return 0;



err_req_irq:

	pm_qos_remove_request(&adapter->pm_qos_req);

	e1000e_release_hw_control(adapter);

	e1000_power_down_phy(adapter);

	e1000e_free_rx_resources(adapter->rx_ring);

drivers/net/ethernet/intel/i40e/i40e.h

+28 −28
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ 
#define I40E_INT_NAME_STR_LEN        (IFNAMSIZ + 9)



/* Ethtool Private Flags */

#define I40E_PRIV_FLAGS_NPAR_FLAG	(1 << 0)

#define I40E_PRIV_FLAGS_NPAR_FLAG	BIT(0)



#define I40E_NVM_VERSION_LO_SHIFT  0

#define I40E_NVM_VERSION_LO_MASK   (0xff << I40E_NVM_VERSION_LO_SHIFT)
@@ -289,35 +289,35 @@ struct i40e_pf { 
	struct work_struct service_task;



	u64 flags;

#define I40E_FLAG_RX_CSUM_ENABLED              (u64)(1 << 1)

#define I40E_FLAG_MSI_ENABLED                  (u64)(1 << 2)

#define I40E_FLAG_MSIX_ENABLED                 (u64)(1 << 3)

#define I40E_FLAG_RX_1BUF_ENABLED              (u64)(1 << 4)

#define I40E_FLAG_RX_PS_ENABLED                (u64)(1 << 5)

#define I40E_FLAG_RSS_ENABLED                  (u64)(1 << 6)

#define I40E_FLAG_VMDQ_ENABLED                 (u64)(1 << 7)

#define I40E_FLAG_FDIR_REQUIRES_REINIT         (u64)(1 << 8)

#define I40E_FLAG_NEED_LINK_UPDATE             (u64)(1 << 9)

#define I40E_FLAG_RX_CSUM_ENABLED		BIT_ULL(1)

#define I40E_FLAG_MSI_ENABLED			BIT_ULL(2)

#define I40E_FLAG_MSIX_ENABLED			BIT_ULL(3)

#define I40E_FLAG_RX_1BUF_ENABLED		BIT_ULL(4)

#define I40E_FLAG_RX_PS_ENABLED			BIT_ULL(5)

#define I40E_FLAG_RSS_ENABLED			BIT_ULL(6)

#define I40E_FLAG_VMDQ_ENABLED			BIT_ULL(7)

#define I40E_FLAG_FDIR_REQUIRES_REINIT		BIT_ULL(8)

#define I40E_FLAG_NEED_LINK_UPDATE		BIT_ULL(9)

#ifdef I40E_FCOE

#define I40E_FLAG_FCOE_ENABLED                 (u64)(1 << 11)

#define I40E_FLAG_FCOE_ENABLED			BIT_ULL(11)

#endif /* I40E_FCOE */

#define I40E_FLAG_IN_NETPOLL                   (u64)(1 << 12)

#define I40E_FLAG_16BYTE_RX_DESC_ENABLED       (u64)(1 << 13)

#define I40E_FLAG_CLEAN_ADMINQ                 (u64)(1 << 14)

#define I40E_FLAG_FILTER_SYNC                  (u64)(1 << 15)

#define I40E_FLAG_PROCESS_MDD_EVENT            (u64)(1 << 17)

#define I40E_FLAG_PROCESS_VFLR_EVENT           (u64)(1 << 18)

#define I40E_FLAG_SRIOV_ENABLED                (u64)(1 << 19)

#define I40E_FLAG_DCB_ENABLED                  (u64)(1 << 20)

#define I40E_FLAG_FD_SB_ENABLED                (u64)(1 << 21)

#define I40E_FLAG_FD_ATR_ENABLED               (u64)(1 << 22)

#define I40E_FLAG_PTP                          (u64)(1 << 25)

#define I40E_FLAG_MFP_ENABLED                  (u64)(1 << 26)

#define I40E_FLAG_IN_NETPOLL			BIT_ULL(12)

#define I40E_FLAG_16BYTE_RX_DESC_ENABLED	BIT_ULL(13)

#define I40E_FLAG_CLEAN_ADMINQ			BIT_ULL(14)

#define I40E_FLAG_FILTER_SYNC			BIT_ULL(15)

#define I40E_FLAG_PROCESS_MDD_EVENT		BIT_ULL(17)

#define I40E_FLAG_PROCESS_VFLR_EVENT		BIT_ULL(18)

#define I40E_FLAG_SRIOV_ENABLED			BIT_ULL(19)

#define I40E_FLAG_DCB_ENABLED			BIT_ULL(20)

#define I40E_FLAG_FD_SB_ENABLED			BIT_ULL(21)

#define I40E_FLAG_FD_ATR_ENABLED		BIT_ULL(22)

#define I40E_FLAG_PTP				BIT_ULL(25)

#define I40E_FLAG_MFP_ENABLED			BIT_ULL(26)

#ifdef CONFIG_I40E_VXLAN

#define I40E_FLAG_VXLAN_FILTER_SYNC            (u64)(1 << 27)

#define I40E_FLAG_VXLAN_FILTER_SYNC		BIT_ULL(27)

#endif

#define I40E_FLAG_PORT_ID_VALID                (u64)(1 << 28)

#define I40E_FLAG_DCB_CAPABLE                  (u64)(1 << 29)

#define I40E_FLAG_PORT_ID_VALID			BIT_ULL(28)

#define I40E_FLAG_DCB_CAPABLE			BIT_ULL(29)

#define I40E_FLAG_VEB_MODE_ENABLED		BIT_ULL(40)



	/* tracks features that get auto disabled by errors */
@@ -443,8 +443,8 @@ struct i40e_vsi { 


	u32 current_netdev_flags;

	unsigned long state;

#define I40E_VSI_FLAG_FILTER_CHANGED  (1<<0)

#define I40E_VSI_FLAG_VEB_OWNER       (1<<1)

#define I40E_VSI_FLAG_FILTER_CHANGED	BIT(0)

#define I40E_VSI_FLAG_VEB_OWNER		BIT(1)

	unsigned long flags;



	struct list_head mac_filter_list;

drivers/net/ethernet/intel/i40e/i40e_common.c

+208 −2
Original line number Diff line number Diff line
@@ -71,6 +71,212 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw) 
	return status;

}



/**

 * i40e_aq_str - convert AQ err code to a string

 * @hw: pointer to the HW structure

 * @aq_err: the AQ error code to convert

 **/

char *i40e_aq_str(struct i40e_hw *hw, enum i40e_admin_queue_err aq_err)

{

	switch (aq_err) {

	case I40E_AQ_RC_OK:

		return "OK";

	case I40E_AQ_RC_EPERM:

		return "I40E_AQ_RC_EPERM";

	case I40E_AQ_RC_ENOENT:

		return "I40E_AQ_RC_ENOENT";

	case I40E_AQ_RC_ESRCH:

		return "I40E_AQ_RC_ESRCH";

	case I40E_AQ_RC_EINTR:

		return "I40E_AQ_RC_EINTR";

	case I40E_AQ_RC_EIO:

		return "I40E_AQ_RC_EIO";

	case I40E_AQ_RC_ENXIO:

		return "I40E_AQ_RC_ENXIO";

	case I40E_AQ_RC_E2BIG:

		return "I40E_AQ_RC_E2BIG";

	case I40E_AQ_RC_EAGAIN:

		return "I40E_AQ_RC_EAGAIN";

	case I40E_AQ_RC_ENOMEM:

		return "I40E_AQ_RC_ENOMEM";

	case I40E_AQ_RC_EACCES:

		return "I40E_AQ_RC_EACCES";

	case I40E_AQ_RC_EFAULT:

		return "I40E_AQ_RC_EFAULT";

	case I40E_AQ_RC_EBUSY:

		return "I40E_AQ_RC_EBUSY";

	case I40E_AQ_RC_EEXIST:

		return "I40E_AQ_RC_EEXIST";

	case I40E_AQ_RC_EINVAL:

		return "I40E_AQ_RC_EINVAL";

	case I40E_AQ_RC_ENOTTY:

		return "I40E_AQ_RC_ENOTTY";

	case I40E_AQ_RC_ENOSPC:

		return "I40E_AQ_RC_ENOSPC";

	case I40E_AQ_RC_ENOSYS:

		return "I40E_AQ_RC_ENOSYS";

	case I40E_AQ_RC_ERANGE:

		return "I40E_AQ_RC_ERANGE";

	case I40E_AQ_RC_EFLUSHED:

		return "I40E_AQ_RC_EFLUSHED";

	case I40E_AQ_RC_BAD_ADDR:

		return "I40E_AQ_RC_BAD_ADDR";

	case I40E_AQ_RC_EMODE:

		return "I40E_AQ_RC_EMODE";

	case I40E_AQ_RC_EFBIG:

		return "I40E_AQ_RC_EFBIG";

	}



	snprintf(hw->err_str, sizeof(hw->err_str), "%d", aq_err);

	return hw->err_str;

}



/**

 * i40e_stat_str - convert status err code to a string

 * @hw: pointer to the HW structure

 * @stat_err: the status error code to convert

 **/

char *i40e_stat_str(struct i40e_hw *hw, i40e_status stat_err)

{

	switch (stat_err) {

	case 0:

		return "OK";

	case I40E_ERR_NVM:

		return "I40E_ERR_NVM";

	case I40E_ERR_NVM_CHECKSUM:

		return "I40E_ERR_NVM_CHECKSUM";

	case I40E_ERR_PHY:

		return "I40E_ERR_PHY";

	case I40E_ERR_CONFIG:

		return "I40E_ERR_CONFIG";

	case I40E_ERR_PARAM:

		return "I40E_ERR_PARAM";

	case I40E_ERR_MAC_TYPE:

		return "I40E_ERR_MAC_TYPE";

	case I40E_ERR_UNKNOWN_PHY:

		return "I40E_ERR_UNKNOWN_PHY";

	case I40E_ERR_LINK_SETUP:

		return "I40E_ERR_LINK_SETUP";

	case I40E_ERR_ADAPTER_STOPPED:

		return "I40E_ERR_ADAPTER_STOPPED";

	case I40E_ERR_INVALID_MAC_ADDR:

		return "I40E_ERR_INVALID_MAC_ADDR";

	case I40E_ERR_DEVICE_NOT_SUPPORTED:

		return "I40E_ERR_DEVICE_NOT_SUPPORTED";

	case I40E_ERR_MASTER_REQUESTS_PENDING:

		return "I40E_ERR_MASTER_REQUESTS_PENDING";

	case I40E_ERR_INVALID_LINK_SETTINGS:

		return "I40E_ERR_INVALID_LINK_SETTINGS";

	case I40E_ERR_AUTONEG_NOT_COMPLETE:

		return "I40E_ERR_AUTONEG_NOT_COMPLETE";

	case I40E_ERR_RESET_FAILED:

		return "I40E_ERR_RESET_FAILED";

	case I40E_ERR_SWFW_SYNC:

		return "I40E_ERR_SWFW_SYNC";

	case I40E_ERR_NO_AVAILABLE_VSI:

		return "I40E_ERR_NO_AVAILABLE_VSI";

	case I40E_ERR_NO_MEMORY:

		return "I40E_ERR_NO_MEMORY";

	case I40E_ERR_BAD_PTR:

		return "I40E_ERR_BAD_PTR";

	case I40E_ERR_RING_FULL:

		return "I40E_ERR_RING_FULL";

	case I40E_ERR_INVALID_PD_ID:

		return "I40E_ERR_INVALID_PD_ID";

	case I40E_ERR_INVALID_QP_ID:

		return "I40E_ERR_INVALID_QP_ID";

	case I40E_ERR_INVALID_CQ_ID:

		return "I40E_ERR_INVALID_CQ_ID";

	case I40E_ERR_INVALID_CEQ_ID:

		return "I40E_ERR_INVALID_CEQ_ID";

	case I40E_ERR_INVALID_AEQ_ID:

		return "I40E_ERR_INVALID_AEQ_ID";

	case I40E_ERR_INVALID_SIZE:

		return "I40E_ERR_INVALID_SIZE";

	case I40E_ERR_INVALID_ARP_INDEX:

		return "I40E_ERR_INVALID_ARP_INDEX";

	case I40E_ERR_INVALID_FPM_FUNC_ID:

		return "I40E_ERR_INVALID_FPM_FUNC_ID";

	case I40E_ERR_QP_INVALID_MSG_SIZE:

		return "I40E_ERR_QP_INVALID_MSG_SIZE";

	case I40E_ERR_QP_TOOMANY_WRS_POSTED:

		return "I40E_ERR_QP_TOOMANY_WRS_POSTED";

	case I40E_ERR_INVALID_FRAG_COUNT:

		return "I40E_ERR_INVALID_FRAG_COUNT";

	case I40E_ERR_QUEUE_EMPTY:

		return "I40E_ERR_QUEUE_EMPTY";

	case I40E_ERR_INVALID_ALIGNMENT:

		return "I40E_ERR_INVALID_ALIGNMENT";

	case I40E_ERR_FLUSHED_QUEUE:

		return "I40E_ERR_FLUSHED_QUEUE";

	case I40E_ERR_INVALID_PUSH_PAGE_INDEX:

		return "I40E_ERR_INVALID_PUSH_PAGE_INDEX";

	case I40E_ERR_INVALID_IMM_DATA_SIZE:

		return "I40E_ERR_INVALID_IMM_DATA_SIZE";

	case I40E_ERR_TIMEOUT:

		return "I40E_ERR_TIMEOUT";

	case I40E_ERR_OPCODE_MISMATCH:

		return "I40E_ERR_OPCODE_MISMATCH";

	case I40E_ERR_CQP_COMPL_ERROR:

		return "I40E_ERR_CQP_COMPL_ERROR";

	case I40E_ERR_INVALID_VF_ID:

		return "I40E_ERR_INVALID_VF_ID";

	case I40E_ERR_INVALID_HMCFN_ID:

		return "I40E_ERR_INVALID_HMCFN_ID";

	case I40E_ERR_BACKING_PAGE_ERROR:

		return "I40E_ERR_BACKING_PAGE_ERROR";

	case I40E_ERR_NO_PBLCHUNKS_AVAILABLE:

		return "I40E_ERR_NO_PBLCHUNKS_AVAILABLE";

	case I40E_ERR_INVALID_PBLE_INDEX:

		return "I40E_ERR_INVALID_PBLE_INDEX";

	case I40E_ERR_INVALID_SD_INDEX:

		return "I40E_ERR_INVALID_SD_INDEX";

	case I40E_ERR_INVALID_PAGE_DESC_INDEX:

		return "I40E_ERR_INVALID_PAGE_DESC_INDEX";

	case I40E_ERR_INVALID_SD_TYPE:

		return "I40E_ERR_INVALID_SD_TYPE";

	case I40E_ERR_MEMCPY_FAILED:

		return "I40E_ERR_MEMCPY_FAILED";

	case I40E_ERR_INVALID_HMC_OBJ_INDEX:

		return "I40E_ERR_INVALID_HMC_OBJ_INDEX";

	case I40E_ERR_INVALID_HMC_OBJ_COUNT:

		return "I40E_ERR_INVALID_HMC_OBJ_COUNT";

	case I40E_ERR_INVALID_SRQ_ARM_LIMIT:

		return "I40E_ERR_INVALID_SRQ_ARM_LIMIT";

	case I40E_ERR_SRQ_ENABLED:

		return "I40E_ERR_SRQ_ENABLED";

	case I40E_ERR_ADMIN_QUEUE_ERROR:

		return "I40E_ERR_ADMIN_QUEUE_ERROR";

	case I40E_ERR_ADMIN_QUEUE_TIMEOUT:

		return "I40E_ERR_ADMIN_QUEUE_TIMEOUT";

	case I40E_ERR_BUF_TOO_SHORT:

		return "I40E_ERR_BUF_TOO_SHORT";

	case I40E_ERR_ADMIN_QUEUE_FULL:

		return "I40E_ERR_ADMIN_QUEUE_FULL";

	case I40E_ERR_ADMIN_QUEUE_NO_WORK:

		return "I40E_ERR_ADMIN_QUEUE_NO_WORK";

	case I40E_ERR_BAD_IWARP_CQE:

		return "I40E_ERR_BAD_IWARP_CQE";

	case I40E_ERR_NVM_BLANK_MODE:

		return "I40E_ERR_NVM_BLANK_MODE";

	case I40E_ERR_NOT_IMPLEMENTED:

		return "I40E_ERR_NOT_IMPLEMENTED";

	case I40E_ERR_PE_DOORBELL_NOT_ENABLED:

		return "I40E_ERR_PE_DOORBELL_NOT_ENABLED";

	case I40E_ERR_DIAG_TEST_FAILED:

		return "I40E_ERR_DIAG_TEST_FAILED";

	case I40E_ERR_NOT_READY:

		return "I40E_ERR_NOT_READY";

	case I40E_NOT_SUPPORTED:

		return "I40E_NOT_SUPPORTED";

	case I40E_ERR_FIRMWARE_API_VERSION:

		return "I40E_ERR_FIRMWARE_API_VERSION";

	}



	snprintf(hw->err_str, sizeof(hw->err_str), "%d", stat_err);

	return hw->err_str;

}



/**

 * i40e_debug_aq

 * @hw: debug mask related to admin queue
@@ -1187,9 +1393,9 @@ void i40e_led_set(struct i40e_hw *hw, u32 mode, bool blink) 
			blink = false;



		if (blink)

			gpio_val |= (1 << I40E_GLGEN_GPIO_CTL_LED_BLINK_SHIFT);

			gpio_val |= BIT(I40E_GLGEN_GPIO_CTL_LED_BLINK_SHIFT);

		else

			gpio_val &= ~(1 << I40E_GLGEN_GPIO_CTL_LED_BLINK_SHIFT);

			gpio_val &= ~BIT(I40E_GLGEN_GPIO_CTL_LED_BLINK_SHIFT);



		wr32(hw, I40E_GLGEN_GPIO_CTL(i), gpio_val);

		break;

drivers/net/ethernet/intel/i40e/i40e_dcb.h

+4 −4
Original line number Diff line number Diff line
@@ -58,9 +58,9 @@ 
#define I40E_IEEE_ETS_MAXTC_SHIFT	0

#define I40E_IEEE_ETS_MAXTC_MASK	(0x7 << I40E_IEEE_ETS_MAXTC_SHIFT)

#define I40E_IEEE_ETS_CBS_SHIFT		6

#define I40E_IEEE_ETS_CBS_MASK		(0x1 << I40E_IEEE_ETS_CBS_SHIFT)

#define I40E_IEEE_ETS_CBS_MASK		BIT(I40E_IEEE_ETS_CBS_SHIFT)

#define I40E_IEEE_ETS_WILLING_SHIFT	7

#define I40E_IEEE_ETS_WILLING_MASK	(0x1 << I40E_IEEE_ETS_WILLING_SHIFT)

#define I40E_IEEE_ETS_WILLING_MASK	BIT(I40E_IEEE_ETS_WILLING_SHIFT)

#define I40E_IEEE_ETS_PRIO_0_SHIFT	0

#define I40E_IEEE_ETS_PRIO_0_MASK	(0x7 << I40E_IEEE_ETS_PRIO_0_SHIFT)

#define I40E_IEEE_ETS_PRIO_1_SHIFT	4
@@ -79,9 +79,9 @@ 
#define I40E_IEEE_PFC_CAP_SHIFT		0

#define I40E_IEEE_PFC_CAP_MASK		(0xF << I40E_IEEE_PFC_CAP_SHIFT)

#define I40E_IEEE_PFC_MBC_SHIFT		6

#define I40E_IEEE_PFC_MBC_MASK		(0x1 << I40E_IEEE_PFC_MBC_SHIFT)

#define I40E_IEEE_PFC_MBC_MASK		BIT(I40E_IEEE_PFC_MBC_SHIFT)

#define I40E_IEEE_PFC_WILLING_SHIFT	7

#define I40E_IEEE_PFC_WILLING_MASK	(0x1 << I40E_IEEE_PFC_WILLING_SHIFT)

#define I40E_IEEE_PFC_WILLING_MASK	BIT(I40E_IEEE_PFC_WILLING_SHIFT)



/* Defines for IEEE APP TLV */

#define I40E_IEEE_APP_SEL_SHIFT		0

drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ void i40e_dcbnl_set_all(struct i40e_vsi *vsi) 
	/* Set up all the App TLVs if DCBx is negotiated */

	for (i = 0; i < dcbxcfg->numapps; i++) {

		prio = dcbxcfg->app[i].priority;

		tc_map = (1 << dcbxcfg->etscfg.prioritytable[prio]);

		tc_map = BIT(dcbxcfg->etscfg.prioritytable[prio]);



		/* Add APP only if the TC is enabled for this VSI */

		if (tc_map & vsi->tc_config.enabled_tc) {