Commit 20224838 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

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

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2022-11-02 (e1000e, e1000, igc)

This series contains updates to e1000e, e1000, and igc drivers.

For e1000e, Sasha adds a new board type to help distinguish platforms and
adds device id support for upcoming platforms. He also adds trace points
for CSME flows to aid in debugging.

Ani removes unnecessary kmap_atomic call for e1000 and e1000e.

Muhammad sets speed based transmit offsets for launchtime functionality to
reduce latency for igc.

* '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue:
  igc: Correct the launchtime offset
  e1000: Remove unnecessary use of kmap_atomic()
  e1000e: Remove unnecessary use of kmap_atomic()
  e1000e: Add e1000e trace module
  e1000e: Add support for the next LOM generation
  e1000e: Separate MTP board type from ADP
====================

Link: https://lore.kernel.org/r/20221102203957.2944396-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents c5733e5b 790835fc

drivers/net/ethernet/intel/e1000/e1000_main.c

+3 −6
Original line number Diff line number Diff line
@@ -4229,8 +4229,6 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter, 
				 */

				p = buffer_info->rxbuf.page;

				if (length <= copybreak) {

					u8 *vaddr;



					if (likely(!(netdev->features & NETIF_F_RXFCS)))

						length -= 4;

					skb = e1000_alloc_rx_skb(adapter,
@@ -4238,10 +4236,9 @@ static bool e1000_clean_jumbo_rx_irq(struct e1000_adapter *adapter, 
					if (!skb)

						break;



					vaddr = kmap_atomic(p);

					memcpy(skb_tail_pointer(skb), vaddr,

					       length);

					kunmap_atomic(vaddr);

					memcpy(skb_tail_pointer(skb),

					       page_address(p), length);



					/* re-use the page, so don't erase

					 * buffer_info->rxbuf.page

					 */

drivers/net/ethernet/intel/e1000e/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 
# Makefile for the Intel(R) PRO/1000 ethernet driver

#



ccflags-y += -I$(src)

subdir-ccflags-y += -I$(src)



obj-$(CONFIG_E1000E) += e1000e.o



e1000e-objs := 82571.o ich8lan.o 80003es2lan.o \

drivers/net/ethernet/intel/e1000e/e1000.h

+3 −1
Original line number Diff line number Diff line
@@ -116,7 +116,8 @@ enum e1000_boards { 
	board_pch_spt,

	board_pch_cnp,

	board_pch_tgp,

	board_pch_adp

	board_pch_adp,

	board_pch_mtp

};



struct e1000_ps_page {
@@ -504,6 +505,7 @@ extern const struct e1000_info e1000_pch_spt_info; 
extern const struct e1000_info e1000_pch_cnp_info;

extern const struct e1000_info e1000_pch_tgp_info;

extern const struct e1000_info e1000_pch_adp_info;

extern const struct e1000_info e1000_pch_mtp_info;

extern const struct e1000_info e1000_es2_info;



void e1000e_ptp_init(struct e1000_adapter *adapter);

drivers/net/ethernet/intel/e1000e/e1000e_trace.h

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/* Copyright(c) 2022, Intel Corporation. */

/* Modeled on trace-events-sample.h */

/* The trace subsystem name for e1000e will be "e1000e_trace".

 *

 * This file is named e1000e_trace.h.

 *

 * Since this include file's name is different from the trace

 * subsystem name, we'll have to define TRACE_INCLUDE_FILE at the end

 * of this file.

 */



#undef TRACE_SYSTEM

#define TRACE_SYSTEM e1000e_trace



#if !defined(_TRACE_E1000E_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_E1000E_TRACE_H



#include <linux/tracepoint.h>



TRACE_EVENT(e1000e_trace_mac_register,

	    TP_PROTO(uint32_t reg),

	    TP_ARGS(reg),

	    TP_STRUCT__entry(__field(uint32_t,	reg)),

	    TP_fast_assign(__entry->reg = reg;),

	    TP_printk("event: TraceHub e1000e mac register: 0x%08x",

		      __entry->reg)

);



#endif

/* This must be outside ifdef _E1000E_TRACE_H */

/* This trace include file is not located in the .../include/trace

 * with the kernel tracepoint definitions, because we're a loadable

 * module.

 */



#undef TRACE_INCLUDE_PATH

#define TRACE_INCLUDE_PATH .

#undef TRACE_INCLUDE_FILE

#define TRACE_INCLUDE_FILE e1000e_trace



#include <trace/define_trace.h>

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

+2 −0
Original line number Diff line number Diff line
@@ -908,6 +908,7 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data) 
	case e1000_pch_adp:

	case e1000_pch_mtp:

	case e1000_pch_lnp:

	case e1000_pch_ptp:

		mask |= BIT(18);

		break;

	default:
@@ -1575,6 +1576,7 @@ static void e1000_loopback_cleanup(struct e1000_adapter *adapter) 
	case e1000_pch_adp:

	case e1000_pch_mtp:

	case e1000_pch_lnp:

	case e1000_pch_ptp:

		fext_nvm11 = er32(FEXTNVM11);

		fext_nvm11 &= ~E1000_FEXTNVM11_DISABLE_MULR_FIX;

		ew32(FEXTNVM11, fext_nvm11);