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

Commit e28383dd 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-10-07

This series contains updates to i40e and i40evf only.

Paul updates i40e to simply increase the amount of time we wait for a
reset to complete since we have seen in some rare occasions the reset
can take longer to complete.

Shannon updates the driver to turn on Wake-on-LAN by default if it is
enabled in the hardware config to begin with, rather than always disable
it and wait for the user to expressly turn it on.  Added new device id's
and support for future devices.  Fixed a possible type compare problem
between a size and possible negative number.  Also fixed a shift value
that was wrong, which ended up with a bad bitmask.  Did general house
cleaning of the driver to cleanup several low lying fruit in the
driver.  Fixed an issue where new unicast address's would be added to
the VSI list and then immediately removed and would never actually
make it down to the hardware.  Resolved the issue by removing the
separation from unicast and multicast in the search for filters to be
deleted.

Mitch fixes an issue where the hardware would continue to access the
memory formerly used by the rings for a VF which have been removed,
causing memory corruption or DMAR errors.  To relieve this condition,
explicitly stop all rings associated with each VF before releasing its
resources.  Also fixed a panic if the driver is unable to enable MSI-X
or its unable to acquire enough vectors, so propagate interrupt
allocation failure information to the calling function.  Cleaned up
opcode that is not required.

Carolyn extends the size of the test available for the interrupt names
so that all the descriptive data available for the Flow Director
interrupts is not truncated.

Catherine fixes an issue where there was a possibility of speed getting
set to 0 if advertised is set to 0 (which is the case when autoneg is
disabled).

Jesse fixes the checksum on big endian machines, so added code to swap
it correctly.  Also fixed a bug in the return from get_link_status()
where only true or false was being returned, but false could mean
multiple things.  So allow the caller to get all the return values
in the call chain bubbled back to the source so that the reason for
the failure does not get lost.

Anjali adds statistics to keep track of how many times we ask the stack
to linearize the SKB because the hardware cannot handle SKBs with more
than 8 frags per segment/single packet.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 61d03720 7fd0ac66

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

+3 −2
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ 
#define I40E_MAX_USER_PRIORITY        8

#define I40E_DEFAULT_MSG_ENABLE       4

#define I40E_QUEUE_WAIT_RETRY_LIMIT   10

#define I40E_INT_NAME_STR_LEN        (IFNAMSIZ + 9)

#define I40E_INT_NAME_STR_LEN        (IFNAMSIZ + 16)



/* Ethtool Private Flags */

