intel/fm10k: Remove unused fm10k_iov_msg_mac_vlan_pf

fm10k_iov_msg_mac_vlan_pf() has been unused since 2017's
commit 1f5c27e52857 ("fm10k: use the MAC/VLAN queue for VF<->PF MAC/VLAN
requests")

Remove it.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Link: https://patch.msgid.link/20250106221929.956999-16-anthony.l.nguyen@intel.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c
index 98861cc6df7ccb611549bf6373661fc2c569cca7..b9dd7b71983243ac8214fb66540454633b3aa93c 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pf.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pf.c
@@ -1179,126 +1179,6 @@ s32 fm10k_iov_select_vid(struct fm10k_vf_info *vf_info, u16 vid)
                return vid;
 }
 
-/**
- *  fm10k_iov_msg_mac_vlan_pf - Message handler for MAC/VLAN request from VF
- *  @hw: Pointer to hardware structure
- *  @results: Pointer array to message, results[0] is pointer to message
- *  @mbx: Pointer to mailbox information structure
- *
- *  This function is a default handler for MAC/VLAN requests from the VF.
- *  The assumption is that in this case it is acceptable to just directly
- *  hand off the message from the VF to the underlying shared code.
- **/
-s32 fm10k_iov_msg_mac_vlan_pf(struct fm10k_hw *hw, u32 **results,
-                             struct fm10k_mbx_info *mbx)
-{
-       struct fm10k_vf_info *vf_info = (struct fm10k_vf_info *)mbx;
-       u8 mac[ETH_ALEN];
-       u32 *result;
-       int err = 0;
-       bool set;
-       u16 vlan;
-       u32 vid;
-
-       /* we shouldn't be updating rules on a disabled interface */
-       if (!FM10K_VF_FLAG_ENABLED(vf_info))
-               err = FM10K_ERR_PARAM;
-
-       if (!err && !!results[FM10K_MAC_VLAN_MSG_VLAN]) {
-               result = results[FM10K_MAC_VLAN_MSG_VLAN];
-
-               /* record VLAN id requested */
-               err = fm10k_tlv_attr_get_u32(result, &vid);
-               if (err)
-                       return err;
-
-               set = !(vid & FM10K_VLAN_CLEAR);
-               vid &= ~FM10K_VLAN_CLEAR;
-
-               /* if the length field has been set, this is a multi-bit
-                * update request. For multi-bit requests, simply disallow
-                * them when the pf_vid has been set. In this case, the PF
-                * should have already cleared the VLAN_TABLE, and if we
-                * allowed them, it could allow a rogue VF to receive traffic
-                * on a VLAN it was not assigned. In the single-bit case, we
-                * need to modify requests for VLAN 0 to use the default PF or
-                * SW vid when assigned.
-                */
-
-               if (vid >> 16) {
-                       /* prevent multi-bit requests when PF has
-                        * administratively set the VLAN for this VF
-                        */
-                       if (vf_info->pf_vid)
-                               return FM10K_ERR_PARAM;
-               } else {
-                       err = fm10k_iov_select_vid(vf_info, (u16)vid);
-                       if (err < 0)
-                               return err;
-
-                       vid = err;
-               }
-
-               /* update VSI info for VF in regards to VLAN table */
-               err = hw->mac.ops.update_vlan(hw, vid, vf_info->vsi, set);
-       }
-
-       if (!err && !!results[FM10K_MAC_VLAN_MSG_MAC]) {
-               result = results[FM10K_MAC_VLAN_MSG_MAC];
-
-               /* record unicast MAC address requested */
-               err = fm10k_tlv_attr_get_mac_vlan(result, mac, &vlan);
-               if (err)
-                       return err;
-
-               /* block attempts to set MAC for a locked device */
-               if (is_valid_ether_addr(vf_info->mac) &&
-                   !ether_addr_equal(mac, vf_info->mac))
-                       return FM10K_ERR_PARAM;
-
-               set = !(vlan & FM10K_VLAN_CLEAR);
-               vlan &= ~FM10K_VLAN_CLEAR;
-
-               err = fm10k_iov_select_vid(vf_info, vlan);
-               if (err < 0)
-                       return err;
-
-               vlan = (u16)err;
-
-               /* notify switch of request for new unicast address */
-               err = hw->mac.ops.update_uc_addr(hw, vf_info->glort,
-                                                mac, vlan, set, 0);
-       }
-
-       if (!err && !!results[FM10K_MAC_VLAN_MSG_MULTICAST]) {
-               result = results[FM10K_MAC_VLAN_MSG_MULTICAST];
-
-               /* record multicast MAC address requested */
-               err = fm10k_tlv_attr_get_mac_vlan(result, mac, &vlan);
-               if (err)
-                       return err;
-
-               /* verify that the VF is allowed to request multicast */
-               if (!(vf_info->vf_flags & FM10K_VF_FLAG_MULTI_ENABLED))
-                       return FM10K_ERR_PARAM;
-
-               set = !(vlan & FM10K_VLAN_CLEAR);
-               vlan &= ~FM10K_VLAN_CLEAR;
-
-               err = fm10k_iov_select_vid(vf_info, vlan);
-               if (err < 0)
-                       return err;
-
-               vlan = (u16)err;
-
-               /* notify switch of request for new multicast address */
-               err = hw->mac.ops.update_mc_addr(hw, vf_info->glort,
-                                                mac, vlan, set);
-       }
-
-       return err;
-}
-
 /**
  *  fm10k_iov_supported_xcast_mode_pf - Determine best match for xcast mode
  *  @vf_info: VF info structure containing capability flags

diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pf.h b/drivers/net/ethernet/intel/fm10k/fm10k_pf.h
index 8e814df709d2a33c2c44cd58708963064ec076d7..ad3696893cb1a550d062bdc69514e31edbcde2be 100644 (file)
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pf.h
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pf.h
@@ -99,8 +99,6 @@ extern const struct fm10k_tlv_attr fm10k_err_msg_attr[];
 
 s32 fm10k_iov_select_vid(struct fm10k_vf_info *vf_info, u16 vid);
 s32 fm10k_iov_msg_msix_pf(struct fm10k_hw *, u32 **, struct fm10k_mbx_info *);
-s32 fm10k_iov_msg_mac_vlan_pf(struct fm10k_hw *, u32 **,
-                             struct fm10k_mbx_info *);
 s32 fm10k_iov_msg_lport_state_pf(struct fm10k_hw *, u32 **,
                                 struct fm10k_mbx_info *);