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

Merge tag 'mlx5-updates-2019-11-12' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2019-11-12

1) Merge mlx5-next for devlink reload and flowtable offloads dependencies
2) Devlink reload support
3) TC Flowtable offloads
4) Misc cleanup
====================

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

Documentation/networking/device_drivers/mellanox/mlx5.rst

+21 −0
Original line number Diff line number Diff line
@@ -154,6 +154,27 @@ User command examples: 
      values:

         cmode runtime value smfs



enable_roce: RoCE enablement state

----------------------------------

RoCE enablement state controls driver support for RoCE traffic.

When RoCE is disabled, there is no gid table, only raw ethernet QPs are supported and traffic on the well known UDP RoCE port is handled as raw ethernet traffic.



To change RoCE enablement state a user must change the driverinit cmode value and run devlink reload.



User command examples:



- Disable RoCE::



    $ devlink dev param set pci/0000:06:00.0 name enable_roce value false cmode driverinit

    $ devlink dev reload pci/0000:06:00.0



- Read RoCE enablement state::



    $ devlink dev param show pci/0000:06:00.0 name enable_roce

      pci/0000:06:00.0:

      name enable_roce type generic

      values:

         cmode driverinit value true



Devlink health reporters

========================

Documentation/networking/devlink-params-mlx5.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
flow_steering_mode	[DEVICE, DRIVER-SPECIFIC]

			Controls the flow steering mode of the driver.

			Two modes are supported:

			1. 'dmfs' - Device managed flow steering.

			2. 'smfs  - Software/Driver managed flow steering.

			In DMFS mode, the HW steering entities are created and

			managed through the Firmware.

			In SMFS mode, the HW steering entities are created and

			managed though by the driver directly into Hardware

			without firmware intervention.

			Type: String

			Configuration mode: runtime



enable_roce		[DEVICE, GENERIC]

			Enable handling of RoCE traffic in the device.

			Defaultly enabled.

			Configuration mode: driverinit

Documentation/networking/devlink-params.txt

+4 −0
Original line number Diff line number Diff line
@@ -65,3 +65,7 @@ reset_dev_on_drv_probe [DEVICE, GENERIC] 
			  Reset only if device firmware can be found in the

			  filesystem.

			Type: u8



enable_roce		[DEVICE, GENERIC]

			Enable handling of RoCE traffic in the device.

			Type: Boolean

drivers/infiniband/hw/mlx5/ib_rep.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ mlx5_ib_vport_rep_load(struct mlx5_core_dev *dev, struct mlx5_eswitch_rep *rep) 
	int vport_index;



	if (rep->vport == MLX5_VPORT_UPLINK)

		profile = &uplink_rep_profile;

		profile = &raw_eth_profile;

	else

		return mlx5_ib_set_vport_rep(dev, rep);

drivers/infiniband/hw/mlx5/ib_rep.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include "mlx5_ib.h"



#ifdef CONFIG_MLX5_ESWITCH

extern const struct mlx5_ib_profile uplink_rep_profile;

extern const struct mlx5_ib_profile raw_eth_profile;



u8 mlx5_ib_eswitch_mode(struct mlx5_eswitch *esw);

struct mlx5_ib_dev *mlx5_ib_get_rep_ibdev(struct mlx5_eswitch *esw,