ice: basic support for VLAN in subfunctions

Implement add / delete vlan for subfunction type VSI.

Reviewed-by: Simon Horman <horms@kernel.org>
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
Tested-by: Rafal Romanowski <rafal.romanowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

diff --git a/drivers/net/ethernet/intel/ice/Makefile b/drivers/net/ethernet/intel/ice/Makefile
index 81acb590eac6320ef0f32108c8b89cee6f37f56e..3307d551f431a49ebb9b7e6713eb2469c8aa7c08 100644 (file)
--- a/drivers/net/ethernet/intel/ice/Makefile
+++ b/drivers/net/ethernet/intel/ice/Makefile
@@ -34,6 +34,7 @@ ice-y := ice_main.o   \
         devlink/devlink.o      \
         devlink/devlink_port.o \
         ice_sf_eth.o   \
+        ice_sf_vsi_vlan_ops.o \
         ice_ddp.o      \
         ice_fw_update.o \
         ice_lag.o      \

diff --git a/drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.c b/drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.c
new file mode 100644 (file)
index 0000000..3d7e967
--- /dev/null
+++ b/drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.c
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0
+/* Copyright (c) 2023, Intel Corporation. */
+
+#include "ice_vsi_vlan_ops.h"
+#include "ice_vsi_vlan_lib.h"
+#include "ice_vlan_mode.h"
+#include "ice.h"
+#include "ice_sf_vsi_vlan_ops.h"
+
+void ice_sf_vsi_init_vlan_ops(struct ice_vsi *vsi)
+{
+       struct ice_vsi_vlan_ops *vlan_ops;
+
+       if (ice_is_dvm_ena(&vsi->back->hw))
+               vlan_ops = &vsi->outer_vlan_ops;
+       else
+               vlan_ops = &vsi->inner_vlan_ops;
+
+       vlan_ops->add_vlan = ice_vsi_add_vlan;
+       vlan_ops->del_vlan = ice_vsi_del_vlan;
+}

diff --git a/drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.h b/drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.h
new file mode 100644 (file)
index 0000000..8c44eaf
--- /dev/null
+++ b/drivers/net/ethernet/intel/ice/ice_sf_vsi_vlan_ops.h
@@ -0,0 +1,13 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* Copyright (c) 2023, Intel Corporation. */
+
+#ifndef _ICE_SF_VSI_VLAN_OPS_H_
+#define _ICE_SF_VSI_VLAN_OPS_H_
+
+#include "ice_vsi_vlan_ops.h"
+
+struct ice_vsi;
+
+void ice_sf_vsi_init_vlan_ops(struct ice_vsi *vsi);
+
+#endif /* _ICE_SF_VSI_VLAN_OPS_H_ */

diff --git a/drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.c b/drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.c
index 7aae7fdcfcdb91978268bbb944c7f0c0e130a034..8c7a9b41fb63c9da012c6962276d10f75e24c0fd 100644 (file)
--- a/drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.c
+++ b/drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.c
@@ -3,6 +3,7 @@
 
 #include "ice_pf_vsi_vlan_ops.h"
 #include "ice_vf_vsi_vlan_ops.h"
+#include "ice_sf_vsi_vlan_ops.h"
 #include "ice_lib.h"
 #include "ice.h"
 
@@ -77,6 +78,9 @@ void ice_vsi_init_vlan_ops(struct ice_vsi *vsi)
        case ICE_VSI_VF:
                ice_vf_vsi_init_vlan_ops(vsi);
                break;
+       case ICE_VSI_SF:
+               ice_sf_vsi_init_vlan_ops(vsi);
+               break;
        default:
                dev_dbg(ice_pf_to_dev(vsi->back), "%s does not support VLAN operations\n",
                        ice_vsi_type_str(vsi->type));