Hi Dave,
This series includes some misc updates and vlan encap tunnel support.
For more information please see tag log below.
Please pull and let me know if there is any problem.
Please note that the series starts with a merge of mlx5-next branch,
to resolve and avoid dependency with rdma tree.
=======================
Conflict note: when merged with net branch this series adds 2 trivial
conflicts in mlx5.
1)
+<<<<<<< HEAD
+#define MLX5E_REP_PARAMS_DEF_LOG_SQ_SIZE \
+ max(0x7, MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE)
++=======
+ #define MLX5E_REP_PARAMS_LOG_SQ_SIZE \
+ max(0x6, MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE)
+ #define MLX5E_REP_PARAMS_DEF_NUM_CHANNELS 1
++>>>>>>> dave/master
Resolution:
define MLX5E_REP_PARAMS_DEF_LOG_SQ_SIZE \
max(0x7, MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE)
#define MLX5E_REP_PARAMS_DEF_NUM_CHANNELS 1
2)
++<<<<<<< HEAD
+ priv->channels.params.num_channels =
+ mlx5e_rep_get_default_num_channels(rpriv->rep, netdev);
++=======
+ priv->channels.params.num_channels = MLX5E_REP_PARAMS_DEF_NUM_CHANNELS;
++>>>>>>> dave/master
Resolution: Use the hunk from net-next (1st hunk).
=======================
You will see other conflicts in mlx5 but i already notified you about
those in pull request: Mellanox, mlx5 fixes 2018-12-13
https://patchwork.ozlabs.org/patch/1012968/
Thanks,
Saeed.
---
The following changes since commit 0056ce4865713162e32619dbfcca21ff2ba8b8dc:
Merge branch 'mlx5-next' of
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux (2018-12-19
12:12:18 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux.git
tags/mlx5-updates-2018-12-19
for you to fetch changes up to a8836756493290d3b156d63050d203f95d691a32:
net/mlx5e: Support tunnel encap over tagged Ethernet (2018-12-19 12:12:36
-0800)
----------------------------------------------------------------
mlx5-updates-2018-12-19
This series adds some misc updates and the support for tunnels over VLAN
tc offloads.
>From Miroslav Lichvar, patches #1,2
1) Update timecounter at least twice per counter overflow
2) Extend PTP gettime function to read system clock
>From Gavi Teitz, patch #3
3) Increase VF representors' SQ size to 128
>From Eli Britstein and Or Gerlitz, patches #4-10
4) Adds the capability to support tunnels over VLAN device.
Patch 4 avoids crash for TC flow with egress upper devices
Patch 5 refactors tunnel routing devs into a helper function
Patch 6 avoids crash for TC encap flows with vlan on underlay
Patches 7-8 refactor encap tunnel header preparing code.
Patch 9 adds support for building VLAN tagged ETH header.
Patch 10 adds support for tunnel routing to VLAN device.
----------------------------------------------------------------
Eli Britstein (7):
net/mlx5e: Fail attempt to offload e-switch TC flows with egress upper
devices
net/mlx5e: Tunnel routing output devs helper function
net/mlx5e: Fail attempt to offload e-switch TC encap flows with vlan on
underlay
net/mlx5e: Tunnel encap ETH header helper function
net/mlx5e: Re-order route and encap header memory allocation
net/mlx5e: Support VLAN encap ETH header generation
net/mlx5e: Support tunnel encap over tagged Ethernet
Gavi Teitz (1):
net/mlx5e: Increase VF representors' SQ size to 128
Miroslav Lichvar (2):
mlx5: update timecounter at least twice per counter overflow
mlx5: extend PTP gettime function to read system clock
Or Gerlitz (1):
net/mlx5e: Allow vlans on e-switch uplink reps
.../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 186 ++++++++++++---------
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 20 ++-
drivers/net/ethernet/mellanox/mlx5/core/en_rep.h | 3 +
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 3 +
.../net/ethernet/mellanox/mlx5/core/lib/clock.c | 24 +--
drivers/net/ethernet/mellanox/mlx5/core/main.c | 11 +-
.../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 4 +-
7 files changed, 156 insertions(+), 95 deletions(-)
