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

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

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



Jeff Kirsher says:

====================
10GbE Intel Wired LAN Driver Updates 2018-01-12

This series contains updates to ixgbe, fm10k and net core.

Alex updates the driver to remove a duplicate MAC address check and
verifies that we have not run out of resources to configure a MAC rule
in our filter table.  Also do not assume that dev->num_tc was populated
and configured with the driver, since it can be configured via mqprio
without any hardware coordination.  Fixed the recording of stats for
MACVLAN in ixgbe and fm10k instead of recording the receive queue on
MACVLAN offloaded frames.  When handling a MACVLAN offload, we should
be stopping/starting traffic on our own queues instead of the upper
devices transmit queues.  Fixed possible race conditions with the
MACVLAN cleanup with the interface cleanup on shutdown.  With the
recent fixes to ixgbe, we can cap the number of queues regardless of
accel_priv being in use or not, since the actual number of queues are
being reported via real_num_tx_queues.

Tony fixes up the kernel documentation for ixgbe and ixgbevf to resolve
warnings when W=1 is used.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 5d498214 e23cf38f

drivers/net/ethernet/intel/fm10k/fm10k_main.c

+6 −8
Original line number Diff line number Diff line
@@ -446,13 +446,13 @@ static void fm10k_type_trans(struct fm10k_ring *rx_ring, 


	skb->protocol = eth_type_trans(skb, dev);



	/* Record Rx queue, or update macvlan statistics */

	if (!l2_accel)

		return;



	/* update MACVLAN statistics */

	macvlan_count_rx(netdev_priv(dev), skb->len + ETH_HLEN, 1,

			 !!(rx_desc->w.hdr_info &

			    cpu_to_le16(FM10K_RXD_HDR_INFO_XC_MASK)));

		skb_record_rx_queue(skb, rx_ring->queue_index);

	else

		macvlan_count_rx(netdev_priv(dev), skb->len + ETH_HLEN, true,

				 (skb->pkt_type == PACKET_BROADCAST) ||

				 (skb->pkt_type == PACKET_MULTICAST));

}



/**
@@ -479,8 +479,6 @@ static unsigned int fm10k_process_skb_fields(struct fm10k_ring *rx_ring, 


	FM10K_CB(skb)->fi.w.vlan = rx_desc->w.vlan;



	skb_record_rx_queue(skb, rx_ring->queue_index);



	FM10K_CB(skb)->fi.d.glort = rx_desc->d.glort;



	if (rx_desc->w.vlan) {

drivers/net/ethernet/intel/ixgbe/ixgbe.h

+1 −0
Original line number Diff line number Diff line
@@ -674,6 +674,7 @@ struct ixgbe_adapter { 
	struct ieee_ets *ixgbe_ieee_ets;

	struct ixgbe_dcb_config dcb_cfg;

	struct ixgbe_dcb_config temp_dcb_cfg;

	u8 hw_tcs;

	u8 dcb_set_bitmap;

	u8 dcbx_cap;

	enum ixgbe_fc_mode last_lfc_mode;

drivers/net/ethernet/intel/ixgbe/ixgbe_82598.c

+2 −1
Original line number Diff line number Diff line
@@ -431,6 +431,7 @@ static s32 ixgbe_fc_enable_82598(struct ixgbe_hw *hw) 
/**

 *  ixgbe_start_mac_link_82598 - Configures MAC link settings

 *  @hw: pointer to hardware structure

 *  @autoneg_wait_to_complete: true when waiting for completion is needed

 *

 *  Configures link settings based on values in the ixgbe_hw struct.

 *  Restarts the link.  Performs autonegotiation if needed.
@@ -1054,7 +1055,7 @@ static s32 ixgbe_read_i2c_eeprom_82598(struct ixgbe_hw *hw, u8 byte_offset, 
 *  ixgbe_read_i2c_sff8472_82598 - Reads 8 bit word over I2C interface.

 *  @hw: pointer to hardware structure

 *  @byte_offset: byte offset at address 0xA2

 *  @eeprom_data: value read

 *  @sff8472_data: value read

 *

 *  Performs 8 byte read operation to SFP module's SFF-8472 data over I2C

 **/

drivers/net/ethernet/intel/ixgbe/ixgbe_82599.c

