Commit df17b7e0 authored by Anirudh Venkataramanan's avatar Anirudh Venkataramanan Committed by Jeff Kirsher

ice: Cosmetic formatting changes

1. Fix several cases of double spacing
2. Fix typos
3. Capitalize abbreviations
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 2c5492de
...@@ -1380,10 +1380,10 @@ struct ice_aq_desc { ...@@ -1380,10 +1380,10 @@ struct ice_aq_desc {
/* error codes */ /* error codes */
enum ice_aq_err { enum ice_aq_err {
ICE_AQ_RC_OK = 0, /* success */ ICE_AQ_RC_OK = 0, /* Success */
ICE_AQ_RC_ENOMEM = 9, /* Out of memory */ ICE_AQ_RC_ENOMEM = 9, /* Out of memory */
ICE_AQ_RC_EBUSY = 12, /* Device or resource busy */ ICE_AQ_RC_EBUSY = 12, /* Device or resource busy */
ICE_AQ_RC_EEXIST = 13, /* object already exists */ ICE_AQ_RC_EEXIST = 13, /* Object already exists */
ICE_AQ_RC_ENOSPC = 16, /* No space left or allocation failure */ ICE_AQ_RC_ENOSPC = 16, /* No space left or allocation failure */
}; };
......
...@@ -775,7 +775,7 @@ static bool ice_sq_done(struct ice_hw *hw, struct ice_ctl_q_info *cq) ...@@ -775,7 +775,7 @@ static bool ice_sq_done(struct ice_hw *hw, struct ice_ctl_q_info *cq)
* @buf_size: size of buffer for indirect commands (or 0 for direct commands) * @buf_size: size of buffer for indirect commands (or 0 for direct commands)
* @cd: pointer to command details structure * @cd: pointer to command details structure
* *
* This is the main send command routine for the ATQ. It runs the q, * This is the main send command routine for the ATQ. It runs the queue,
* cleans the queue, etc. * cleans the queue, etc.
*/ */
enum ice_status enum ice_status
......
...@@ -256,6 +256,9 @@ enum ice_rx_flex_desc_status_error_0_bits { ...@@ -256,6 +256,9 @@ enum ice_rx_flex_desc_status_error_0_bits {
#define ICE_RXQ_CTX_SIZE_DWORDS 8 #define ICE_RXQ_CTX_SIZE_DWORDS 8
#define ICE_RXQ_CTX_SZ (ICE_RXQ_CTX_SIZE_DWORDS * sizeof(u32)) #define ICE_RXQ_CTX_SZ (ICE_RXQ_CTX_SIZE_DWORDS * sizeof(u32))
#define ICE_TX_CMPLTNQ_CTX_SIZE_DWORDS 22
#define ICE_TX_DRBELL_Q_CTX_SIZE_DWORDS 5
#define GLTCLAN_CQ_CNTX(i, CQ) (GLTCLAN_CQ_CNTX0(CQ) + ((i) * 0x0800))
/* RLAN Rx queue context data /* RLAN Rx queue context data
* *
......
...@@ -2136,9 +2136,7 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi, ...@@ -2136,9 +2136,7 @@ ice_vsi_setup(struct ice_pf *pf, struct ice_port_info *pi,
pf->q_left_rx -= vsi->alloc_rxq; pf->q_left_rx -= vsi->alloc_rxq;
break; break;
default: default:
/* if VSI type is not recognized, clean up the resources and /* clean up the resources and exit */
* exit
*/
goto unroll_vsi_init; goto unroll_vsi_init;
} }
......
...@@ -3674,7 +3674,7 @@ ice_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh, ...@@ -3674,7 +3674,7 @@ ice_bridge_setlink(struct net_device *dev, struct nlmsghdr *nlh,
*/ */
status = ice_update_sw_rule_bridge_mode(hw); status = ice_update_sw_rule_bridge_mode(hw);
if (status) { if (status) {
netdev_err(dev, "update SW_RULE for bridge mode failed, = %d err %d aq_err %d\n", netdev_err(dev, "switch rule update failed, mode = %d err %d aq_err %d\n",
mode, status, hw->adminq.sq_last_status); mode, status, hw->adminq.sq_last_status);
/* revert hw->evb_veb */ /* revert hw->evb_veb */
hw->evb_veb = (pf_sw->bridge_mode == BRIDGE_MODE_VEB); hw->evb_veb = (pf_sw->bridge_mode == BRIDGE_MODE_VEB);
......
...@@ -1863,7 +1863,7 @@ ice_add_vlan_internal(struct ice_hw *hw, struct ice_fltr_list_entry *f_entry) ...@@ -1863,7 +1863,7 @@ ice_add_vlan_internal(struct ice_hw *hw, struct ice_fltr_list_entry *f_entry)
tmp_fltr.fwd_id.vsi_list_id = vsi_list_id; tmp_fltr.fwd_id.vsi_list_id = vsi_list_id;
tmp_fltr.fltr_act = ICE_FWD_TO_VSI_LIST; tmp_fltr.fltr_act = ICE_FWD_TO_VSI_LIST;
/* Update the previous switch rule to a new VSI list which /* Update the previous switch rule to a new VSI list which
* includes current VSI thats requested * includes current VSI that is requested
*/ */
status = ice_update_pkt_fwd_rule(hw, &tmp_fltr); status = ice_update_pkt_fwd_rule(hw, &tmp_fltr);
if (status) if (status)
......
...@@ -156,8 +156,6 @@ static void ice_free_vf_res(struct ice_vf *vf) ...@@ -156,8 +156,6 @@ static void ice_free_vf_res(struct ice_vf *vf)
clear_bit(ICE_VF_STATE_UC_PROMISC, vf->vf_states); clear_bit(ICE_VF_STATE_UC_PROMISC, vf->vf_states);
} }
/***********************enable_vf routines*****************************/
/** /**
* ice_dis_vf_mappings * ice_dis_vf_mappings
* @vf: pointer to the VF structure * @vf: pointer to the VF structure
...@@ -454,7 +452,7 @@ static int ice_alloc_vsi_res(struct ice_vf *vf) ...@@ -454,7 +452,7 @@ static int ice_alloc_vsi_res(struct ice_vf *vf)
/* Clear this bit after VF initialization since we shouldn't reclaim /* Clear this bit after VF initialization since we shouldn't reclaim
* and reassign interrupts for synchronous or asynchronous VFR events. * and reassign interrupts for synchronous or asynchronous VFR events.
* We don't want to reconfigure interrupts since AVF driver doesn't * We dont want to reconfigure interrupts since AVF driver doesn't
* expect vector assignment to be changed unless there is a request for * expect vector assignment to be changed unless there is a request for
* more vectors. * more vectors.
*/ */
...@@ -1105,7 +1103,7 @@ int ice_sriov_configure(struct pci_dev *pdev, int num_vfs) ...@@ -1105,7 +1103,7 @@ int ice_sriov_configure(struct pci_dev *pdev, int num_vfs)
* ice_process_vflr_event - Free VF resources via IRQ calls * ice_process_vflr_event - Free VF resources via IRQ calls
* @pf: pointer to the PF structure * @pf: pointer to the PF structure
* *
* called from the VLFR IRQ handler to * called from the VFLR IRQ handler to
* free up VF resources and state variables * free up VF resources and state variables
*/ */
void ice_process_vflr_event(struct ice_pf *pf) void ice_process_vflr_event(struct ice_pf *pf)
...@@ -1764,7 +1762,7 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg) ...@@ -1764,7 +1762,7 @@ static int ice_vc_cfg_qs_msg(struct ice_vf *vf, u8 *msg)
/* copy Tx queue info from VF into VSI */ /* copy Tx queue info from VF into VSI */
vsi->tx_rings[i]->dma = qpi->txq.dma_ring_addr; vsi->tx_rings[i]->dma = qpi->txq.dma_ring_addr;
vsi->tx_rings[i]->count = qpi->txq.ring_len; vsi->tx_rings[i]->count = qpi->txq.ring_len;
/* copy Rx queue info from VF into vsi */ /* copy Rx queue info from VF into VSI */
vsi->rx_rings[i]->dma = qpi->rxq.dma_ring_addr; vsi->rx_rings[i]->dma = qpi->rxq.dma_ring_addr;
vsi->rx_rings[i]->count = qpi->rxq.ring_len; vsi->rx_rings[i]->count = qpi->rxq.ring_len;
if (qpi->rxq.databuffer_size > ((16 * 1024) - 128)) { if (qpi->rxq.databuffer_size > ((16 * 1024) - 128)) {
...@@ -1830,7 +1828,7 @@ static bool ice_can_vf_change_mac(struct ice_vf *vf) ...@@ -1830,7 +1828,7 @@ static bool ice_can_vf_change_mac(struct ice_vf *vf)
* @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
*/ */
static int static int
ice_vc_handle_mac_addr_msg(struct ice_vf *vf, u8 *msg, bool set) ice_vc_handle_mac_addr_msg(struct ice_vf *vf, u8 *msg, bool set)
...@@ -1970,7 +1968,7 @@ static int ice_vc_del_mac_addr_msg(struct ice_vf *vf, u8 *msg) ...@@ -1970,7 +1968,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)
{ {
......
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