Skip to content

L
linux
Commit f9867df6 authored by Anirudh Venkataramanan's avatar Anirudh Venkataramanan Committed by Jeff Kirsher
Browse files
Options

ice: Fix incorrect use of abbreviations 

Capitalize abbreviations and spell out some that aren't obvious.
Reviewed-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 94c4441b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 294 additions and 294 deletions
drivers/net/ethernet/intel/ice/ice.h
View file @ f9867df6
...@@ -151,7 +151,7 @@ struct ice_tc_info { ...@@ -151,7 +151,7 @@ struct ice_tc_info {
struct ice_tc_cfg { struct ice_tc_cfg {
u8 numtc; /* Total number of enabled TCs */ u8 numtc; /* Total number of enabled TCs */
u8 ena_tc; /* TX map */ u8 ena_tc; /* Tx map */
struct ice_tc_info tc_info[ICE_MAX_TRAFFIC_CLASS]; struct ice_tc_info tc_info[ICE_MAX_TRAFFIC_CLASS];
}; };
...@@ -360,8 +360,8 @@ struct ice_pf { ...@@ -360,8 +360,8 @@ struct ice_pf {
u32 hw_oicr_idx; /* Other interrupt cause vector HW index */ u32 hw_oicr_idx; /* Other interrupt cause vector HW index */
u32 num_avail_hw_msix; /* remaining HW MSIX vectors left unclaimed */ u32 num_avail_hw_msix; /* remaining HW MSIX vectors left unclaimed */
u32 num_lan_msix; /* Total MSIX vectors for base driver */ u32 num_lan_msix; /* Total MSIX vectors for base driver */
u16 num_lan_tx; /* num lan Tx queues setup */ u16 num_lan_tx; /* num LAN Tx queues setup */
u16 num_lan_rx; /* num lan Rx queues setup */ u16 num_lan_rx; /* num LAN Rx queues setup */
u16 q_left_tx; /* remaining num Tx queues left unclaimed */ u16 q_left_tx; /* remaining num Tx queues left unclaimed */
u16 q_left_rx; /* remaining num Rx queues left unclaimed */ u16 q_left_rx; /* remaining num Rx queues left unclaimed */
u16 next_vsi; /* Next free slot in pf->vsi[] - 0-based! */ u16 next_vsi; /* Next free slot in pf->vsi[] - 0-based! */
...@@ -387,8 +387,8 @@ struct ice_netdev_priv { ...@@ -387,8 +387,8 @@ struct ice_netdev_priv {
/** /**
* ice_irq_dynamic_ena - Enable default interrupt generation settings * ice_irq_dynamic_ena - Enable default interrupt generation settings
* @hw: pointer to hw struct * @hw: pointer to HW struct
* @vsi: pointer to vsi struct, can be NULL * @vsi: pointer to VSI struct, can be NULL
* @q_vector: pointer to q_vector, can be NULL * @q_vector: pointer to q_vector, can be NULL
*/ */
static inline void static inline void
......
drivers/net/ethernet/intel/ice/ice_adminq_cmd.h
View file @ f9867df6
...@@ -62,7 +62,7 @@ struct ice_aqc_req_res { ...@@ -62,7 +62,7 @@ struct ice_aqc_req_res {
#define ICE_AQ_RES_NVM_WRITE_DFLT_TIMEOUT_MS 180000 #define ICE_AQ_RES_NVM_WRITE_DFLT_TIMEOUT_MS 180000
#define ICE_AQ_RES_CHNG_LOCK_DFLT_TIMEOUT_MS 1000 #define ICE_AQ_RES_CHNG_LOCK_DFLT_TIMEOUT_MS 1000
#define ICE_AQ_RES_GLBL_LOCK_DFLT_TIMEOUT_MS 3000 #define ICE_AQ_RES_GLBL_LOCK_DFLT_TIMEOUT_MS 3000
/* For SDP: pin id of the SDP */ /* For SDP: pin ID of the SDP */
__le32 res_number; __le32 res_number;
/* Status is only used for ICE_AQC_RES_ID_GLBL_LOCK */ /* Status is only used for ICE_AQC_RES_ID_GLBL_LOCK */
__le16 status; __le16 status;
...@@ -1024,7 +1024,7 @@ struct ice_aqc_get_link_status_data { ...@@ -1024,7 +1024,7 @@ struct ice_aqc_get_link_status_data {
u8 ext_info; u8 ext_info;
#define ICE_AQ_LINK_PHY_TEMP_ALARM BIT(0) #define ICE_AQ_LINK_PHY_TEMP_ALARM BIT(0)
#define ICE_AQ_LINK_EXCESSIVE_ERRORS BIT(1) /* Excessive Link Errors */ #define ICE_AQ_LINK_EXCESSIVE_ERRORS BIT(1) /* Excessive Link Errors */
/* Port TX Suspended */ /* Port Tx Suspended */
#define ICE_AQ_LINK_TX_S 2 #define ICE_AQ_LINK_TX_S 2
#define ICE_AQ_LINK_TX_M (0x03 << ICE_AQ_LINK_TX_S) #define ICE_AQ_LINK_TX_M (0x03 << ICE_AQ_LINK_TX_S)
#define ICE_AQ_LINK_TX_ACTIVE 0 #define ICE_AQ_LINK_TX_ACTIVE 0
...@@ -1120,9 +1120,9 @@ struct ice_aqc_nvm { ...@@ -1120,9 +1120,9 @@ struct ice_aqc_nvm {
}; };
/** /**
* Send to PF command (indirect 0x0801) id is only used by PF * Send to PF command (indirect 0x0801) ID is only used by PF
* *
* Send to VF command (indirect 0x0802) id is only used by PF * Send to VF command (indirect 0x0802) ID is only used by PF
* *
*/ */
struct ice_aqc_pf_vf_msg { struct ice_aqc_pf_vf_msg {
...@@ -1186,7 +1186,7 @@ struct ice_aqc_get_set_rss_lut { ...@@ -1186,7 +1186,7 @@ struct ice_aqc_get_set_rss_lut {
__le32 addr_low; __le32 addr_low;
}; };
/* Add TX LAN Queues (indirect 0x0C30) */ /* Add Tx LAN Queues (indirect 0x0C30) */
struct ice_aqc_add_txqs { struct ice_aqc_add_txqs {
u8 num_qgrps; u8 num_qgrps;
u8 reserved[3]; u8 reserved[3];
...@@ -1195,7 +1195,7 @@ struct ice_aqc_add_txqs { ...@@ -1195,7 +1195,7 @@ struct ice_aqc_add_txqs {
__le32 addr_low; __le32 addr_low;
}; };
/* This is the descriptor of each queue entry for the Add TX LAN Queues /* This is the descriptor of each queue entry for the Add Tx LAN Queues
* command (0x0C30). Only used within struct ice_aqc_add_tx_qgrp. * command (0x0C30). Only used within struct ice_aqc_add_tx_qgrp.
*/ */
struct ice_aqc_add_txqs_perq { struct ice_aqc_add_txqs_perq {
...@@ -1207,7 +1207,7 @@ struct ice_aqc_add_txqs_perq { ...@@ -1207,7 +1207,7 @@ struct ice_aqc_add_txqs_perq {
struct ice_aqc_txsched_elem info; struct ice_aqc_txsched_elem info;
}; };
/* The format of the command buffer for Add TX LAN Queues (0x0C30) /* The format of the command buffer for Add Tx LAN Queues (0x0C30)
* is an array of the following structs. Please note that the length of * is an array of the following structs. Please note that the length of
* each struct ice_aqc_add_tx_qgrp is variable due * each struct ice_aqc_add_tx_qgrp is variable due
* to the variable number of queues in each group! * to the variable number of queues in each group!
...@@ -1219,7 +1219,7 @@ struct ice_aqc_add_tx_qgrp { ...@@ -1219,7 +1219,7 @@ struct ice_aqc_add_tx_qgrp {
struct ice_aqc_add_txqs_perq txqs[1]; struct ice_aqc_add_txqs_perq txqs[1];
}; };
/* Disable TX LAN Queues (indirect 0x0C31) */ /* Disable Tx LAN Queues (indirect 0x0C31) */
struct ice_aqc_dis_txqs { struct ice_aqc_dis_txqs {
u8 cmd_type; u8 cmd_type;
#define ICE_AQC_Q_DIS_CMD_S 0 #define ICE_AQC_Q_DIS_CMD_S 0
...@@ -1241,7 +1241,7 @@ struct ice_aqc_dis_txqs { ...@@ -1241,7 +1241,7 @@ struct ice_aqc_dis_txqs {
__le32 addr_low; __le32 addr_low;
}; };
/* The buffer for Disable TX LAN Queues (indirect 0x0C31) /* The buffer for Disable Tx LAN Queues (indirect 0x0C31)
* contains the following structures, arrayed one after the * contains the following structures, arrayed one after the
* other. * other.
* Note: Since the q_id is 16 bits wide, if the * Note: Since the q_id is 16 bits wide, if the
...@@ -1498,7 +1498,7 @@ enum ice_adminq_opc { ...@@ -1498,7 +1498,7 @@ enum ice_adminq_opc {
ice_aqc_opc_get_rss_key = 0x0B04, ice_aqc_opc_get_rss_key = 0x0B04,
ice_aqc_opc_get_rss_lut = 0x0B05, ice_aqc_opc_get_rss_lut = 0x0B05,
/* TX queue handling commands/events */ /* Tx queue handling commands/events */
ice_aqc_opc_add_txqs = 0x0C30, ice_aqc_opc_add_txqs = 0x0C30,
ice_aqc_opc_dis_txqs = 0x0C31, ice_aqc_opc_dis_txqs = 0x0C31,
......
drivers/net/ethernet/intel/ice/ice_common.c
View file @ f9867df6
This diff is collapsed.
drivers/net/ethernet/intel/ice/ice_controlq.c
View file @ f9867df6
...@@ -51,7 +51,7 @@ static void ice_mailbox_init_regs(struct ice_hw *hw) ...@@ -51,7 +51,7 @@ static void ice_mailbox_init_regs(struct ice_hw *hw)
/** /**
* ice_check_sq_alive * ice_check_sq_alive
* @hw: pointer to the hw struct * @hw: pointer to the HW struct
* @cq: pointer to the specific Control queue * @cq: pointer to the specific Control queue
* *
* Returns true if Queue is enabled else false. * Returns true if Queue is enabled else false.
...@@ -287,7 +287,7 @@ ice_cfg_sq_regs(struct ice_hw *hw, struct ice_ctl_q_info *cq) ...@@ -287,7 +287,7 @@ ice_cfg_sq_regs(struct ice_hw *hw, struct ice_ctl_q_info *cq)
* @hw: pointer to the hardware structure * @hw: pointer to the hardware structure
* @cq: pointer to the specific Control queue * @cq: pointer to the specific Control queue
* *
* Configure base address and length registers for the receive (event q) * Configure base address and length registers for the receive (event queue)
*/ */
static enum ice_status static enum ice_status
ice_cfg_rq_regs(struct ice_hw *hw, struct ice_ctl_q_info *cq) ice_cfg_rq_regs(struct ice_hw *hw, struct ice_ctl_q_info *cq)
...@@ -751,7 +751,7 @@ static u16 ice_clean_sq(struct ice_hw *hw, struct ice_ctl_q_info *cq) ...@@ -751,7 +751,7 @@ static u16 ice_clean_sq(struct ice_hw *hw, struct ice_ctl_q_info *cq)
/** /**
* ice_sq_done - check if FW has processed the Admin Send Queue (ATQ) * ice_sq_done - check if FW has processed the Admin Send Queue (ATQ)
* @hw: pointer to the hw struct * @hw: pointer to the HW struct
* @cq: pointer to the specific Control queue * @cq: pointer to the specific Control queue
* *
* Returns true if the firmware has processed all descriptors on the * Returns true if the firmware has processed all descriptors on the
...@@ -767,7 +767,7 @@ static bool ice_sq_done(struct ice_hw *hw, struct ice_ctl_q_info *cq) ...@@ -767,7 +767,7 @@ static bool ice_sq_done(struct ice_hw *hw, struct ice_ctl_q_info *cq)
/** /**
* ice_sq_send_cmd - send command to Control Queue (ATQ) * ice_sq_send_cmd - send command to Control Queue (ATQ)
* @hw: pointer to the hw struct * @hw: pointer to the HW struct
* @cq: pointer to the specific Control queue * @cq: pointer to the specific Control queue
* @desc: prefilled descriptor describing the command (non DMA mem) * @desc: prefilled descriptor describing the command (non DMA mem)
* @buf: buffer to use for indirect commands (or NULL for direct commands) * @buf: buffer to use for indirect commands (or NULL for direct commands)
...@@ -962,7 +962,7 @@ void ice_fill_dflt_direct_cmd_desc(struct ice_aq_desc *desc, u16 opcode) ...@@ -962,7 +962,7 @@ void ice_fill_dflt_direct_cmd_desc(struct ice_aq_desc *desc, u16 opcode)
/** /**
* ice_clean_rq_elem * ice_clean_rq_elem
* @hw: pointer to the hw struct * @hw: pointer to the HW struct
* @cq: pointer to the specific Control queue * @cq: pointer to the specific Control queue
* @e: event info from the receive descriptor, includes any buffers * @e: event info from the receive descriptor, includes any buffers
* @pending: number of events that could be left to process * @pending: number of events that could be left to process
......
drivers/net/ethernet/intel/ice/ice_ethtool.c
View file @ f9867df6
...@@ -811,7 +811,7 @@ ice_get_settings_link_up(struct ethtool_link_ksettings *ks, ...@@ -811,7 +811,7 @@ ice_get_settings_link_up(struct ethtool_link_ksettings *ks,
link_info = &vsi->port_info->phy.link_info; link_info = &vsi->port_info->phy.link_info;
/* Initialize supported and advertised settings based on phy settings */ /* Initialize supported and advertised settings based on PHY settings */
switch (link_info->phy_type_low) { switch (link_info->phy_type_low) {
case ICE_PHY_TYPE_LOW_100BASE_TX: case ICE_PHY_TYPE_LOW_100BASE_TX:
ethtool_link_ksettings_add_link_mode(ks, supported, Autoneg); ethtool_link_ksettings_add_link_mode(ks, supported, Autoneg);
...@@ -1140,7 +1140,7 @@ ice_get_settings_link_down(struct ethtool_link_ksettings *ks, ...@@ -1140,7 +1140,7 @@ ice_get_settings_link_down(struct ethtool_link_ksettings *ks,
struct net_device __always_unused *netdev) struct net_device __always_unused *netdev)
{ {
/* link is down and the driver needs to fall back on /* link is down and the driver needs to fall back on
* supported phy types to figure out what info to display * supported PHY types to figure out what info to display
*/ */
ice_phy_type_to_ethtool(netdev, ks); ice_phy_type_to_ethtool(netdev, ks);
...@@ -1350,7 +1350,7 @@ ice_setup_autoneg(struct ice_port_info *p, struct ethtool_link_ksettings *ks, ...@@ -1350,7 +1350,7 @@ ice_setup_autoneg(struct ice_port_info *p, struct ethtool_link_ksettings *ks,
} else { } else {
/* If autoneg is currently enabled */ /* If autoneg is currently enabled */
if (p->phy.link_info.an_info & ICE_AQ_AN_COMPLETED) { if (p->phy.link_info.an_info & ICE_AQ_AN_COMPLETED) {
/* If autoneg is supported 10GBASE_T is the only phy /* If autoneg is supported 10GBASE_T is the only PHY
* that can disable it, so otherwise return error * that can disable it, so otherwise return error
*/ */
if (ethtool_link_ksettings_test_link_mode(ks, if (ethtool_link_ksettings_test_link_mode(ks,
...@@ -1400,7 +1400,7 @@ ice_set_link_ksettings(struct net_device *netdev, ...@@ -1400,7 +1400,7 @@ ice_set_link_ksettings(struct net_device *netdev,
if (!p) if (!p)
return -EOPNOTSUPP; return -EOPNOTSUPP;
/* Check if this is lan vsi */ /* Check if this is LAN VSI */
ice_for_each_vsi(pf, idx) ice_for_each_vsi(pf, idx)
if (pf->vsi[idx]->type == ICE_VSI_PF) { if (pf->vsi[idx]->type == ICE_VSI_PF) {
if (np->vsi != pf->vsi[idx]) if (np->vsi != pf->vsi[idx])
...@@ -1464,7 +1464,7 @@ ice_set_link_ksettings(struct net_device *netdev, ...@@ -1464,7 +1464,7 @@ ice_set_link_ksettings(struct net_device *netdev,
if (!abilities) if (!abilities)
return -ENOMEM; return -ENOMEM;
/* Get the current phy config */ /* Get the current PHY config */
status = ice_aq_get_phy_caps(p, false, ICE_AQC_REPORT_SW_CFG, abilities, status = ice_aq_get_phy_caps(p, false, ICE_AQC_REPORT_SW_CFG, abilities,
NULL); NULL);
if (status) { if (status) {
...@@ -1559,7 +1559,7 @@ ice_set_link_ksettings(struct net_device *netdev, ...@@ -1559,7 +1559,7 @@ ice_set_link_ksettings(struct net_device *netdev,
} }
/** /**
* ice_get_rxnfc - command to get RX flow classification rules * ice_get_rxnfc - command to get Rx flow classification rules
* @netdev: network interface device structure * @netdev: network interface device structure
* @cmd: ethtool rxnfc command * @cmd: ethtool rxnfc command
* @rule_locs: buffer to rturn Rx flow classification rules * @rule_locs: buffer to rturn Rx flow classification rules
...@@ -1833,7 +1833,7 @@ ice_get_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause) ...@@ -1833,7 +1833,7 @@ ice_get_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause)
if (!pcaps) if (!pcaps)
return; return;
/* Get current phy config */ /* Get current PHY config */
status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_SW_CFG, pcaps, status = ice_aq_get_phy_caps(pi, false, ICE_AQC_REPORT_SW_CFG, pcaps,
NULL); NULL);
if (status) if (status)
...@@ -2022,7 +2022,7 @@ ice_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key, u8 *hfunc) ...@@ -2022,7 +2022,7 @@ ice_get_rxfh(struct net_device *netdev, u32 *indir, u8 *key, u8 *hfunc)
* @key: hash key * @key: hash key
* @hfunc: hash function * @hfunc: hash function
* *
* Returns -EINVAL if the table specifies an invalid queue id, otherwise * Returns -EINVAL if the table specifies an invalid queue ID, otherwise
* returns 0 after programming the table. * returns 0 after programming the table.
*/ */
static int static int
...@@ -2089,7 +2089,7 @@ enum ice_container_type { ...@@ -2089,7 +2089,7 @@ enum ice_container_type {
/** /**
* ice_get_rc_coalesce - get ITR values for specific ring container * ice_get_rc_coalesce - get ITR values for specific ring container
* @ec: ethtool structure to fill with driver's coalesce settings * @ec: ethtool structure to fill with driver's coalesce settings
* @c_type: container type, RX or TX * @c_type: container type, Rx or Tx
* @rc: ring container that the ITR values will come from * @rc: ring container that the ITR values will come from
* *
* Query the device for ice_ring_container specific ITR values. This is * Query the device for ice_ring_container specific ITR values. This is
...@@ -2191,7 +2191,7 @@ ice_get_per_q_coalesce(struct net_device *netdev, u32 q_num, ...@@ -2191,7 +2191,7 @@ ice_get_per_q_coalesce(struct net_device *netdev, u32 q_num,
/** /**
* ice_set_rc_coalesce - set ITR values for specific ring container * ice_set_rc_coalesce - set ITR values for specific ring container
* @c_type: container type, RX or TX * @c_type: container type, Rx or Tx
* @ec: ethtool structure from user to update ITR settings * @ec: ethtool structure from user to update ITR settings
* @rc: ring container that the ITR values will come from * @rc: ring container that the ITR values will come from
* @vsi: VSI associated to the ring container * @vsi: VSI associated to the ring container
......
drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h
View file @ f9867df6
...@@ -20,7 +20,7 @@ union ice_32byte_rx_desc { ...@@ -20,7 +20,7 @@ union ice_32byte_rx_desc {
} lo_dword; } lo_dword;
union { union {
__le32 rss; /* RSS Hash */ __le32 rss; /* RSS Hash */
__le32 fd_id; /* Flow Director filter id */ __le32 fd_id; /* Flow Director filter ID */
} hi_dword; } hi_dword;
} qword0; } qword0;
struct { struct {
...@@ -99,7 +99,7 @@ enum ice_rx_ptype_payload_layer { ...@@ -99,7 +99,7 @@ enum ice_rx_ptype_payload_layer {
ICE_RX_PTYPE_PAYLOAD_LAYER_PAY4 = 3, ICE_RX_PTYPE_PAYLOAD_LAYER_PAY4 = 3,
}; };
/* RX Flex Descriptor /* Rx Flex Descriptor
* This descriptor is used instead of the legacy version descriptor when * This descriptor is used instead of the legacy version descriptor when
* ice_rlan_ctx.adv_desc is set * ice_rlan_ctx.adv_desc is set
*/ */
...@@ -113,7 +113,7 @@ union ice_32b_rx_flex_desc { ...@@ -113,7 +113,7 @@ union ice_32b_rx_flex_desc {
} read; } read;
struct { struct {
/* Qword 0 */ /* Qword 0 */
u8 rxdid; /* descriptor builder profile id */ u8 rxdid; /* descriptor builder profile ID */
u8 mir_id_umb_cast; /* mirror=[5:0], umb=[7:6] */ u8 mir_id_umb_cast; /* mirror=[5:0], umb=[7:6] */
__le16 ptype_flex_flags0; /* ptype=[9:0], ff0=[15:10] */ __le16 ptype_flex_flags0; /* ptype=[9:0], ff0=[15:10] */
__le16 pkt_len; /* [15:14] are reserved */ __le16 pkt_len; /* [15:14] are reserved */
...@@ -149,7 +149,7 @@ union ice_32b_rx_flex_desc { ...@@ -149,7 +149,7 @@ union ice_32b_rx_flex_desc {
/* Rx Flex Descriptor NIC Profile /* Rx Flex Descriptor NIC Profile
* This descriptor corresponds to RxDID 2 which contains * This descriptor corresponds to RxDID 2 which contains
* metadata fields for RSS, flow id and timestamp info * metadata fields for RSS, flow ID and timestamp info
*/ */
struct ice_32b_rx_flex_desc_nic { struct ice_32b_rx_flex_desc_nic {
/* Qword 0 */ /* Qword 0 */
...@@ -208,7 +208,7 @@ enum ice_flex_rx_mdid { ...@@ -208,7 +208,7 @@ enum ice_flex_rx_mdid {
ICE_RX_MDID_HASH_HIGH, ICE_RX_MDID_HASH_HIGH,
}; };
/* RX/TX Flag64 packet flag bits */ /* Rx/Tx Flag64 packet flag bits */
enum ice_flg64_bits { enum ice_flg64_bits {
ICE_FLG_PKT_DSI = 0, ICE_FLG_PKT_DSI = 0,
ICE_FLG_EVLAN_x8100 = 15, ICE_FLG_EVLAN_x8100 = 15,
...@@ -322,7 +322,7 @@ enum ice_rlan_ctx_rx_hsplit_1 { ...@@ -322,7 +322,7 @@ enum ice_rlan_ctx_rx_hsplit_1 {
ICE_RLAN_RX_HSPLIT_1_SPLIT_ALWAYS = 2, ICE_RLAN_RX_HSPLIT_1_SPLIT_ALWAYS = 2,
}; };
/* TX Descriptor */ /* Tx Descriptor */
struct ice_tx_desc { struct ice_tx_desc {
__le64 buf_addr; /* Address of descriptor's data buf */ __le64 buf_addr; /* Address of descriptor's data buf */
__le64 cmd_type_offset_bsz; __le64 cmd_type_offset_bsz;
......
drivers/net/ethernet/intel/ice/ice_lib.c
View file @ f9867df6
...@@ -73,7 +73,7 @@ static int ice_setup_rx_ctx(struct ice_ring *ring) ...@@ -73,7 +73,7 @@ static int ice_setup_rx_ctx(struct ice_ring *ring)
regval |= (rxdid << QRXFLXP_CNTXT_RXDID_IDX_S) & regval |= (rxdid << QRXFLXP_CNTXT_RXDID_IDX_S) &
QRXFLXP_CNTXT_RXDID_IDX_M; QRXFLXP_CNTXT_RXDID_IDX_M;
/* increasing context priority to pick up profile id; /* increasing context priority to pick up profile ID;
* default is 0x01; setting to 0x03 to ensure profile * default is 0x01; setting to 0x03 to ensure profile
* is programming if prev context is of same priority * is programming if prev context is of same priority
*/ */
...@@ -138,7 +138,7 @@ ice_setup_tx_ctx(struct ice_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q) ...@@ -138,7 +138,7 @@ ice_setup_tx_ctx(struct ice_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf_q)
tlan_ctx->vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_PF; tlan_ctx->vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_PF;
break; break;
case ICE_VSI_VF: case ICE_VSI_VF:
/* Firmware expects vmvf_num to be absolute VF id */ /* Firmware expects vmvf_num to be absolute VF ID */
tlan_ctx->vmvf_num = hw->func_caps.vf_base_id + vsi->vf_id; tlan_ctx->vmvf_num = hw->func_caps.vf_base_id + vsi->vf_id;
tlan_ctx->vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_VF; tlan_ctx->vmvf_type = ICE_TLAN_CTX_VMVF_TYPE_VF;
break; break;
...@@ -297,7 +297,7 @@ static void ice_vsi_set_num_desc(struct ice_vsi *vsi) ...@@ -297,7 +297,7 @@ static void ice_vsi_set_num_desc(struct ice_vsi *vsi)
/** /**
* ice_vsi_set_num_qs - Set number of queues, descriptors and vectors for a VSI * ice_vsi_set_num_qs - Set number of queues, descriptors and vectors for a VSI
* @vsi: the VSI being configured * @vsi: the VSI being configured
* @vf_id: Id of the VF being configured * @vf_id: ID of the VF being configured
* *
* Return 0 on success and a negative value on error * Return 0 on success and a negative value on error
*/ */
...@@ -479,7 +479,7 @@ static irqreturn_t ice_msix_clean_rings(int __always_unused irq, void *data) ...@@ -479,7 +479,7 @@ static irqreturn_t ice_msix_clean_rings(int __always_unused irq, void *data)
* ice_vsi_alloc - Allocates the next available struct VSI in the PF * ice_vsi_alloc - Allocates the next available struct VSI in the PF
* @pf: board private structure * @pf: board private structure
* @type: type of VSI * @type: type of VSI
* @vf_id: Id of the VF being configured * @vf_id: ID of the VF being configured
* *
* returns a pointer to a VSI on success, NULL on failure. * returns a pointer to a VSI on success, NULL on failure.
*/ */
...@@ -1445,12 +1445,12 @@ static int ice_vsi_cfg_rss_lut_key(struct ice_vsi *vsi) ...@@ -1445,12 +1445,12 @@ static int ice_vsi_cfg_rss_lut_key(struct ice_vsi *vsi)
} }
/** /**
* ice_add_mac_to_list - Add a mac address filter entry to the list * ice_add_mac_to_list - Add a MAC address filter entry to the list
* @vsi: the VSI to be forwarded to * @vsi: the VSI to be forwarded to
* @add_list: pointer to the list which contains MAC filter entries * @add_list: pointer to the list which contains MAC filter entries
* @macaddr: the MAC address to be added. * @macaddr: the MAC address to be added.
* *
* Adds mac address filter entry to the temp list * Adds MAC address filter entry to the temp list
* *
* Returns 0 on success or ENOMEM on failure. * Returns 0 on success or ENOMEM on failure.
*/ */
...@@ -1552,7 +1552,7 @@ void ice_free_fltr_list(struct device *dev, struct list_head *h) ...@@ -1552,7 +1552,7 @@ void ice_free_fltr_list(struct device *dev, struct list_head *h)
/** /**
* ice_vsi_add_vlan - Add VSI membership for given VLAN * ice_vsi_add_vlan - Add VSI membership for given VLAN
* @vsi: the VSI being configured * @vsi: the VSI being configured
* @vid: VLAN id to be added * @vid: VLAN ID to be added
*/ */
int ice_vsi_add_vlan(struct ice_vsi *vsi, u16 vid) int ice_vsi_add_vlan(struct ice_vsi *vsi, u16 vid)
{ {
...@@ -1590,7 +1590,7 @@ int ice_vsi_add_vlan(struct ice_vsi *vsi, u16 vid) ...@@ -1590,7 +1590,7 @@ int ice_vsi_add_vlan(struct ice_vsi *vsi, u16 vid)
/** /**
* ice_vsi_kill_vlan - Remove VSI membership for a given VLAN * ice_vsi_kill_vlan - Remove VSI membership for a given VLAN
* @vsi: the VSI being configured * @vsi: the VSI being configured
* @vid: VLAN id to be removed * @vid: VLAN ID to be removed
* *
* Returns 0 on success and negative on failure * Returns 0 on success and negative on failure
*/ */
...@@ -2016,7 +2016,7 @@ int ice_vsi_stop_rx_rings(struct ice_vsi *vsi) ...@@ -2016,7 +2016,7 @@ int ice_vsi_stop_rx_rings(struct ice_vsi *vsi)
* ice_vsi_stop_tx_rings - Disable Tx rings * ice_vsi_stop_tx_rings - Disable Tx rings
* @vsi: the VSI being configured * @vsi: the VSI being configured
* @rst_src: reset source * @rst_src: reset source
* @rel_vmvf_num: Relative id of VF/VM * @rel_vmvf_num: Relative ID of VF/VM
* @rings: Tx ring array to be stopped * @rings: Tx ring array to be stopped
* @offset: offset within vsi->txq_map * @offset: offset within vsi->txq_map
*/ */
...@@ -2102,7 +2102,7 @@ ice_vsi_stop_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src, ...@@ -2102,7 +2102,7 @@ ice_vsi_stop_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,
* ice_vsi_stop_lan_tx_rings - Disable LAN Tx rings * ice_vsi_stop_lan_tx_rings - Disable LAN Tx rings
* @vsi: the VSI being configured * @vsi: the VSI being configured
* @rst_src: reset source * @rst_src: reset source
* @rel_vmvf_num: Relative id of VF/VM * @rel_vmvf_num: Relative ID of VF/VM
*/ */
int int
ice_vsi_stop_lan_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src, ice_vsi_stop_lan_tx_rings(struct ice_vsi *vsi, enum ice_disq_rst_src rst_src,
...@@ -2177,7 +2177,7 @@ int ice_cfg_vlan_pruning(struct ice_vsi *vsi, bool ena, bool vlan_promisc) ...@@ -2177,7 +2177,7 @@ int ice_cfg_vlan_pruning(struct ice_vsi *vsi, bool ena, bool vlan_promisc)
* @pf: board private structure * @pf: board private structure
* @pi: pointer to the port_info instance * @pi: pointer to the port_info instance
* @type: VSI type * @type: VSI type
* @vf_id: defines VF id to which this VSI connects. This field is meant to be * @vf_id: defines VF ID to which this VSI connects. This field is meant to be
* used only for ICE_VSI_VF VSI type. For other VSI types, should * used only for ICE_VSI_VF VSI type. For other VSI types, should
* fill-in ICE_INVAL_VFID as input. * fill-in ICE_INVAL_VFID as input.
* *
...@@ -2219,7 +2219,7 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi, ...@@ -2219,7 +2219,7 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,
/* set RSS capabilities */ /* set RSS capabilities */
ice_vsi_set_rss_params(vsi); ice_vsi_set_rss_params(vsi);
/* set tc configuration */ /* set TC configuration */
ice_vsi_set_tc_cfg(vsi); ice_vsi_set_tc_cfg(vsi);
/* create the VSI */ /* create the VSI */
......
drivers/net/ethernet/intel/ice/ice_main.c
View file @ f9867df6
...@@ -113,14 +113,14 @@ static void ice_check_for_hang_subtask(struct ice_pf *pf) ...@@ -113,14 +113,14 @@ static void ice_check_for_hang_subtask(struct ice_pf *pf)
} }
/** /**
* ice_add_mac_to_sync_list - creates list of mac addresses to be synced * ice_add_mac_to_sync_list - creates list of MAC addresses to be synced
* @netdev: the net device on which the sync is happening * @netdev: the net device on which the sync is happening
* @addr: mac address to sync * @addr: MAC address to sync
* *
* This is a callback function which is called by the in kernel device sync * This is a callback function which is called by the in kernel device sync
* functions (like __dev_uc_sync, __dev_mc_sync, etc). This function only * functions (like __dev_uc_sync, __dev_mc_sync, etc). This function only
* populates the tmp_sync_list, which is later used by ice_add_mac to add the * populates the tmp_sync_list, which is later used by ice_add_mac to add the
* mac filters from the hardware. * MAC filters from the hardware.
*/ */
static int ice_add_mac_to_sync_list(struct net_device *netdev, const u8 *addr) static int ice_add_mac_to_sync_list(struct net_device *netdev, const u8 *addr)
{ {
...@@ -134,14 +134,14 @@ static int ice_add_mac_to_sync_list(struct net_device *netdev, const u8 *addr) ...@@ -134,14 +134,14 @@ static int ice_add_mac_to_sync_list(struct net_device *netdev, const u8 *addr)
} }
/** /**
* ice_add_mac_to_unsync_list - creates list of mac addresses to be unsynced * ice_add_mac_to_unsync_list - creates list of MAC addresses to be unsynced
* @netdev: the net device on which the unsync is happening * @netdev: the net device on which the unsync is happening
* @addr: mac address to unsync * @addr: MAC address to unsync
* *
* This is a callback function which is called by the in kernel device unsync * This is a callback function which is called by the in kernel device unsync
* functions (like __dev_uc_unsync, __dev_mc_unsync, etc). This function only * functions (like __dev_uc_unsync, __dev_mc_unsync, etc). This function only
* populates the tmp_unsync_list, which is later used by ice_remove_mac to * populates the tmp_unsync_list, which is later used by ice_remove_mac to
* delete the mac filters from the hardware. * delete the MAC filters from the hardware.
*/ */
static int ice_add_mac_to_unsync_list(struct net_device *netdev, const u8 *addr) static int ice_add_mac_to_unsync_list(struct net_device *netdev, const u8 *addr)
{ {
...@@ -245,7 +245,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi) ...@@ -245,7 +245,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)
netif_addr_unlock_bh(netdev); netif_addr_unlock_bh(netdev);
} }
/* Remove mac addresses in the unsync list */ /* Remove MAC addresses in the unsync list */
status = ice_remove_mac(hw, &vsi->tmp_unsync_list); status = ice_remove_mac(hw, &vsi->tmp_unsync_list);
ice_free_fltr_list(dev, &vsi->tmp_unsync_list); ice_free_fltr_list(dev, &vsi->tmp_unsync_list);
if (status) { if (status) {
...@@ -257,7 +257,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi) ...@@ -257,7 +257,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)
} }
} }
/* Add mac addresses in the sync list */ /* Add MAC addresses in the sync list */
status = ice_add_mac(hw, &vsi->tmp_sync_list); status = ice_add_mac(hw, &vsi->tmp_sync_list);
ice_free_fltr_list(dev, &vsi->tmp_sync_list); ice_free_fltr_list(dev, &vsi->tmp_sync_list);
/* If filter is added successfully or already exists, do not go into /* If filter is added successfully or already exists, do not go into
...@@ -266,7 +266,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi) ...@@ -266,7 +266,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)
*/ */
if (status && status != ICE_ERR_ALREADY_EXISTS) { if (status && status != ICE_ERR_ALREADY_EXISTS) {
netdev_err(netdev, "Failed to add MAC filters\n"); netdev_err(netdev, "Failed to add MAC filters\n");
/* If there is no more space for new umac filters, vsi /* If there is no more space for new umac filters, VSI
* should go into promiscuous mode. There should be some * should go into promiscuous mode. There should be some
* space reserved for promiscuous filters. * space reserved for promiscuous filters.
*/ */
...@@ -317,7 +317,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi) ...@@ -317,7 +317,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)
test_bit(ICE_VSI_FLAG_PROMISC_CHANGED, vsi->flags)) { test_bit(ICE_VSI_FLAG_PROMISC_CHANGED, vsi->flags)) {
clear_bit(ICE_VSI_FLAG_PROMISC_CHANGED, vsi->flags); clear_bit(ICE_VSI_FLAG_PROMISC_CHANGED, vsi->flags);
if (vsi->current_netdev_flags & IFF_PROMISC) { if (vsi->current_netdev_flags & IFF_PROMISC) {
/* Apply TX filter rule to get traffic from VMs */ /* Apply Tx filter rule to get traffic from VMs */
status = ice_cfg_dflt_vsi(hw, vsi->idx, true, status = ice_cfg_dflt_vsi(hw, vsi->idx, true,
ICE_FLTR_TX); ICE_FLTR_TX);
if (status) { if (status) {
...@@ -327,7 +327,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi) ...@@ -327,7 +327,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)
err = -EIO; err = -EIO;
goto out_promisc; goto out_promisc;
} }
/* Apply RX filter rule to get traffic from wire */ /* Apply Rx filter rule to get traffic from wire */
status = ice_cfg_dflt_vsi(hw, vsi->idx, true, status = ice_cfg_dflt_vsi(hw, vsi->idx, true,
ICE_FLTR_RX); ICE_FLTR_RX);
if (status) { if (status) {
...@@ -338,7 +338,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi) ...@@ -338,7 +338,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)
goto out_promisc; goto out_promisc;
} }
} else { } else {
/* Clear TX filter rule to stop traffic from VMs */ /* Clear Tx filter rule to stop traffic from VMs */
status = ice_cfg_dflt_vsi(hw, vsi->idx, false, status = ice_cfg_dflt_vsi(hw, vsi->idx, false,
ICE_FLTR_TX); ICE_FLTR_TX);
if (status) { if (status) {
...@@ -348,7 +348,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi) ...@@ -348,7 +348,7 @@ static int ice_vsi_sync_fltr(struct ice_vsi *vsi)
err = -EIO; err = -EIO;
goto out_promisc; goto out_promisc;
} }
/* Clear RX filter to remove traffic from wire */ /* Clear Rx filter to remove traffic from wire */
status = ice_cfg_dflt_vsi(hw, vsi->idx, false, status = ice_cfg_dflt_vsi(hw, vsi->idx, false,
ICE_FLTR_RX); ICE_FLTR_RX);
if (status) { if (status) {
...@@ -608,9 +608,9 @@ void ice_print_link_msg(struct ice_vsi *vsi, bool isup) ...@@ -608,9 +608,9 @@ void ice_print_link_msg(struct ice_vsi *vsi, bool isup)
} }
/** /**
* ice_vsi_link_event - update the vsi's netdev * ice_vsi_link_event - update the VSI's netdev
* @vsi: the vsi on which the link event occurred * @vsi: the VSI on which the link event occurred
* @link_up: whether or not the vsi needs to be set up or down * @link_up: whether or not the VSI needs to be set up or down
*/ */
static void ice_vsi_link_event(struct ice_vsi *vsi, bool link_up) static void ice_vsi_link_event(struct ice_vsi *vsi, bool link_up)
{ {
...@@ -1236,7 +1236,7 @@ static void ice_service_task(struct work_struct *work) ...@@ -1236,7 +1236,7 @@ static void ice_service_task(struct work_struct *work)
/** /**
* ice_set_ctrlq_len - helper function to set controlq length * ice_set_ctrlq_len - helper function to set controlq length
* @hw: pointer to the hw instance * @hw: pointer to the HW instance
*/ */
static void ice_set_ctrlq_len(struct ice_hw *hw) static void ice_set_ctrlq_len(struct ice_hw *hw)
{ {
...@@ -1796,12 +1796,12 @@ ice_pf_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi) ...@@ -1796,12 +1796,12 @@ ice_pf_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi)
} }
/** /**
* ice_vlan_rx_add_vid - Add a vlan id filter to HW offload * ice_vlan_rx_add_vid - Add a VLAN ID filter to HW offload
* @netdev: network interface to be adjusted * @netdev: network interface to be adjusted
* @proto: unused protocol * @proto: unused protocol
* @vid: vlan id to be added * @vid: VLAN ID to be added
* *
* net_device_ops implementation for adding vlan ids * net_device_ops implementation for adding VLAN IDs
*/ */
static int static int
ice_vlan_rx_add_vid(struct net_device *netdev, __always_unused __be16 proto, ice_vlan_rx_add_vid(struct net_device *netdev, __always_unused __be16 proto,
...@@ -1827,7 +1827,7 @@ ice_vlan_rx_add_vid(struct net_device *netdev, __always_unused __be16 proto, ...@@ -1827,7 +1827,7 @@ ice_vlan_rx_add_vid(struct net_device *netdev, __always_unused __be16 proto,
return ret; return ret;
} }
/* Add all VLAN ids including 0 to the switch filter. VLAN id 0 is /* Add all VLAN IDs including 0 to the switch filter. VLAN ID 0 is
* needed to continue allowing all untagged packets since VLAN prune * needed to continue allowing all untagged packets since VLAN prune
* list is applied to all packets by the switch * list is applied to all packets by the switch
*/ */
...@@ -1841,12 +1841,12 @@ ice_vlan_rx_add_vid(struct net_device *netdev, __always_unused __be16 proto, ...@@ -1841,12 +1841,12 @@ ice_vlan_rx_add_vid(struct net_device *netdev, __always_unused __be16 proto,
} }
/** /**
* ice_vlan_rx_kill_vid - Remove a vlan id filter from HW offload * ice_vlan_rx_kill_vid - Remove a VLAN ID filter from HW offload
* @netdev: network interface to be adjusted * @netdev: network interface to be adjusted
* @proto: unused protocol * @proto: unused protocol
* @vid: vlan id to be removed * @vid: VLAN ID to be removed
* *
* net_device_ops implementation for removing vlan ids * net_device_ops implementation for removing VLAN IDs
*/ */
static int static int
ice_vlan_rx_kill_vid(struct net_device *netdev, __always_unused __be16 proto, ice_vlan_rx_kill_vid(struct net_device *netdev, __always_unused __be16 proto,
...@@ -2622,7 +2622,7 @@ static void __exit ice_module_exit(void) ...@@ -2622,7 +2622,7 @@ static void __exit ice_module_exit(void)
module_exit(ice_module_exit); module_exit(ice_module_exit);
/** /**
* ice_set_mac_address - NDO callback to set mac address * ice_set_mac_address - NDO callback to set MAC address
* @netdev: network interface device structure * @netdev: network interface device structure
* @pi: pointer to an address structure * @pi: pointer to an address structure
* *
...@@ -2659,14 +2659,14 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi) ...@@ -2659,14 +2659,14 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi)
return -EBUSY; return -EBUSY;
} }
/* When we change the mac address we also have to change the mac address /* When we change the MAC address we also have to change the MAC address
* based filter rules that were created previously for the old mac * based filter rules that were created previously for the old MAC
* address. So first, we remove the old filter rule using ice_remove_mac * address. So first, we remove the old filter rule using ice_remove_mac
* and then create a new filter rule using ice_add_mac. Note that for * and then create a new filter rule using ice_add_mac. Note that for
* both these operations, we first need to form a "list" of mac * both these operations, we first need to form a "list" of MAC
* addresses (even though in this case, we have only 1 mac address to be * addresses (even though in this case, we have only 1 MAC address to be
* added/removed) and this done using ice_add_mac_to_list. Depending on * added/removed) and this done using ice_add_mac_to_list. Depending on
* the ensuing operation this "list" of mac addresses is either to be * the ensuing operation this "list" of MAC addresses is either to be
* added or removed from the filter. * added or removed from the filter.
*/ */
err = ice_add_mac_to_list(vsi, &r_mac_list, netdev->dev_addr); err = ice_add_mac_to_list(vsi, &r_mac_list, netdev->dev_addr);
...@@ -2704,12 +2704,12 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi) ...@@ -2704,12 +2704,12 @@ static int ice_set_mac_address(struct net_device *netdev, void *pi)
return err; return err;
} }
/* change the netdev's mac address */ /* change the netdev's MAC address */
memcpy(netdev->dev_addr, mac, netdev->addr_len); memcpy(netdev->dev_addr, mac, netdev->addr_len);
netdev_dbg(vsi->netdev, "updated mac address to %pM\n", netdev_dbg(vsi->netdev, "updated mac address to %pM\n",
netdev->dev_addr); netdev->dev_addr);
/* write new mac address to the firmware */ /* write new MAC address to the firmware */
flags = ICE_AQC_MAN_MAC_UPDATE_LAA_WOL; flags = ICE_AQC_MAN_MAC_UPDATE_LAA_WOL;
status = ice_aq_manage_mac_write(hw, mac, flags, NULL); status = ice_aq_manage_mac_write(hw, mac, flags, NULL);
if (status) { if (status) {
...@@ -2751,7 +2751,7 @@ static void ice_set_rx_mode(struct net_device *netdev) ...@@ -2751,7 +2751,7 @@ static void ice_set_rx_mode(struct net_device *netdev)
* @tb: pointer to array of nladdr (unused) * @tb: pointer to array of nladdr (unused)
* @dev: the net device pointer * @dev: the net device pointer
* @addr: the MAC address entry being added * @addr: the MAC address entry being added
* @vid: VLAN id * @vid: VLAN ID
* @flags: instructions from stack about fdb operation * @flags: instructions from stack about fdb operation
* @extack: netlink extended ack * @extack: netlink extended ack
*/ */
...@@ -2791,7 +2791,7 @@ ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[], ...@@ -2791,7 +2791,7 @@ ice_fdb_add(struct ndmsg *ndm, struct nlattr __always_unused *tb[],
* @tb: pointer to array of nladdr (unused) * @tb: pointer to array of nladdr (unused)
* @dev: the net device pointer * @dev: the net device pointer
* @addr: the MAC address entry being added * @addr: the MAC address entry being added
* @vid: VLAN id * @vid: VLAN ID
*/ */
static int static int
ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[], ice_fdb_del(struct ndmsg *ndm, __always_unused struct nlattr *tb[],
...@@ -2850,8 +2850,8 @@ ice_set_features(struct net_device *netdev, netdev_features_t features) ...@@ -2850,8 +2850,8 @@ ice_set_features(struct net_device *netdev, netdev_features_t features)
} }
/** /**
* ice_vsi_vlan_setup - Setup vlan offload properties on a VSI * ice_vsi_vlan_setup - Setup VLAN offload properties on a VSI
* @vsi: VSI to setup vlan properties for * @vsi: VSI to setup VLAN properties for
*/ */
static int ice_vsi_vlan_setup(struct ice_vsi *vsi) static int ice_vsi_vlan_setup(struct ice_vsi *vsi)
{ {
...@@ -3986,7 +3986,7 @@ int ice_get_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size) ...@@ -3986,7 +3986,7 @@ int ice_get_rss(struct ice_vsi *vsi, u8 *seed, u8 *lut, u16 lut_size)
/** /**
* ice_bridge_getlink - Get the hardware bridge mode * ice_bridge_getlink - Get the hardware bridge mode
* @skb: skb buff * @skb: skb buff
* @pid: process id * @pid: process ID
* @seq: RTNL message seq * @seq: RTNL message seq
* @dev: the netdev being configured * @dev: the netdev being configured
* @filter_mask: filter mask passed in * @filter_mask: filter mask passed in
......
drivers/net/ethernet/intel/ice/ice_nvm.c
View file @ f9867df6
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
/** /**
* ice_aq_read_nvm * ice_aq_read_nvm
* @hw: pointer to the hw struct * @hw: pointer to the HW struct
* @module_typeid: module pointer location in words from the NVM beginning * @module_typeid: module pointer location in words from the NVM beginning
* @offset: byte offset from the module beginning * @offset: byte offset from the module beginning
* @length: length of the section to be read (in bytes from the offset) * @length: length of the section to be read (in bytes from the offset)
...@@ -235,7 +235,7 @@ ice_read_sr_word(struct ice_hw *hw, u16 offset, u16 *data) ...@@ -235,7 +235,7 @@ ice_read_sr_word(struct ice_hw *hw, u16 offset, u16 *data)
/** /**
* ice_init_nvm - initializes NVM setting * ice_init_nvm - initializes NVM setting
* @hw: pointer to the hw struct * @hw: pointer to the HW struct
* *
* This function reads and populates NVM settings such as Shadow RAM size, * This function reads and populates NVM settings such as Shadow RAM size,
* max_timeout, and blank_nvm_mode * max_timeout, and blank_nvm_mode
...@@ -248,7 +248,7 @@ enum ice_status ice_init_nvm(struct ice_hw *hw) ...@@ -248,7 +248,7 @@ enum ice_status ice_init_nvm(struct ice_hw *hw)
u32 fla, gens_stat; u32 fla, gens_stat;
u8 sr_size; u8 sr_size;
/* The SR size is stored regardless of the nvm programming mode /* The SR size is stored regardless of the NVM programming mode
* as the blank mode may be used in the factory line. * as the blank mode may be used in the factory line.
*/ */
gens_stat = rd32(hw, GLNVM_GENS); gens_stat = rd32(hw, GLNVM_GENS);
......
drivers/net/ethernet/intel/ice/ice_sched.c
View file @ f9867df6
This diff is collapsed.
drivers/net/ethernet/intel/ice/ice_switch.c
View file @ f9867df6
This diff is collapsed.
drivers/net/ethernet/intel/ice/ice_switch.h
View file @ f9867df6
...@@ -44,7 +44,7 @@ enum ice_sw_lkup_type { ...@@ -44,7 +44,7 @@ enum ice_sw_lkup_type {
ICE_SW_LKUP_LAST ICE_SW_LKUP_LAST
}; };
/* type of filter src id */ /* type of filter src ID */
enum ice_src_id { enum ice_src_id {
ICE_SRC_ID_UNKNOWN = 0, ICE_SRC_ID_UNKNOWN = 0,
ICE_SRC_ID_VSI, ICE_SRC_ID_VSI,
...@@ -95,8 +95,8 @@ struct ice_fltr_info { ...@@ -95,8 +95,8 @@ struct ice_fltr_info {
/* Depending on filter action */ /* Depending on filter action */
union { union {
/* queue id in case of ICE_FWD_TO_Q and starting /* queue ID in case of ICE_FWD_TO_Q and starting
* queue id in case of ICE_FWD_TO_QGRP. * queue ID in case of ICE_FWD_TO_QGRP.
*/ */
u16 q_id:11; u16 q_id:11;
u16 hw_vsi_id:10; u16 hw_vsi_id:10;
...@@ -143,7 +143,7 @@ struct ice_sw_recipe { ...@@ -143,7 +143,7 @@ struct ice_sw_recipe {
DECLARE_BITMAP(r_bitmap, ICE_MAX_NUM_RECIPES); DECLARE_BITMAP(r_bitmap, ICE_MAX_NUM_RECIPES);
}; };
/* Bookkeeping structure to hold bitmap of VSIs corresponding to VSI list id */ /* Bookkeeping structure to hold bitmap of VSIs corresponding to VSI list ID */
struct ice_vsi_list_map_info { struct ice_vsi_list_map_info {
struct list_head list_entry; struct list_head list_entry;
DECLARE_BITMAP(vsi_map, ICE_MAX_VSI); DECLARE_BITMAP(vsi_map, ICE_MAX_VSI);
...@@ -165,7 +165,7 @@ struct ice_fltr_list_entry { ...@@ -165,7 +165,7 @@ struct ice_fltr_list_entry {
* used for VLAN membership. * used for VLAN membership.
*/ */
struct ice_fltr_mgmt_list_entry { struct ice_fltr_mgmt_list_entry {
/* back pointer to VSI list id to VSI list mapping */ /* back pointer to VSI list ID to VSI list mapping */
struct ice_vsi_list_map_info *vsi_list_info; struct ice_vsi_list_map_info *vsi_list_info;
u16 vsi_count; u16 vsi_count;
#define ICE_INVAL_LG_ACT_INDEX 0xffff #define ICE_INVAL_LG_ACT_INDEX 0xffff
......
drivers/net/ethernet/intel/ice/ice_txrx.c
View file @ f9867df6
...@@ -456,7 +456,7 @@ bool ice_alloc_rx_bufs(struct ice_ring *rx_ring, u16 cleaned_count) ...@@ -456,7 +456,7 @@ bool ice_alloc_rx_bufs(struct ice_ring *rx_ring, u16 cleaned_count)
if (!rx_ring->netdev || !cleaned_count) if (!rx_ring->netdev || !cleaned_count)
return false; return false;
/* get the RX descriptor and buffer based on next_to_use */ /* get the Rx descriptor and buffer based on next_to_use */
rx_desc = ICE_RX_DESC(rx_ring, ntu); rx_desc = ICE_RX_DESC(rx_ring, ntu);
bi = &rx_ring->rx_buf[ntu]; bi = &rx_ring->rx_buf[ntu];
...@@ -959,10 +959,10 @@ ice_process_skb_fields(struct ice_ring *rx_ring, ...@@ -959,10 +959,10 @@ ice_process_skb_fields(struct ice_ring *rx_ring,
* ice_receive_skb - Send a completed packet up the stack * ice_receive_skb - Send a completed packet up the stack
* @rx_ring: Rx ring in play * @rx_ring: Rx ring in play
* @skb: packet to send up * @skb: packet to send up
* @vlan_tag: vlan tag for packet * @vlan_tag: VLAN tag for packet
* *
* This function sends the completed packet (via. skb) up the stack using * This function sends the completed packet (via. skb) up the stack using
* gro receive functions (with/without vlan tag) * gro receive functions (with/without VLAN tag)
*/ */
static void static void
ice_receive_skb(struct ice_ring *rx_ring, struct sk_buff *skb, u16 vlan_tag) ice_receive_skb(struct ice_ring *rx_ring, struct sk_buff *skb, u16 vlan_tag)
...@@ -991,7 +991,7 @@ static int ice_clean_rx_irq(struct ice_ring *rx_ring, int budget) ...@@ -991,7 +991,7 @@ static int ice_clean_rx_irq(struct ice_ring *rx_ring, int budget)
u16 cleaned_count = ICE_DESC_UNUSED(rx_ring); u16 cleaned_count = ICE_DESC_UNUSED(rx_ring);
bool failure = false; bool failure = false;
/* start the loop to process RX packets bounded by 'budget' */ /* start the loop to process Rx packets bounded by 'budget' */
while (likely(total_rx_pkts < (unsigned int)budget)) { while (likely(total_rx_pkts < (unsigned int)budget)) {
union ice_32b_rx_flex_desc *rx_desc; union ice_32b_rx_flex_desc *rx_desc;
struct ice_rx_buf *rx_buf; struct ice_rx_buf *rx_buf;
...@@ -1008,7 +1008,7 @@ static int ice_clean_rx_irq(struct ice_ring *rx_ring, int budget) ...@@ -1008,7 +1008,7 @@ static int ice_clean_rx_irq(struct ice_ring *rx_ring, int budget)
cleaned_count = 0; cleaned_count = 0;
} }
/* get the RX desc from RX ring based on 'next_to_clean' */ /* get the Rx desc from Rx ring based on 'next_to_clean' */
rx_desc = ICE_RX_DESC(rx_ring, rx_ring->next_to_clean); rx_desc = ICE_RX_DESC(rx_ring, rx_ring->next_to_clean);
/* status_error_len will always be zero for unused descriptors /* status_error_len will always be zero for unused descriptors
...@@ -1772,7 +1772,7 @@ int ice_tx_csum(struct ice_tx_buf *first, struct ice_tx_offload_params *off) ...@@ -1772,7 +1772,7 @@ int ice_tx_csum(struct ice_tx_buf *first, struct ice_tx_offload_params *off)
} }
/** /**
* ice_tx_prepare_vlan_flags - prepare generic TX VLAN tagging flags for HW * ice_tx_prepare_vlan_flags - prepare generic Tx VLAN tagging flags for HW
* @tx_ring: ring to send buffer on * @tx_ring: ring to send buffer on
* @first: pointer to struct ice_tx_buf * @first: pointer to struct ice_tx_buf
* *
......
drivers/net/ethernet/intel/ice/ice_type.h
View file @ f9867df6
...@@ -107,7 +107,7 @@ struct ice_link_status { ...@@ -107,7 +107,7 @@ struct ice_link_status {
}; };
/* Different reset sources for which a disable queue AQ call has to be made in /* Different reset sources for which a disable queue AQ call has to be made in
* order to clean the TX scheduler as a part of the reset * order to clean the Tx scheduler as a part of the reset
*/ */
enum ice_disq_rst_src { enum ice_disq_rst_src {
ICE_NO_RESET = 0, ICE_NO_RESET = 0,
...@@ -129,11 +129,11 @@ struct ice_phy_info { ...@@ -129,11 +129,11 @@ struct ice_phy_info {
struct ice_hw_common_caps { struct ice_hw_common_caps {
u32 valid_functions; u32 valid_functions;
/* TX/RX queues */ /* Tx/Rx queues */
u16 num_rxq; /* Number/Total RX queues */ u16 num_rxq; /* Number/Total Rx queues */
u16 rxq_first_id; /* First queue ID for RX queues */ u16 rxq_first_id; /* First queue ID for Rx queues */
u16 num_txq; /* Number/Total TX queues */ u16 num_txq; /* Number/Total Tx queues */
u16 txq_first_id; /* First queue ID for TX queues */ u16 txq_first_id; /* First queue ID for Tx queues */
/* MSI-X vectors */ /* MSI-X vectors */
u16 num_msix_vectors; u16 num_msix_vectors;
...@@ -218,7 +218,7 @@ struct ice_sched_node { ...@@ -218,7 +218,7 @@ struct ice_sched_node {
struct ice_sched_node *sibling; /* next sibling in the same layer */ struct ice_sched_node *sibling; /* next sibling in the same layer */
struct ice_sched_node **children; struct ice_sched_node **children;
struct ice_aqc_txsched_elem_data info; struct ice_aqc_txsched_elem_data info;
u32 agg_id; /* aggregator group id */ u32 agg_id; /* aggregator group ID */
u16 vsi_handle; u16 vsi_handle;
u8 in_use; /* suspended or in use */ u8 in_use; /* suspended or in use */
u8 tx_sched_layer; /* Logical Layer (1-9) */ u8 tx_sched_layer; /* Logical Layer (1-9) */
...@@ -245,7 +245,7 @@ enum ice_agg_type { ...@@ -245,7 +245,7 @@ enum ice_agg_type {
#define ICE_SCHED_DFLT_RL_PROF_ID 0 #define ICE_SCHED_DFLT_RL_PROF_ID 0
#define ICE_SCHED_DFLT_BW_WT 1 #define ICE_SCHED_DFLT_BW_WT 1
/* vsi type list entry to locate corresponding vsi/ag nodes */ /* VSI type list entry to locate corresponding VSI/ag nodes */
struct ice_sched_vsi_info { struct ice_sched_vsi_info {
struct ice_sched_node *vsi_node[ICE_MAX_TRAFFIC_CLASS]; struct ice_sched_node *vsi_node[ICE_MAX_TRAFFIC_CLASS];
struct ice_sched_node *ag_node[ICE_MAX_TRAFFIC_CLASS]; struct ice_sched_node *ag_node[ICE_MAX_TRAFFIC_CLASS];
...@@ -262,7 +262,7 @@ struct ice_sched_tx_policy { ...@@ -262,7 +262,7 @@ struct ice_sched_tx_policy {
struct ice_port_info { struct ice_port_info {
struct ice_sched_node *root; /* Root Node per Port */ struct ice_sched_node *root; /* Root Node per Port */
struct ice_hw *hw; /* back pointer to hw instance */ struct ice_hw *hw; /* back pointer to HW instance */
u32 last_node_teid; /* scheduler last node info */ u32 last_node_teid; /* scheduler last node info */
u16 sw_id; /* Initial switch ID belongs to port */ u16 sw_id; /* Initial switch ID belongs to port */
u16 pf_vf_num; u16 pf_vf_num;
...@@ -323,7 +323,7 @@ struct ice_hw { ...@@ -323,7 +323,7 @@ struct ice_hw {
u8 pf_id; /* device profile info */ u8 pf_id; /* device profile info */
/* TX Scheduler values */ /* Tx Scheduler values */
u16 num_tx_sched_layers; u16 num_tx_sched_layers;
u16 num_tx_sched_phys_layers; u16 num_tx_sched_phys_layers;
u8 flattened_layers; u8 flattened_layers;
...@@ -334,7 +334,7 @@ struct ice_hw { ...@@ -334,7 +334,7 @@ struct ice_hw {
struct ice_vsi_ctx *vsi_ctx[ICE_MAX_VSI]; struct ice_vsi_ctx *vsi_ctx[ICE_MAX_VSI];
u8 evb_veb; /* true for VEB, false for VEPA */ u8 evb_veb; /* true for VEB, false for VEPA */
u8 reset_ongoing; /* true if hw is in reset, false otherwise */ u8 reset_ongoing; /* true if HW is in reset, false otherwise */
struct ice_bus_info bus; struct ice_bus_info bus;
struct ice_nvm_info nvm; struct ice_nvm_info nvm;
struct ice_hw_dev_caps dev_caps; /* device capabilities */ struct ice_hw_dev_caps dev_caps; /* device capabilities */
......
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.c
View file @ f9867df6
...@@ -375,9 +375,9 @@ static void ice_trigger_vf_reset(struct ice_vf *vf, bool is_vflr) ...@@ -375,9 +375,9 @@ static void ice_trigger_vf_reset(struct ice_vf *vf, bool is_vflr)
} }
/** /**
* ice_vsi_set_pvid_fill_ctxt - Set VSI ctxt for add pvid * ice_vsi_set_pvid_fill_ctxt - Set VSI ctxt for add PVID
* @ctxt: the vsi ctxt to fill * @ctxt: the VSI ctxt to fill
* @vid: the VLAN id to set as a PVID * @vid: the VLAN ID to set as a PVID
*/ */
static void ice_vsi_set_pvid_fill_ctxt(struct ice_vsi_ctx *ctxt, u16 vid) static void ice_vsi_set_pvid_fill_ctxt(struct ice_vsi_ctx *ctxt, u16 vid)
{ {
...@@ -391,7 +391,7 @@ static void ice_vsi_set_pvid_fill_ctxt(struct ice_vsi_ctx *ctxt, u16 vid) ...@@ -391,7 +391,7 @@ static void ice_vsi_set_pvid_fill_ctxt(struct ice_vsi_ctx *ctxt, u16 vid)
} }
/** /**
* ice_vsi_kill_pvid_fill_ctxt - Set VSI ctx for remove pvid * ice_vsi_kill_pvid_fill_ctxt - Set VSI ctx for remove PVID
* @ctxt: the VSI ctxt to fill * @ctxt: the VSI ctxt to fill
*/ */
static void ice_vsi_kill_pvid_fill_ctxt(struct ice_vsi_ctx *ctxt) static void ice_vsi_kill_pvid_fill_ctxt(struct ice_vsi_ctx *ctxt)
...@@ -406,8 +406,8 @@ static void ice_vsi_kill_pvid_fill_ctxt(struct ice_vsi_ctx *ctxt) ...@@ -406,8 +406,8 @@ static void ice_vsi_kill_pvid_fill_ctxt(struct ice_vsi_ctx *ctxt)
/** /**
* ice_vsi_manage_pvid - Enable or disable port VLAN for VSI * ice_vsi_manage_pvid - Enable or disable port VLAN for VSI
* @vsi: the VSI to update * @vsi: the VSI to update
* @vid: the VLAN id to set as a PVID * @vid: the VLAN ID to set as a PVID
* @enable: true for enable pvid false for disable * @enable: true for enable PVID false for disable
*/ */
static int ice_vsi_manage_pvid(struct ice_vsi *vsi, u16 vid, bool enable) static int ice_vsi_manage_pvid(struct ice_vsi *vsi, u16 vid, bool enable)
{ {
...@@ -445,7 +445,7 @@ static int ice_vsi_manage_pvid(struct ice_vsi *vsi, u16 vid, bool enable) ...@@ -445,7 +445,7 @@ static int ice_vsi_manage_pvid(struct ice_vsi *vsi, u16 vid, bool enable)
* ice_vf_vsi_setup - Set up a VF VSI * ice_vf_vsi_setup - Set up a VF VSI
* @pf: board private structure * @pf: board private structure
* @pi: pointer to the port_info instance * @pi: pointer to the port_info instance
* @vf_id: defines VF id to which this VSI connects. * @vf_id: defines VF ID to which this VSI connects.
* *
* Returns pointer to the successfully allocated VSI struct on success, * Returns pointer to the successfully allocated VSI struct on success,
* otherwise returns NULL on failure. * otherwise returns NULL on failure.
...@@ -1508,9 +1508,9 @@ static void ice_vc_reset_vf_msg(struct ice_vf *vf) ...@@ -1508,9 +1508,9 @@ static void ice_vc_reset_vf_msg(struct ice_vf *vf)
/** /**
* ice_find_vsi_from_id * ice_find_vsi_from_id
* @pf: the pf structure to search for the VSI * @pf: the pf structure to search for the VSI
* @id: id of the VSI it is searching for * @id: ID of the VSI it is searching for
* *
* searches for the VSI with the given id * searches for the VSI with the given ID
*/ */
static struct ice_vsi *ice_find_vsi_from_id(struct ice_pf *pf, u16 id) static struct ice_vsi *ice_find_vsi_from_id(struct ice_pf *pf, u16 id)
{ {
...@@ -1526,9 +1526,9 @@ static struct ice_vsi *ice_find_vsi_from_id(struct ice_pf *pf, u16 id) ...@@ -1526,9 +1526,9 @@ static struct ice_vsi *ice_find_vsi_from_id(struct ice_pf *pf, u16 id)
/** /**
* ice_vc_isvalid_vsi_id * ice_vc_isvalid_vsi_id
* @vf: pointer to the VF info * @vf: pointer to the VF info
* @vsi_id: VF relative VSI id * @vsi_id: VF relative VSI ID
* *
* check for the valid VSI id * check for the valid VSI ID
*/ */
static bool ice_vc_isvalid_vsi_id(struct ice_vf *vf, u16 vsi_id) static bool ice_vc_isvalid_vsi_id(struct ice_vf *vf, u16 vsi_id)
{ {
...@@ -1543,10 +1543,10 @@ static bool ice_vc_isvalid_vsi_id(struct ice_vf *vf, u16 vsi_id) ...@@ -1543,10 +1543,10 @@ static bool ice_vc_isvalid_vsi_id(struct ice_vf *vf, u16 vsi_id)
/** /**
* ice_vc_isvalid_q_id * ice_vc_isvalid_q_id
* @vf: pointer to the VF info * @vf: pointer to the VF info
* @vsi_id: VSI id * @vsi_id: VSI ID
* @qid: VSI relative queue id * @qid: VSI relative queue ID
* *
* check for the valid queue id * check for the valid queue ID
*/ */
static bool ice_vc_isvalid_q_id(struct ice_vf *vf, u16 vsi_id, u8 qid) static bool ice_vc_isvalid_q_id(struct ice_vf *vf, u16 vsi_id, u8 qid)
{ {
...@@ -2005,7 +2005,7 @@ static bool ice_can_vf_change_mac(struct ice_vf *vf) ...@@ -2005,7 +2005,7 @@ static bool ice_can_vf_change_mac(struct ice_vf *vf)
* ice_vc_handle_mac_addr_msg * ice_vc_handle_mac_addr_msg
* @vf: pointer to the VF info * @vf: pointer to the VF info
* @msg: pointer to the msg buffer * @msg: pointer to the msg buffer
* @set: true if mac filters are being set, false otherwise * @set: true if MAC filters are being set, false otherwise
* *
* add guest MAC address filter * add guest MAC address filter
*/ */
...@@ -2065,7 +2065,7 @@ ice_vc_handle_mac_addr_msg(struct ice_vf *vf, u8 *msg, bool set) ...@@ -2065,7 +2065,7 @@ ice_vc_handle_mac_addr_msg(struct ice_vf *vf, u8 *msg, bool set)
maddr, vf->vf_id); maddr, vf->vf_id);
continue; continue;
} else { } else {
/* VF can't remove dflt_lan_addr/bcast mac */ /* VF can't remove dflt_lan_addr/bcast MAC */
dev_err(&pf->pdev->dev, dev_err(&pf->pdev->dev,
"VF can't remove default MAC address or MAC %pM programmed by PF for VF %d\n", "VF can't remove default MAC address or MAC %pM programmed by PF for VF %d\n",
maddr, vf->vf_id); maddr, vf->vf_id);
...@@ -2091,7 +2091,7 @@ ice_vc_handle_mac_addr_msg(struct ice_vf *vf, u8 *msg, bool set) ...@@ -2091,7 +2091,7 @@ ice_vc_handle_mac_addr_msg(struct ice_vf *vf, u8 *msg, bool set)
goto handle_mac_exit; goto handle_mac_exit;
} }
/* get here if maddr is multicast or if VF can change mac */ /* get here if maddr is multicast or if VF can change MAC */
if (ice_add_mac_to_list(vsi, &mac_list, al->list[i].addr)) { if (ice_add_mac_to_list(vsi, &mac_list, al->list[i].addr)) {
v_ret = VIRTCHNL_STATUS_ERR_NO_MEMORY; v_ret = VIRTCHNL_STATUS_ERR_NO_MEMORY;
goto handle_mac_exit; goto handle_mac_exit;
...@@ -2154,7 +2154,7 @@ static int ice_vc_del_mac_addr_msg(struct ice_vf *vf, u8 *msg) ...@@ -2154,7 +2154,7 @@ static int ice_vc_del_mac_addr_msg(struct ice_vf *vf, u8 *msg)
* VFs get a default number of queues but can use this message to request a * VFs get a default number of queues but can use this message to request a
* different number. If the request is successful, PF will reset the VF and * different number. If the request is successful, PF will reset the VF and
* return 0. If unsuccessful, PF will send message informing VF of number of * return 0. If unsuccessful, PF will send message informing VF of number of
* available queue pairs via virtchnl message response to vf. * available queue pairs via virtchnl message response to VF.
*/ */
static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg) static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg)
{ {
...@@ -2210,11 +2210,11 @@ static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg) ...@@ -2210,11 +2210,11 @@ static int ice_vc_request_qs_msg(struct ice_vf *vf, u8 *msg)
* ice_set_vf_port_vlan * ice_set_vf_port_vlan
* @netdev: network interface device structure * @netdev: network interface device structure
* @vf_id: VF identifier * @vf_id: VF identifier
* @vlan_id: VLAN id being set * @vlan_id: VLAN ID being set
* @qos: priority setting * @qos: priority setting
* @vlan_proto: VLAN protocol * @vlan_proto: VLAN protocol
* *
* program VF Port VLAN id and/or qos * program VF Port VLAN ID and/or QoS
*/ */
int int
ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos, ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos,
...@@ -2257,7 +2257,7 @@ ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos, ...@@ -2257,7 +2257,7 @@ ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos,
return ret; return ret;
} }
/* If pvid, then remove all filters on the old VLAN */ /* If PVID, then remove all filters on the old VLAN */
if (vsi->info.pvid) if (vsi->info.pvid)
ice_vsi_kill_vlan(vsi, (le16_to_cpu(vsi->info.pvid) & ice_vsi_kill_vlan(vsi, (le16_to_cpu(vsi->info.pvid) &
VLAN_VID_MASK)); VLAN_VID_MASK));
...@@ -2296,7 +2296,7 @@ ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos, ...@@ -2296,7 +2296,7 @@ ice_set_vf_port_vlan(struct net_device *netdev, int vf_id, u16 vlan_id, u8 qos,
* @msg: pointer to the msg buffer * @msg: pointer to the msg buffer
* @add_v: Add VLAN if true, otherwise delete VLAN * @add_v: Add VLAN if true, otherwise delete VLAN
* *
* Process virtchnl op to add or remove programmed guest VLAN id * Process virtchnl op to add or remove programmed guest VLAN ID
*/ */
static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v) static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v)
{ {
...@@ -2443,7 +2443,7 @@ static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v) ...@@ -2443,7 +2443,7 @@ static int ice_vc_process_vlan_msg(struct ice_vf *vf, u8 *msg, bool add_v)
* @vf: pointer to the VF info * @vf: pointer to the VF info
* @msg: pointer to the msg buffer * @msg: pointer to the msg buffer
* *
* Add and program guest VLAN id * Add and program guest VLAN ID
*/ */
static int ice_vc_add_vlan_msg(struct ice_vf *vf, u8 *msg) static int ice_vc_add_vlan_msg(struct ice_vf *vf, u8 *msg)
{ {
...@@ -2455,7 +2455,7 @@ static int ice_vc_add_vlan_msg(struct ice_vf *vf, u8 *msg) ...@@ -2455,7 +2455,7 @@ static int ice_vc_add_vlan_msg(struct ice_vf *vf, u8 *msg)
* @vf: pointer to the VF info * @vf: pointer to the VF info
* @msg: pointer to the msg buffer * @msg: pointer to the msg buffer
* *
* remove programmed guest VLAN id * remove programmed guest VLAN ID
*/ */
static int ice_vc_remove_vlan_msg(struct ice_vf *vf, u8 *msg) static int ice_vc_remove_vlan_msg(struct ice_vf *vf, u8 *msg)
{ {
...@@ -2771,9 +2771,9 @@ int ice_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool ena) ...@@ -2771,9 +2771,9 @@ int ice_set_vf_spoofchk(struct net_device *netdev, int vf_id, bool ena)
* ice_set_vf_mac * ice_set_vf_mac
* @netdev: network interface device structure * @netdev: network interface device structure
* @vf_id: VF identifier * @vf_id: VF identifier
* @mac: mac address * @mac: MAC address
* *
* program VF mac address * program VF MAC address
*/ */
int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)
{ {
...@@ -2800,7 +2800,7 @@ int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac) ...@@ -2800,7 +2800,7 @@ int ice_set_vf_mac(struct net_device *netdev, int vf_id, u8 *mac)
return -EINVAL; return -EINVAL;
} }
/* copy mac into dflt_lan_addr and trigger a VF reset. The reset /* copy MAC into dflt_lan_addr and trigger a VF reset. The reset
* flow will use the updated dflt_lan_addr and add a MAC filter * flow will use the updated dflt_lan_addr and add a MAC filter
* using ice_add_mac. Also set pf_set_mac to indicate that the PF has * using ice_add_mac. Also set pf_set_mac to indicate that the PF has
* set the MAC address for this VF. * set the MAC address for this VF.
......
drivers/net/ethernet/intel/ice/ice_virtchnl_pf.h
View file @ f9867df6
...@@ -48,10 +48,10 @@ enum ice_virtchnl_cap { ...@@ -48,10 +48,10 @@ enum ice_virtchnl_cap {
struct ice_vf { struct ice_vf {
struct ice_pf *pf; struct ice_pf *pf;
s16 vf_id; /* VF id in the PF space */ s16 vf_id; /* VF ID in the PF space */
u32 driver_caps; /* reported by VF driver */ u32 driver_caps; /* reported by VF driver */
int first_vector_idx; /* first vector index of this VF */ int first_vector_idx; /* first vector index of this VF */
struct ice_sw *vf_sw_id; /* switch id the VF VSIs connect to */ struct ice_sw *vf_sw_id; /* switch ID the VF VSIs connect to */
struct virtchnl_version_info vf_ver; struct virtchnl_version_info vf_ver;
struct virtchnl_ether_addr dflt_lan_addr; struct virtchnl_ether_addr dflt_lan_addr;
u16 port_vlan_id; u16 port_vlan_id;
...@@ -59,10 +59,10 @@ struct ice_vf { ...@@ -59,10 +59,10 @@ struct ice_vf {
u8 trusted; u8 trusted;
u16 lan_vsi_idx; /* index into PF struct */ u16 lan_vsi_idx; /* index into PF struct */
u16 lan_vsi_num; /* ID as used by firmware */ u16 lan_vsi_num; /* ID as used by firmware */
u64 num_mdd_events; /* number of mdd events detected */ u64 num_mdd_events; /* number of MDD events detected */
u64 num_inval_msgs; /* number of continuous invalid msgs */ u64 num_inval_msgs; /* number of continuous invalid msgs */
u64 num_valid_msgs; /* number of valid msgs detected */ u64 num_valid_msgs; /* number of valid msgs detected */
unsigned long vf_caps; /* vf's adv. capabilities */ unsigned long vf_caps; /* VF's adv. capabilities */
DECLARE_BITMAP(vf_states, ICE_VF_STATES_NBITS); /* VF runtime states */ DECLARE_BITMAP(vf_states, ICE_VF_STATES_NBITS); /* VF runtime states */
unsigned int tx_rate; /* Tx bandwidth limit in Mbps */ unsigned int tx_rate; /* Tx bandwidth limit in Mbps */
u8 link_forced; u8 link_forced;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7