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

Commit 8063968a 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/net-next 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2014-06-08

This series contains updates to i40e and i40evf.

Jesse fixes an issue reported by Eric Dumazet where the driver was not
masking the right bits in the receive descriptor before checking them.
Also fixes TSO accounting since the kernel now can send as much as 32kB
in a single skb->frag[.] entry, even on a system with 4kB pages.

Anjali cleans up registers which are no longer supported.

Akeem cleans up code comments and removes num_msix_entries from the
interrupt setup routine since it was not being used.  Fixes an issue where
FD SB/ATR and NTUPLE configuration status were reported erroneously, so
now the driver reports FDir without further information.  Fixes a coding
error where during the registration for NAPI, the driver was requesting
256 budget.  The max recommended value for this NAPI_POLL_WEIGHT or 64.
Lastly, removed deprecated device IDs because they will not be shipped.

Mitch removes log messages which were redundant so therefore unnecessary.
Also removes a bogus code comment since VF drivers require MSI-X or they
won't get interrupts at all and cleans up the formatting of several log
messages.  Mitch also fixes the possibility of null pointers in VSI, since
not all VSIs have transmit rings.

Shannon ensures to clear the PXE mode bit on each reset after the AdminQ
has been rebuilt.

Catherine bumps the driver versions for i40e and i40evf.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fff1f59b eeb6b645

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

+0 −1
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ struct i40e_pf { 
	unsigned long state;

	unsigned long link_check_timeout;

	struct msix_entry *msix_entries;

	u16 num_msix_entries;

	bool fc_autoneg_status;



	u16 eeprom_version;

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

+1 −10
Original line number Diff line number Diff line
@@ -43,12 +43,10 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw) 
	if (hw->vendor_id == PCI_VENDOR_ID_INTEL) {

		switch (hw->device_id) {

		case I40E_DEV_ID_SFP_XL710:

		case I40E_DEV_ID_SFP_X710:

		case I40E_DEV_ID_QEMU:

		case I40E_DEV_ID_KX_A:

		case I40E_DEV_ID_KX_B:

		case I40E_DEV_ID_KX_C:

		case I40E_DEV_ID_KX_D:

		case I40E_DEV_ID_QSFP_A:

		case I40E_DEV_ID_QSFP_B:

		case I40E_DEV_ID_QSFP_C:
@@ -2514,7 +2512,7 @@ static i40e_status i40e_validate_filter_settings(struct i40e_hw *hw, 
{

	u32 fcoe_cntx_size, fcoe_filt_size;

	u32 pe_cntx_size, pe_filt_size;

	u32 fcoe_fmax, pe_fmax;

	u32 fcoe_fmax;

	u32 val;



	/* Validate FCoE settings passed */
@@ -2589,13 +2587,6 @@ static i40e_status i40e_validate_filter_settings(struct i40e_hw *hw, 
	if (fcoe_filt_size + fcoe_cntx_size >  fcoe_fmax)

		return I40E_ERR_INVALID_SIZE;



	/* PEHSIZE + PEDSIZE should not be greater than PMPEXFMAX */

	val = rd32(hw, I40E_GLHMC_PEXFMAX);

	pe_fmax = (val & I40E_GLHMC_PEXFMAX_PMPEXFMAX_MASK)

		   >> I40E_GLHMC_PEXFMAX_PMPEXFMAX_SHIFT;

	if (pe_filt_size + pe_cntx_size >  pe_fmax)

		return I40E_ERR_INVALID_SIZE;



	return 0;

}

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

+2 −5
Original line number Diff line number Diff line
@@ -201,7 +201,7 @@ exit: 
 **/

i40e_status i40e_remove_pd_bp(struct i40e_hw *hw,

					struct i40e_hmc_info *hmc_info,

					u32 idx, bool is_pf)

					u32 idx)

{

	i40e_status ret_code = 0;

	struct i40e_hmc_pd_entry *pd_entry;
@@ -237,10 +237,7 @@ i40e_status i40e_remove_pd_bp(struct i40e_hw *hw, 
	pd_addr = (u64 *)pd_table->pd_page_addr.va;

	pd_addr += rel_pd_idx;

	memset(pd_addr, 0, sizeof(u64));

	if (is_pf)

	I40E_INVALIDATE_PF_HMC_PD(hw, sd_idx, idx);

	else

		I40E_INVALIDATE_VF_HMC_PD(hw, sd_idx, idx, hmc_info->hmc_fn_id);



	/* free memory here */

	ret_code = i40e_free_dma_mem(hw, &(pd_entry->bp.addr));

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

+1 −6
Original line number Diff line number Diff line
@@ -163,11 +163,6 @@ struct i40e_hmc_info { 
	    (((sd_idx) << I40E_PFHMC_PDINV_PMSDIDX_SHIFT) |		\

	     ((pd_idx) << I40E_PFHMC_PDINV_PMPDIDX_SHIFT)))



#define I40E_INVALIDATE_VF_HMC_PD(hw, sd_idx, pd_idx, hmc_fn_id)	   \

	wr32((hw), I40E_GLHMC_VFPDINV((hmc_fn_id) - I40E_FIRST_VF_FPM_ID), \

	     (((sd_idx) << I40E_PFHMC_PDINV_PMSDIDX_SHIFT) |		   \

	      ((pd_idx) << I40E_PFHMC_PDINV_PMPDIDX_SHIFT)))



/**

 * I40E_FIND_SD_INDEX_LIMIT - finds segment descriptor index limit

 * @hmc_info: pointer to the HMC configuration information structure
@@ -226,7 +221,7 @@ i40e_status i40e_add_pd_table_entry(struct i40e_hw *hw, 
					      u32 pd_index);

i40e_status i40e_remove_pd_bp(struct i40e_hw *hw,

					struct i40e_hmc_info *hmc_info,

					u32 idx, bool is_pf);

					u32 idx);

i40e_status i40e_prep_remove_sd_bp(struct i40e_hmc_info *hmc_info,

					     u32 idx);

i40e_status i40e_remove_sd_bp_new(struct i40e_hw *hw,

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

+3 −8
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ static i40e_status i40e_create_lan_hmc_object(struct i40e_hw *hw, 
				/* remove the backing pages from pd_idx1 to i */

				while (i && (i > pd_idx1)) {

					i40e_remove_pd_bp(hw, info->hmc_info,

							  (i - 1), true);

							  (i - 1));

					i--;

				}

			}
@@ -433,11 +433,7 @@ exit_sd_error: 
				      ((j - 1) * I40E_HMC_MAX_BP_COUNT));

			pd_lmt1 = min(pd_lmt, (j * I40E_HMC_MAX_BP_COUNT));

			for (i = pd_idx1; i < pd_lmt1; i++) {

				i40e_remove_pd_bp(

					hw,

					info->hmc_info,

					i,

					true);

				i40e_remove_pd_bp(hw, info->hmc_info, i);

			}

			i40e_remove_pd_page(hw, info->hmc_info, (j - 1));

			break;
@@ -616,8 +612,7 @@ static i40e_status i40e_delete_lan_hmc_object(struct i40e_hw *hw, 
		pd_table =

			&info->hmc_info->sd_table.sd_entry[sd_idx].u.pd_table;

		if (pd_table->pd_entry[rel_pd_idx].valid) {

			ret_code = i40e_remove_pd_bp(hw, info->hmc_info,

						     j, true);

			ret_code = i40e_remove_pd_bp(hw, info->hmc_info, j);

			if (ret_code)

				goto exit;

		}