6 files changed, 614 insertions, 175 deletions

diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
index 52f38b480669..63e50877796b 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c
@@ -4542,8 +4542,12 @@ static int mlxsw_sp_netdevice_event(struct notifier_block *nb,
         int err = 0;
 
         mlxsw_sp = container_of(nb, struct mlxsw_sp, netdevice_nb);
-        if (mlxsw_sp_netdev_is_ipip(mlxsw_sp, dev))
-                err = mlxsw_sp_netdevice_ipip_event(mlxsw_sp, dev, event, ptr);
+        if (mlxsw_sp_netdev_is_ipip_ol(mlxsw_sp, dev))
+                err = mlxsw_sp_netdevice_ipip_ol_event(mlxsw_sp, dev,
+                                                       event, ptr);
+        else if (mlxsw_sp_netdev_is_ipip_ul(mlxsw_sp, dev))
+                err = mlxsw_sp_netdevice_ipip_ul_event(mlxsw_sp, dev,
+                                                       event, ptr);
         else if (event == NETDEV_CHANGEADDR || event == NETDEV_CHANGEMTU)
                 err = mlxsw_sp_netdevice_router_port_event(dev);
         else if (mlxsw_sp_is_vrf_event(event, ptr))
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
index b2393bb8cef9..47dd7e06fd29 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.h
@@ -396,13 +396,19 @@ int mlxsw_sp_inet6addr_valid_event(struct notifier_block *unused,
                                    unsigned long event, void *ptr);
 int mlxsw_sp_netdevice_vrf_event(struct net_device *l3_dev, unsigned long event,
                                  struct netdev_notifier_changeupper_info *info);
-bool mlxsw_sp_netdev_is_ipip(const struct mlxsw_sp *mlxsw_sp,
-                             const struct net_device *dev);
+bool mlxsw_sp_netdev_is_ipip_ol(const struct mlxsw_sp *mlxsw_sp,
+                                const struct net_device *dev);
+bool mlxsw_sp_netdev_is_ipip_ul(const struct mlxsw_sp *mlxsw_sp,
+                                const struct net_device *dev);
+int mlxsw_sp_netdevice_ipip_ol_event(struct mlxsw_sp *mlxsw_sp,
+                                     struct net_device *l3_dev,
+                                     unsigned long event,
+                                     struct netdev_notifier_info *info);
 int
-mlxsw_sp_netdevice_ipip_event(struct mlxsw_sp *mlxsw_sp,
-                              struct net_device *l3_dev,
-                              unsigned long event,
-                              struct netdev_notifier_changeupper_info *info);
+mlxsw_sp_netdevice_ipip_ul_event(struct mlxsw_sp *mlxsw_sp,
+                                 struct net_device *l3_dev,
+                                 unsigned long event,
+                                 struct netdev_notifier_info *info);
 void
 mlxsw_sp_port_vlan_router_leave(struct mlxsw_sp_port_vlan *mlxsw_sp_port_vlan);
 void mlxsw_sp_rif_destroy(struct mlxsw_sp_rif *rif);
diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c
index 702fe945227c..7502e53447bd 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum_ipip.c
@@ -36,36 +36,123 @@
 
 #include "spectrum_ipip.h"
 
-static bool
-mlxsw_sp_ipip_netdev_has_ikey(const struct net_device *ol_dev)
+struct ip_tunnel_parm
+mlxsw_sp_ipip_netdev_parms(const struct net_device *ol_dev)
 {
         struct ip_tunnel *tun = netdev_priv(ol_dev);
 
-        return !!(tun->parms.i_flags & TUNNEL_KEY);
+        return tun->parms;
 }
 
-static bool
-mlxsw_sp_ipip_netdev_has_okey(const struct net_device *ol_dev)
+static bool mlxsw_sp_ipip_parms_has_ikey(struct ip_tunnel_parm parms)
 {
-        struct ip_tunnel *tun = netdev_priv(ol_dev);
+        return !!(parms.i_flags & TUNNEL_KEY);
+}
 
-        return !!(tun->parms.o_flags & TUNNEL_KEY);
+static bool mlxsw_sp_ipip_parms_has_okey(struct ip_tunnel_parm parms)
+{
+        return !!(parms.o_flags & TUNNEL_KEY);
 }
 
-static u32 mlxsw_sp_ipip_netdev_ikey(const struct net_device *ol_dev)
+static u32 mlxsw_sp_ipip_parms_ikey(struct ip_tunnel_parm parms)
 {
-        struct ip_tunnel *tun = netdev_priv(ol_dev);
+        return mlxsw_sp_ipip_parms_has_ikey(parms) ?
+                be32_to_cpu(parms.i_key) : 0;
+}
+
+static u32 mlxsw_sp_ipip_parms_okey(struct ip_tunnel_parm parms)
+{
+        return mlxsw_sp_ipip_parms_has_okey(parms) ?
+                be32_to_cpu(parms.o_key) : 0;
+}
 
-        return mlxsw_sp_ipip_netdev_has_ikey(ol_dev) ?
-                be32_to_cpu(tun->parms.i_key) : 0;
+static __be32 mlxsw_sp_ipip_parms_saddr4(struct ip_tunnel_parm parms)
+{
+        return parms.iph.saddr;
+}
+
+static union mlxsw_sp_l3addr
+mlxsw_sp_ipip_parms_saddr(enum mlxsw_sp_l3proto proto,
+                          struct ip_tunnel_parm parms)
+{
+        switch (proto) {
+        case MLXSW_SP_L3_PROTO_IPV4:
+                return (union mlxsw_sp_l3addr) {
+                        .addr4 = mlxsw_sp_ipip_parms_saddr4(parms),
+                };
+        case MLXSW_SP_L3_PROTO_IPV6:
+                break;
+        }
+
+        WARN_ON(1);
+        return (union mlxsw_sp_l3addr) {
+                .addr4 = 0,
+        };
+}
+
+static __be32 mlxsw_sp_ipip_parms_daddr4(struct ip_tunnel_parm parms)
+{
+        return parms.iph.daddr;
+}
+
+static union mlxsw_sp_l3addr
+mlxsw_sp_ipip_parms_daddr(enum mlxsw_sp_l3proto proto,
+                          struct ip_tunnel_parm parms)
+{
+        switch (proto) {
+        case MLXSW_SP_L3_PROTO_IPV4:
+                return (union mlxsw_sp_l3addr) {
+                        .addr4 = mlxsw_sp_ipip_parms_daddr4(parms),
+                };
+        case MLXSW_SP_L3_PROTO_IPV6:
+                break;
+        }
+
+        WARN_ON(1);
+        return (union mlxsw_sp_l3addr) {
+                .addr4 = 0,
+        };
+}
+
+static bool mlxsw_sp_ipip_netdev_has_ikey(const struct net_device *ol_dev)
+{
+        return mlxsw_sp_ipip_parms_has_ikey(mlxsw_sp_ipip_netdev_parms(ol_dev));
+}
+
+static bool mlxsw_sp_ipip_netdev_has_okey(const struct net_device *ol_dev)
+{
+        return mlxsw_sp_ipip_parms_has_okey(mlxsw_sp_ipip_netdev_parms(ol_dev));
+}
+
+static u32 mlxsw_sp_ipip_netdev_ikey(const struct net_device *ol_dev)
+{
+        return mlxsw_sp_ipip_parms_ikey(mlxsw_sp_ipip_netdev_parms(ol_dev));
 }
 
 static u32 mlxsw_sp_ipip_netdev_okey(const struct net_device *ol_dev)
 {
-        struct ip_tunnel *tun = netdev_priv(ol_dev);
+        return mlxsw_sp_ipip_parms_okey(mlxsw_sp_ipip_netdev_parms(ol_dev));
+}
+
+union mlxsw_sp_l3addr
+mlxsw_sp_ipip_netdev_saddr(enum mlxsw_sp_l3proto proto,
+                           const struct net_device *ol_dev)
+{
+        return mlxsw_sp_ipip_parms_saddr(proto,
+                                         mlxsw_sp_ipip_netdev_parms(ol_dev));
+}
+
+static __be32 mlxsw_sp_ipip_netdev_daddr4(const struct net_device *ol_dev)
+{
+        return mlxsw_sp_ipip_parms_daddr4(mlxsw_sp_ipip_netdev_parms(ol_dev));
+}
 
-        return mlxsw_sp_ipip_netdev_has_okey(ol_dev) ?
+static union mlxsw_sp_l3addr