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

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

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



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2016-06-29

This series contains updates and fixes to e1000e, igb, ixgbe and fm10k.  A
true smorgasbord of changes.

Jake cleans up some obscurity by not using the BIT() macro on bitshift
operation and also fixed the calculated index when looping through the
indir array.  Fixes the issue with igb's workqueue item for overflow
check from causing a surprise remove event.  The ptp_flags variable is
added to simplify the work of writing several complex MAC type checks
in the PTP code while fixing the workqueue.

Alex Duyck fixes the receive buffers alignment which should not be L1
cache aligned, but to 512 bytes instead.

Denys Vlasenko prevents a division by zero which was reported under
VMWare for e1000e.

Amritha fixes an issue where filters in a child hash table must be
cleared from the hardware before delete the filter links in ixgbe.

Bhaktipriya Shridhar simply replaces the deprecated create_workqueue()
with alloc_workqueue() for fm10k.

Tony corrects ixgbe ethtool reporting to show x550 supports hardware
timestamping of all packets.

Emil fixes an issue where MAC-VLANs on the VF fail to pass traffic due
to spoofed packets.

Andrew Lunn increases performance on some systems where syncing a buffer
for DMA is expensive.  So rather than sync the whole 2K receive buffer,
only synchronize the length of the frame.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c435e6e0 64f2525c

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

+2 −1
Original line number Diff line number Diff line
@@ -4363,7 +4363,8 @@ static cycle_t e1000e_cyclecounter_read(const struct cyclecounter *cc) 


			time_delta = systim_next - systim;

			temp = time_delta;

			rem = do_div(temp, incvalue);

			/* VMWare users have seen incvalue of zero, don't div / 0 */

			rem = incvalue ? do_div(temp, incvalue) : (time_delta != 0);



			systim = systim_next;

drivers/net/ethernet/intel/fm10k/fm10k.h

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ static inline u16 fm10k_desc_unused(struct fm10k_ring *ring) 
	 (&(((union fm10k_rx_desc *)((R)->desc))[i]))



#define FM10K_MAX_TXD_PWR	14

#define FM10K_MAX_DATA_PER_TXD	BIT(FM10K_MAX_TXD_PWR)

#define FM10K_MAX_DATA_PER_TXD	(1u << FM10K_MAX_TXD_PWR)



/* Tx Descriptors needed, worst case */

#define TXD_USE_COUNT(S)	DIV_ROUND_UP((S), FM10K_MAX_DATA_PER_TXD)

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

+3 −2
Original line number Diff line number Diff line
@@ -983,9 +983,10 @@ void fm10k_write_reta(struct fm10k_intfc *interface, const u32 *indir) 
		/* generate a new table if we weren't given one */

		for (j = 0; j < 4; j++) {

			if (indir)

				n = indir[i + j];

				n = indir[4 * i + j];

			else

				n = ethtool_rxfh_indir_default(i + j, rss_i);

				n = ethtool_rxfh_indir_default(4 * i + j,

							       rss_i);



			table[j] = n;

		}

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

+2 −3
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ static int __init fm10k_init_module(void) 
	pr_info("%s\n", fm10k_copyright);



	/* create driver workqueue */

	fm10k_workqueue = create_workqueue("fm10k");

	fm10k_workqueue = alloc_workqueue("fm10k", WQ_MEM_RECLAIM, 0);



	fm10k_dbg_init();
@@ -77,7 +77,6 @@ static void __exit fm10k_exit_module(void) 
	fm10k_dbg_exit();



	/* destroy driver workqueue */

	flush_workqueue(fm10k_workqueue);

	destroy_workqueue(fm10k_workqueue);

}

module_exit(fm10k_exit_module);
@@ -272,7 +271,7 @@ static bool fm10k_add_rx_frag(struct fm10k_rx_buffer *rx_buffer, 
#if (PAGE_SIZE < 8192)

	unsigned int truesize = FM10K_RX_BUFSZ;

#else

	unsigned int truesize = SKB_DATA_ALIGN(size);

	unsigned int truesize = ALIGN(size, 512);

#endif

	unsigned int pull_len;

drivers/net/ethernet/intel/igb/igb.h

+6 −1
Original line number Diff line number Diff line
@@ -445,6 +445,7 @@ struct igb_adapter { 
	unsigned long ptp_tx_start;

	unsigned long last_rx_ptp_check;

	unsigned long last_rx_timestamp;

	unsigned int ptp_flags;

	spinlock_t tmreg_lock;

	struct cyclecounter cc;

	struct timecounter tc;
@@ -474,12 +475,15 @@ struct igb_adapter { 
	u16 eee_advert;

};



/* flags controlling PTP/1588 function */

#define IGB_PTP_ENABLED		BIT(0)

#define IGB_PTP_OVERFLOW_CHECK	BIT(1)



#define IGB_FLAG_HAS_MSI		BIT(0)

#define IGB_FLAG_DCA_ENABLED		BIT(1)

#define IGB_FLAG_QUAD_PORT_A		BIT(2)

#define IGB_FLAG_QUEUE_PAIRS		BIT(3)

#define IGB_FLAG_DMAC			BIT(4)

#define IGB_FLAG_PTP			BIT(5)

#define IGB_FLAG_RSS_FIELD_IPV4_UDP	BIT(6)

#define IGB_FLAG_RSS_FIELD_IPV6_UDP	BIT(7)

#define IGB_FLAG_WOL_SUPPORTED		BIT(8)
@@ -546,6 +550,7 @@ void igb_set_fw_version(struct igb_adapter *); 
void igb_ptp_init(struct igb_adapter *adapter);

void igb_ptp_stop(struct igb_adapter *adapter);

void igb_ptp_reset(struct igb_adapter *adapter);

void igb_ptp_suspend(struct igb_adapter *adapter);

void igb_ptp_rx_hang(struct igb_adapter *adapter);

void igb_ptp_rx_rgtstamp(struct igb_q_vector *q_vector, struct sk_buff *skb);

void igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector, unsigned char *va,