#define I40E_PRIV_FLAGS_NPAR_FLAG	BIT(0)
@@ -475,6 +475,7 @@ struct i40e_vsi { 
#endif

	u32 tx_restart;

	u32 tx_busy;

	u64 tx_linearize;

	u32 rx_buf_failed;

	u32 rx_page_failed;
@@ -740,7 +741,7 @@ int i40e_fcoe_vsi_init(struct i40e_vsi *vsi, struct i40e_vsi_context *ctxt); 
u8 i40e_get_fcoe_tc_map(struct i40e_pf *pf);

void i40e_fcoe_config_netdev(struct net_device *netdev, struct i40e_vsi *vsi);

void i40e_fcoe_vsi_setup(struct i40e_pf *pf);

int i40e_init_pf_fcoe(struct i40e_pf *pf);

void i40e_init_pf_fcoe(struct i40e_pf *pf);

int i40e_fcoe_setup_ddp_resources(struct i40e_vsi *vsi);

void i40e_fcoe_free_ddp_resources(struct i40e_vsi *vsi);

int i40e_fcoe_handle_offload(struct i40e_ring *rx_ring,

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

+2 −0
Original line number Diff line number Diff line
@@ -756,6 +756,8 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw, 
		goto asq_send_command_error;

	}



	hw->aq.asq_last_status = I40E_AQ_RC_OK;



	val = rd32(hw, hw->aq.asq.head);

	if (val >= hw->aq.num_asq_entries) {

		i40e_debug(hw, I40E_DEBUG_AQ_MESSAGE,

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

+1 −2
Original line number Diff line number Diff line
@@ -144,8 +144,7 @@ static inline int i40e_aq_rc_to_posix(int aq_ret, int aq_rc) 
	if (aq_ret == I40E_ERR_ADMIN_QUEUE_TIMEOUT)

		return -EAGAIN;



	if (aq_rc >= (sizeof(aq_to_posix) / sizeof((aq_to_posix)[0])) ||

	    aq_rc < 0)

	if (!((u32)aq_rc < (sizeof(aq_to_posix) / sizeof((aq_to_posix)[0]))))

		return -ERANGE;



	return aq_to_posix[aq_rc];

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

+2 −1
Original line number Diff line number Diff line
@@ -2062,6 +2062,7 @@ I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_start); 
#define I40E_AQC_CEE_APP_ISCSI_MASK	(0x7 << I40E_AQC_CEE_APP_ISCSI_SHIFT)

#define I40E_AQC_CEE_APP_FIP_SHIFT	0x8

#define I40E_AQC_CEE_APP_FIP_MASK	(0x7 << I40E_AQC_CEE_APP_FIP_SHIFT)



#define I40E_AQC_CEE_PG_STATUS_SHIFT	0x0

#define I40E_AQC_CEE_PG_STATUS_MASK	(0x7 << I40E_AQC_CEE_PG_STATUS_SHIFT)

#define I40E_AQC_CEE_PFC_STATUS_SHIFT	0x3
@@ -2070,7 +2071,7 @@ I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_start); 
#define I40E_AQC_CEE_APP_STATUS_MASK	(0x7 << I40E_AQC_CEE_APP_STATUS_SHIFT)

#define I40E_AQC_CEE_FCOE_STATUS_SHIFT	0x8

#define I40E_AQC_CEE_FCOE_STATUS_MASK	(0x7 << I40E_AQC_CEE_FCOE_STATUS_SHIFT)

#define I40E_AQC_CEE_ISCSI_STATUS_SHIFT	0xA

#define I40E_AQC_CEE_ISCSI_STATUS_SHIFT	0xB

#define I40E_AQC_CEE_ISCSI_STATUS_MASK	(0x7 << I40E_AQC_CEE_ISCSI_STATUS_SHIFT)

#define I40E_AQC_CEE_FIP_STATUS_SHIFT	0x10

#define I40E_AQC_CEE_FIP_STATUS_MASK	(0x7 << I40E_AQC_CEE_FIP_STATUS_SHIFT)

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

+10 −8
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw) 
		case I40E_DEV_ID_QSFP_B:

		case I40E_DEV_ID_QSFP_C:

		case I40E_DEV_ID_10G_BASE_T:

		case I40E_DEV_ID_10G_BASE_T4:

		case I40E_DEV_ID_20G_KR2:

		case I40E_DEV_ID_20G_KR2_A:

			hw->mac.type = I40E_MAC_XL710;
@@ -1256,7 +1257,7 @@ i40e_status i40e_pf_reset(struct i40e_hw *hw) 
	grst_del = (rd32(hw, I40E_GLGEN_RSTCTL) &

		    I40E_GLGEN_RSTCTL_GRSTDEL_MASK) >>

		    I40E_GLGEN_RSTCTL_GRSTDEL_SHIFT;

	for (cnt = 0; cnt < grst_del + 2; cnt++) {

	for (cnt = 0; cnt < grst_del + 10; cnt++) {

		reg = rd32(hw, I40E_GLGEN_RSTAT);

		if (!(reg & I40E_GLGEN_RSTAT_DEVSTATE_MASK))

			break;
@@ -2234,27 +2235,28 @@ i40e_status i40e_aq_send_driver_version(struct i40e_hw *hw, 
/**

 * i40e_get_link_status - get status of the HW network link

 * @hw: pointer to the hw struct

 * @link_up: pointer to bool (true/false = linkup/linkdown)

 *

 * Returns true if link is up, false if link is down.

 * Variable link_up true if link is up, false if link is down.

 * The variable link_up is invalid if returned value of status != 0

 *

 * Side effect: LinkStatusEvent reporting becomes enabled

 **/

bool i40e_get_link_status(struct i40e_hw *hw)

i40e_status i40e_get_link_status(struct i40e_hw *hw, bool *link_up)

{

	i40e_status status = 0;

	bool link_status = false;



	if (hw->phy.get_link_info) {

		status = i40e_aq_get_link_info(hw, true, NULL, NULL);



		if (status)

			goto i40e_get_link_status_exit;

			i40e_debug(hw, I40E_DEBUG_LINK, "get link failed: status %d\n",

				   status);

	}



	link_status = hw->phy.link_info.link_info & I40E_AQ_LINK_UP;

	*link_up = hw->phy.link_info.link_info & I40E_AQ_LINK_UP;



i40e_get_link_status_exit:

	return link_status;

	return status;

}



/**