+7 −4
Original line number Diff line number Diff line
@@ -221,7 +221,7 @@ static s32 prot_autoc_read_82599(struct ixgbe_hw *hw, bool *locked, 
/**

 * prot_autoc_write_82599 - Hides MAC differences needed for AUTOC write

 * @hw: pointer to hardware structure

 * @reg_val: value to write to AUTOC

 * @autoc: value to write to AUTOC

 * @locked: bool to indicate whether the SW/FW lock was already taken by

 *	     previous proc_autoc_read_82599.

 *
@@ -1310,10 +1310,11 @@ do { \ 


/**

 *  ixgbe_atr_compute_sig_hash_82599 - Compute the signature hash

 *  @stream: input bitstream to compute the hash on

 *  @input: input bitstream to compute the hash on

 *  @common: compressed common input dword

 *

 *  This function is almost identical to the function above but contains

 *  several optomizations such as unwinding all of the loops, letting the

 *  several optimizations such as unwinding all of the loops, letting the

 *  compiler work out all of the conditional ifs since the keys are static

 *  defines, and computing two keys at once since the hashed dword stream

 *  will be the same for both keys.
@@ -1446,7 +1447,7 @@ do { \ 


/**

 *  ixgbe_atr_compute_perfect_hash_82599 - Compute the perfect filter hash

 *  @atr_input: input bitstream to compute the hash on

 *  @input: input bitstream to compute the hash on

 *  @input_mask: mask for the input bitstream

 *

 *  This function serves two main purposes.  First it applies the input_mask
@@ -2078,6 +2079,7 @@ static s32 ixgbe_reset_pipeline_82599(struct ixgbe_hw *hw) 
 *  ixgbe_read_i2c_byte_82599 - Reads 8 bit word over I2C

 *  @hw: pointer to hardware structure

 *  @byte_offset: byte offset to read

 *  @dev_addr: address to read from

 *  @data: value read

 *

 *  Performs byte read operation to SFP module's EEPROM over I2C interface at
@@ -2131,6 +2133,7 @@ static s32 ixgbe_read_i2c_byte_82599(struct ixgbe_hw *hw, u8 byte_offset, 
 *  ixgbe_write_i2c_byte_82599 - Writes 8 bit word over I2C

 *  @hw: pointer to hardware structure

 *  @byte_offset: byte offset to write

 *  @dev_addr: address to write to

 *  @data: value to write

 *

 *  Performs byte write operation to SFP module's EEPROM over I2C interface at

drivers/net/ethernet/intel/ixgbe/ixgbe_common.c

+6 −3
Original line number Diff line number Diff line
@@ -1613,6 +1613,7 @@ static void ixgbe_shift_out_eeprom_bits(struct ixgbe_hw *hw, u16 data, 
/**

 *  ixgbe_shift_in_eeprom_bits - Shift data bits in from the EEPROM

 *  @hw: pointer to hardware structure

 *  @count: number of bits to shift

 **/

static u16 ixgbe_shift_in_eeprom_bits(struct ixgbe_hw *hw, u16 count)

{
@@ -1667,7 +1668,7 @@ static void ixgbe_raise_eeprom_clk(struct ixgbe_hw *hw, u32 *eec) 
/**

 *  ixgbe_lower_eeprom_clk - Lowers the EEPROM's clock input.

 *  @hw: pointer to hardware structure

 *  @eecd: EECD's current value

 *  @eec: EEC's current value

 **/

static void ixgbe_lower_eeprom_clk(struct ixgbe_hw *hw, u32 *eec)

{
@@ -2037,7 +2038,7 @@ static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr) 
/**

 *  ixgbe_set_mta - Set bit-vector in multicast table

 *  @hw: pointer to hardware structure

 *  @hash_value: Multicast address hash value

 *  @mc_addr: Multicast address

 *

 *  Sets the bit-vector in the multicast table.

 **/
@@ -3086,6 +3087,8 @@ s32 ixgbe_init_uta_tables_generic(struct ixgbe_hw *hw) 
 *  ixgbe_find_vlvf_slot - find the vlanid or the first empty slot

 *  @hw: pointer to hardware structure

 *  @vlan: VLAN id to write to VLAN filter

 *  @vlvf_bypass: true to find vlanid only, false returns first empty slot if

 *		  vlanid not found

 *

 *  return the VLVF index where this VLAN id should be placed

 *
@@ -3476,7 +3479,7 @@ void ixgbe_set_mac_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf) 
 *  ixgbe_set_vlan_anti_spoofing - Enable/Disable VLAN anti-spoofing

 *  @hw: pointer to hardware structure

 *  @enable: enable or disable switch for VLAN anti-spoofing

 *  @pf: Virtual Function pool - VF Pool to set for VLAN anti-spoofing

 *  @vf: Virtual Function pool - VF Pool to set for VLAN anti-spoofing

 *

 **/

void ixgbe_set_vlan_anti_spoofing(struct ixgbe_hw *hw, bool enable, int vf)