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

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

Merge tag 'mlx5e-updates-2018-07-18-v2' of... 

Merge tag 'mlx5e-updates-2018-07-18-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux



Saeed Mahameed says:

====================
mlx5e-updates-2018-07-18

This series includes update for mlx5e net device driver.

1) From Feras Daoud, Added the support for firmware log tracing,
first by introducing the firmware API needed for the task and then
For each PF do the following:
    1- Allocate memory for the tracer strings database and read it from the FW to the SW.
    2- Allocate and dma map tracer buffers.

    Traces that will be written into the buffer will be parsed as a group
    of one or more traces, referred to as trace message. The trace message
    represents a C-like printf string.
Once a new trace is available  FW will generate an event indicates new trace/s are
available and the driver will parse them and dump them using tracepoints
event tracing

Enable mlx5 fw tracing by:
echo 1 > /sys/kernel/debug/tracing/events/mlx5/mlx5_fw/enable

Read traces by:
cat /sys/kernel/debug/tracing/trace

2) From Roi Dayan, Remove redundant WARN when we cannot find neigh entry

3) From Jianbo Liu, TC double vlan support
- Support offloading tc double vlan headers match
- Support offloading double vlan push/pop tc actions

4) From Boris, re-visit UDP GSO, remove the splitting of UDP_GSO_L4 packets
in the driver, and exposes UDP_GSO_L4 as a PARTIAL_GSO feature.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c9eaaa17 3f44899e

drivers/infiniband/hw/mlx5/Kconfig

+1 −1
Original line number Diff line number Diff line 
config MLX5_INFINIBAND

	tristate "Mellanox Connect-IB HCA support"

	tristate "Mellanox 5th generation network adapters (ConnectX series) support"

	depends on NETDEVICES && ETHERNET && PCI && MLX5_CORE

	depends on INFINIBAND_USER_ACCESS || INFINIBAND_USER_ACCESS=n

	---help---

drivers/infiniband/hw/mlx5/cmd.c

+15 −0
Original line number Diff line number Diff line
@@ -32,6 +32,21 @@ 


#include "cmd.h"



int mlx5_cmd_dump_fill_mkey(struct mlx5_core_dev *dev, u32 *mkey)

{

	u32 out[MLX5_ST_SZ_DW(query_special_contexts_out)] = {0};

	u32 in[MLX5_ST_SZ_DW(query_special_contexts_in)]   = {0};

	int err;



	MLX5_SET(query_special_contexts_in, in, opcode,

		 MLX5_CMD_OP_QUERY_SPECIAL_CONTEXTS);

	err = mlx5_cmd_exec(dev, in, sizeof(in), out, sizeof(out));

	if (!err)

		*mkey = MLX5_GET(query_special_contexts_out, out,

				 dump_fill_mkey);

	return err;

}



int mlx5_cmd_null_mkey(struct mlx5_core_dev *dev, u32 *null_mkey)

{

	u32 out[MLX5_ST_SZ_DW(query_special_contexts_out)] = {};

drivers/infiniband/hw/mlx5/cmd.h

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include <linux/kernel.h>

#include <linux/mlx5/driver.h>



int mlx5_cmd_dump_fill_mkey(struct mlx5_core_dev *dev, u32 *mkey);

int mlx5_cmd_null_mkey(struct mlx5_core_dev *dev, u32 *null_mkey);

int mlx5_cmd_query_cong_params(struct mlx5_core_dev *dev, int cong_point,

			       void *out, int out_size);

drivers/net/ethernet/mellanox/mlx5/core/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



config MLX5_CORE

	tristate "Mellanox Technologies ConnectX-4 and Connect-IB core driver"

	tristate "Mellanox 5th generation network adapters (ConnectX series) core driver"

	depends on MAY_USE_DEVLINK

	depends on PCI

	imply PTP_1588_CLOCK
@@ -27,7 +27,7 @@ config MLX5_FPGA 
          sandbox-specific client drivers.



config MLX5_CORE_EN

	bool "Mellanox Technologies ConnectX-4 Ethernet support"

	bool "Mellanox 5th generation network adapters (ConnectX series) Ethernet support"

	depends on NETDEVICES && ETHERNET && INET && PCI && MLX5_CORE

	depends on IPV6=y || IPV6=n || MLX5_CORE=m

	select PAGE_POOL
@@ -69,7 +69,7 @@ config MLX5_CORE_EN_DCB 
	  If unsure, set to Y



config MLX5_CORE_IPOIB

	bool "Mellanox Technologies ConnectX-4 IPoIB offloads support"

	bool "Mellanox 5th generation network adapters (connectX series) IPoIB offloads support"

	depends on MLX5_CORE_EN

	default n

	---help---

drivers/net/ethernet/mellanox/mlx5/core/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ mlx5_core-y := main.o cmd.o debugfs.o fw.o eq.o uar.o pagealloc.o \ 
		health.o mcg.o cq.o srq.o alloc.o qp.o port.o mr.o pd.o \

		mad.o transobj.o vport.o sriov.o fs_cmd.o fs_core.o \

		fs_counters.o rl.o lag.o dev.o wq.o lib/gid.o lib/clock.o \

		diag/fs_tracepoint.o

		diag/fs_tracepoint.o diag/fw_tracer.o



mlx5_core-$(CONFIG_MLX5_ACCEL) += accel/ipsec.o accel/tls.o
@@ -14,8 +14,8 @@ mlx5_core-$(CONFIG_MLX5_FPGA) += fpga/cmd.o fpga/core.o fpga/conn.o fpga/sdk.o \ 
		fpga/ipsec.o fpga/tls.o



mlx5_core-$(CONFIG_MLX5_CORE_EN) += en_main.o en_common.o en_fs.o en_ethtool.o \

		en_tx.o en_rx.o en_dim.o en_txrx.o en_accel/rxtx.o en_stats.o  \

		vxlan.o en_arfs.o en_fs_ethtool.o en_selftest.o en/port.o

		en_tx.o en_rx.o en_dim.o en_txrx.o en_stats.o vxlan.o          \

		en_arfs.o en_fs_ethtool.o en_selftest.o en/port.o



mlx5_core-$(CONFIG_MLX5_MPFS) += lib/mpfs.o