mirror of
https://github.com/torvalds/linux.git
synced 2026-07-30 11:11:26 +02:00
i40e: Deadcode i40e_aq_*
i40e_aq_add_mirrorrule(), i40e_aq_delete_mirrorrule() and i40e_aq_set_vsi_vlan_promisc() were added in 2016 by commit7bd6875bef("i40e: APIs to Add/remove port mirroring rules") but haven't been used. They were the last user of i40e_mirrorrule_op(). i40e_aq_rearrange_nvm() was added in 2018 by commitf05798b4ff("i40e: Add AQ command for rearrange NVM structure") but hasn't been used. i40e_aq_restore_lldp() was added in 2019 by commitc65e78f87f("i40e: Further implementation of LLDP") but hasn't been used. Remove them. Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org> Reviewed-by: Tony Nguyen <anthony.l.nguyen@intel.com> Link: https://patch.msgid.link/20250102173717.200359-2-linux@treblig.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Dr. David Alan Gilbert
Jakub Kicinski
parent
3e5908172c
commit
59ec698d01
|
|
@ -1804,37 +1804,6 @@ int i40e_aq_set_vsi_broadcast(struct i40e_hw *hw,
|
|||
return status;
|
||||
}
|
||||
|
||||
/**
|
||||
* i40e_aq_set_vsi_vlan_promisc - control the VLAN promiscuous setting
|
||||
* @hw: pointer to the hw struct
|
||||
* @seid: vsi number
|
||||
* @enable: set MAC L2 layer unicast promiscuous enable/disable for a given VLAN
|
||||
* @cmd_details: pointer to command details structure or NULL
|
||||
**/
|
||||
int i40e_aq_set_vsi_vlan_promisc(struct i40e_hw *hw,
|
||||
u16 seid, bool enable,
|
||||
struct i40e_asq_cmd_details *cmd_details)
|
||||
{
|
||||
struct i40e_aq_desc desc;
|
||||
struct i40e_aqc_set_vsi_promiscuous_modes *cmd =
|
||||
(struct i40e_aqc_set_vsi_promiscuous_modes *)&desc.params.raw;
|
||||
u16 flags = 0;
|
||||
int status;
|
||||
|
||||
i40e_fill_default_direct_cmd_desc(&desc,
|
||||
i40e_aqc_opc_set_vsi_promiscuous_modes);
|
||||
if (enable)
|
||||
flags |= I40E_AQC_SET_VSI_PROMISC_VLAN;
|
||||
|
||||
cmd->promiscuous_flags = cpu_to_le16(flags);
|
||||
cmd->valid_flags = cpu_to_le16(I40E_AQC_SET_VSI_PROMISC_VLAN);
|
||||
cmd->seid = cpu_to_le16(seid);
|
||||
|
||||
status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
/**
|
||||
* i40e_aq_get_vsi_params - get VSI configuration info
|
||||
* @hw: pointer to the hw struct
|
||||
|
|
@ -2435,136 +2404,6 @@ i40e_aq_remove_macvlan_v2(struct i40e_hw *hw, u16 seid,
|
|||
cmd_details, true, aq_status);
|
||||
}
|
||||
|
||||
/**
|
||||
* i40e_mirrorrule_op - Internal helper function to add/delete mirror rule
|
||||
* @hw: pointer to the hw struct
|
||||
* @opcode: AQ opcode for add or delete mirror rule
|
||||
* @sw_seid: Switch SEID (to which rule refers)
|
||||
* @rule_type: Rule Type (ingress/egress/VLAN)
|
||||
* @id: Destination VSI SEID or Rule ID
|
||||
* @count: length of the list
|
||||
* @mr_list: list of mirrored VSI SEIDs or VLAN IDs
|
||||
* @cmd_details: pointer to command details structure or NULL
|
||||
* @rule_id: Rule ID returned from FW
|
||||
* @rules_used: Number of rules used in internal switch
|
||||
* @rules_free: Number of rules free in internal switch
|
||||
*
|
||||
* Add/Delete a mirror rule to a specific switch. Mirror rules are supported for
|
||||
* VEBs/VEPA elements only
|
||||
**/
|
||||
static int i40e_mirrorrule_op(struct i40e_hw *hw,
|
||||
u16 opcode, u16 sw_seid, u16 rule_type, u16 id,
|
||||
u16 count, __le16 *mr_list,
|
||||
struct i40e_asq_cmd_details *cmd_details,
|
||||
u16 *rule_id, u16 *rules_used, u16 *rules_free)
|
||||
{
|
||||
struct i40e_aq_desc desc;
|
||||
struct i40e_aqc_add_delete_mirror_rule *cmd =
|
||||
(struct i40e_aqc_add_delete_mirror_rule *)&desc.params.raw;
|
||||
struct i40e_aqc_add_delete_mirror_rule_completion *resp =
|
||||
(struct i40e_aqc_add_delete_mirror_rule_completion *)&desc.params.raw;
|
||||
u16 buf_size;
|
||||
int status;
|
||||
|
||||
buf_size = count * sizeof(*mr_list);
|
||||
|
||||
/* prep the rest of the request */
|
||||
i40e_fill_default_direct_cmd_desc(&desc, opcode);
|
||||
cmd->seid = cpu_to_le16(sw_seid);
|
||||
cmd->rule_type = cpu_to_le16(rule_type &
|
||||
I40E_AQC_MIRROR_RULE_TYPE_MASK);
|
||||
cmd->num_entries = cpu_to_le16(count);
|
||||
/* Dest VSI for add, rule_id for delete */
|
||||
cmd->destination = cpu_to_le16(id);
|
||||
if (mr_list) {
|
||||
desc.flags |= cpu_to_le16((u16)(I40E_AQ_FLAG_BUF |
|
||||
I40E_AQ_FLAG_RD));
|
||||
if (buf_size > I40E_AQ_LARGE_BUF)
|
||||
desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_LB);
|
||||
}
|
||||
|
||||
status = i40e_asq_send_command(hw, &desc, mr_list, buf_size,
|
||||
cmd_details);
|
||||
if (!status ||
|
||||
hw->aq.asq_last_status == I40E_AQ_RC_ENOSPC) {
|
||||
if (rule_id)
|
||||
*rule_id = le16_to_cpu(resp->rule_id);
|
||||
if (rules_used)
|
||||
*rules_used = le16_to_cpu(resp->mirror_rules_used);
|
||||
if (rules_free)
|
||||
*rules_free = le16_to_cpu(resp->mirror_rules_free);
|
||||
}
|
||||
return status;
|
||||
}
|
||||
|
||||
/**
|
||||
* i40e_aq_add_mirrorrule - add a mirror rule
|
||||
* @hw: pointer to the hw struct
|
||||
* @sw_seid: Switch SEID (to which rule refers)
|
||||
* @rule_type: Rule Type (ingress/egress/VLAN)
|
||||
* @dest_vsi: SEID of VSI to which packets will be mirrored
|
||||
* @count: length of the list
|
||||
* @mr_list: list of mirrored VSI SEIDs or VLAN IDs
|
||||
* @cmd_details: pointer to command details structure or NULL
|
||||
* @rule_id: Rule ID returned from FW
|
||||
* @rules_used: Number of rules used in internal switch
|
||||
* @rules_free: Number of rules free in internal switch
|
||||
*
|
||||
* Add mirror rule. Mirror rules are supported for VEBs or VEPA elements only
|
||||
**/
|
||||
int i40e_aq_add_mirrorrule(struct i40e_hw *hw, u16 sw_seid,
|
||||
u16 rule_type, u16 dest_vsi, u16 count,
|
||||
__le16 *mr_list,
|
||||
struct i40e_asq_cmd_details *cmd_details,
|
||||
u16 *rule_id, u16 *rules_used, u16 *rules_free)
|
||||
{
|
||||
if (!(rule_type == I40E_AQC_MIRROR_RULE_TYPE_ALL_INGRESS ||
|
||||
rule_type == I40E_AQC_MIRROR_RULE_TYPE_ALL_EGRESS)) {
|
||||
if (count == 0 || !mr_list)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return i40e_mirrorrule_op(hw, i40e_aqc_opc_add_mirror_rule, sw_seid,
|
||||
rule_type, dest_vsi, count, mr_list,
|
||||
cmd_details, rule_id, rules_used, rules_free);
|
||||
}
|
||||
|
||||
/**
|
||||
* i40e_aq_delete_mirrorrule - delete a mirror rule
|
||||
* @hw: pointer to the hw struct
|
||||
* @sw_seid: Switch SEID (to which rule refers)
|
||||
* @rule_type: Rule Type (ingress/egress/VLAN)
|
||||
* @count: length of the list
|
||||
* @rule_id: Rule ID that is returned in the receive desc as part of
|
||||
* add_mirrorrule.
|
||||
* @mr_list: list of mirrored VLAN IDs to be removed
|
||||
* @cmd_details: pointer to command details structure or NULL
|
||||
* @rules_used: Number of rules used in internal switch
|
||||
* @rules_free: Number of rules free in internal switch
|
||||
*
|
||||
* Delete a mirror rule. Mirror rules are supported for VEBs/VEPA elements only
|
||||
**/
|
||||
int i40e_aq_delete_mirrorrule(struct i40e_hw *hw, u16 sw_seid,
|
||||
u16 rule_type, u16 rule_id, u16 count,
|
||||
__le16 *mr_list,
|
||||
struct i40e_asq_cmd_details *cmd_details,
|
||||
u16 *rules_used, u16 *rules_free)
|
||||
{
|
||||
/* Rule ID has to be valid except rule_type: INGRESS VLAN mirroring */
|
||||
if (rule_type == I40E_AQC_MIRROR_RULE_TYPE_VLAN) {
|
||||
/* count and mr_list shall be valid for rule_type INGRESS VLAN
|
||||
* mirroring. For other rule_type, count and rule_type should
|
||||
* not matter.
|
||||
*/
|
||||
if (count == 0 || !mr_list)
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
return i40e_mirrorrule_op(hw, i40e_aqc_opc_delete_mirror_rule, sw_seid,
|
||||
rule_type, rule_id, count, mr_list,
|
||||
cmd_details, NULL, rules_used, rules_free);
|
||||
}
|
||||
|
||||
/**
|
||||
* i40e_aq_send_msg_to_vf
|
||||
* @hw: pointer to the hardware structure
|
||||
|
|
@ -3179,41 +3018,6 @@ int i40e_aq_update_nvm(struct i40e_hw *hw, u8 module_pointer,
|
|||
return status;
|
||||
}
|
||||
|
||||
/**
|
||||
* i40e_aq_rearrange_nvm
|
||||
* @hw: pointer to the hw struct
|
||||
* @rearrange_nvm: defines direction of rearrangement
|
||||
* @cmd_details: pointer to command details structure or NULL
|
||||
*
|
||||
* Rearrange NVM structure, available only for transition FW
|
||||
**/
|
||||
int i40e_aq_rearrange_nvm(struct i40e_hw *hw,
|
||||
u8 rearrange_nvm,
|
||||
struct i40e_asq_cmd_details *cmd_details)
|
||||
{
|
||||
struct i40e_aqc_nvm_update *cmd;
|
||||
struct i40e_aq_desc desc;
|
||||
int status;
|
||||
|
||||
cmd = (struct i40e_aqc_nvm_update *)&desc.params.raw;
|
||||
|
||||
i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_nvm_update);
|
||||
|
||||
rearrange_nvm &= (I40E_AQ_NVM_REARRANGE_TO_FLAT |
|
||||
I40E_AQ_NVM_REARRANGE_TO_STRUCT);
|
||||
|
||||
if (!rearrange_nvm) {
|
||||
status = -EINVAL;
|
||||
goto i40e_aq_rearrange_nvm_exit;
|
||||
}
|
||||
|
||||
cmd->command_flags |= rearrange_nvm;
|
||||
status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);
|
||||
|
||||
i40e_aq_rearrange_nvm_exit:
|
||||
return status;
|
||||
}
|
||||
|
||||
/**
|
||||
* i40e_aq_get_lldp_mib
|
||||
* @hw: pointer to the hw struct
|
||||
|
|
@ -3334,44 +3138,6 @@ int i40e_aq_cfg_lldp_mib_change_event(struct i40e_hw *hw,
|
|||
return status;
|
||||
}
|
||||
|
||||
/**
|
||||
* i40e_aq_restore_lldp
|
||||
* @hw: pointer to the hw struct
|
||||
* @setting: pointer to factory setting variable or NULL
|
||||
* @restore: True if factory settings should be restored
|
||||
* @cmd_details: pointer to command details structure or NULL
|
||||
*
|
||||
* Restore LLDP Agent factory settings if @restore set to True. In other case
|
||||
* only returns factory setting in AQ response.
|
||||
**/
|
||||
int
|
||||
i40e_aq_restore_lldp(struct i40e_hw *hw, u8 *setting, bool restore,
|
||||
struct i40e_asq_cmd_details *cmd_details)
|
||||
{
|
||||
struct i40e_aq_desc desc;
|
||||
struct i40e_aqc_lldp_restore *cmd =
|
||||
(struct i40e_aqc_lldp_restore *)&desc.params.raw;
|
||||
int status;
|
||||
|
||||
if (!test_bit(I40E_HW_CAP_FW_LLDP_PERSISTENT, hw->caps)) {
|
||||
i40e_debug(hw, I40E_DEBUG_ALL,
|
||||
"Restore LLDP not supported by current FW version.\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_lldp_restore);
|
||||
|
||||
if (restore)
|
||||
cmd->command |= I40E_AQ_LLDP_AGENT_RESTORE;
|
||||
|
||||
status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);
|
||||
|
||||
if (setting)
|
||||
*setting = cmd->command & 1;
|
||||
|
||||
return status;
|
||||
}
|
||||
|
||||
/**
|
||||
* i40e_aq_stop_lldp
|
||||
* @hw: pointer to the hw struct
|
||||
|
|
|
|||
|
|
@ -141,9 +141,6 @@ int i40e_aq_set_vsi_uc_promisc_on_vlan(struct i40e_hw *hw,
|
|||
int i40e_aq_set_vsi_bc_promisc_on_vlan(struct i40e_hw *hw,
|
||||
u16 seid, bool enable, u16 vid,
|
||||
struct i40e_asq_cmd_details *cmd_details);
|
||||
int i40e_aq_set_vsi_vlan_promisc(struct i40e_hw *hw,
|
||||
u16 seid, bool enable,
|
||||
struct i40e_asq_cmd_details *cmd_details);
|
||||
int i40e_aq_get_vsi_params(struct i40e_hw *hw,
|
||||
struct i40e_vsi_context *vsi_ctx,
|
||||
struct i40e_asq_cmd_details *cmd_details);
|
||||
|
|
@ -176,14 +173,6 @@ i40e_aq_remove_macvlan_v2(struct i40e_hw *hw, u16 seid,
|
|||
struct i40e_aqc_remove_macvlan_element_data *mv_list,
|
||||
u16 count, struct i40e_asq_cmd_details *cmd_details,
|
||||
enum i40e_admin_queue_err *aq_status);
|
||||
int i40e_aq_add_mirrorrule(struct i40e_hw *hw, u16 sw_seid,
|
||||
u16 rule_type, u16 dest_vsi, u16 count, __le16 *mr_list,
|
||||
struct i40e_asq_cmd_details *cmd_details,
|
||||
u16 *rule_id, u16 *rules_used, u16 *rules_free);
|
||||
int i40e_aq_delete_mirrorrule(struct i40e_hw *hw, u16 sw_seid,
|
||||
u16 rule_type, u16 rule_id, u16 count, __le16 *mr_list,
|
||||
struct i40e_asq_cmd_details *cmd_details,
|
||||
u16 *rules_used, u16 *rules_free);
|
||||
|
||||
int i40e_aq_send_msg_to_vf(struct i40e_hw *hw, u16 vfid,
|
||||
u32 v_opcode, u32 v_retval, u8 *msg, u16 msglen,
|
||||
|
|
@ -220,9 +209,6 @@ int i40e_aq_update_nvm(struct i40e_hw *hw, u8 module_pointer,
|
|||
u32 offset, u16 length, void *data,
|
||||
bool last_command, u8 preservation_flags,
|
||||
struct i40e_asq_cmd_details *cmd_details);
|
||||
int i40e_aq_rearrange_nvm(struct i40e_hw *hw,
|
||||
u8 rearrange_nvm,
|
||||
struct i40e_asq_cmd_details *cmd_details);
|
||||
int i40e_aq_get_lldp_mib(struct i40e_hw *hw, u8 bridge_type,
|
||||
u8 mib_type, void *buff, u16 buff_size,
|
||||
u16 *local_len, u16 *remote_len,
|
||||
|
|
@ -234,9 +220,6 @@ i40e_aq_set_lldp_mib(struct i40e_hw *hw,
|
|||
int i40e_aq_cfg_lldp_mib_change_event(struct i40e_hw *hw,
|
||||
bool enable_update,
|
||||
struct i40e_asq_cmd_details *cmd_details);
|
||||
int
|
||||
i40e_aq_restore_lldp(struct i40e_hw *hw, u8 *setting, bool restore,
|
||||
struct i40e_asq_cmd_details *cmd_details);
|
||||
int i40e_aq_stop_lldp(struct i40e_hw *hw, bool shutdown_agent,
|
||||
bool persist,
|
||||
struct i40e_asq_cmd_details *cmd_details);
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user