Commit eca32047 authored by Matthew Vick's avatar Matthew Vick Committed by Jeff Kirsher

fm10k: Resolve various spelling errors and checkpatch warnings

Fix a few silly typos in the code and checkpatch warnings in support of
general code cleanliness.
Signed-off-by: default avatarMatthew Vick <matthew.vick@intel.com>
Tested-by: default avatarKrishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 5bf33dc6
...@@ -398,7 +398,7 @@ static void fm10k_update_hw_stats_rx_q(struct fm10k_hw *hw, ...@@ -398,7 +398,7 @@ static void fm10k_update_hw_stats_rx_q(struct fm10k_hw *hw,
/* Retrieve RX Owner Data */ /* Retrieve RX Owner Data */
id_rx = fm10k_read_reg(hw, FM10K_RXQCTL(idx)); id_rx = fm10k_read_reg(hw, FM10K_RXQCTL(idx));
/* Process RX Ring*/ /* Process RX Ring */
do { do {
rx_drops = fm10k_read_hw_stats_32b(hw, FM10K_QPRDC(idx), rx_drops = fm10k_read_hw_stats_32b(hw, FM10K_QPRDC(idx),
&q->rx_drops); &q->rx_drops);
...@@ -466,7 +466,6 @@ void fm10k_update_hw_stats_q(struct fm10k_hw *hw, struct fm10k_hw_stats_q *q, ...@@ -466,7 +466,6 @@ void fm10k_update_hw_stats_q(struct fm10k_hw *hw, struct fm10k_hw_stats_q *q,
* Function invalidates the index values for the queues so any updates that * Function invalidates the index values for the queues so any updates that
* may have happened are ignored and the base for the queue stats is reset. * may have happened are ignored and the base for the queue stats is reset.
**/ **/
void fm10k_unbind_hw_stats_q(struct fm10k_hw_stats_q *q, u32 idx, u32 count) void fm10k_unbind_hw_stats_q(struct fm10k_hw_stats_q *q, u32 idx, u32 count)
{ {
u32 i; u32 i;
......
...@@ -275,7 +275,7 @@ s32 fm10k_iov_update_pvid(struct fm10k_intfc *interface, u16 glort, u16 pvid) ...@@ -275,7 +275,7 @@ s32 fm10k_iov_update_pvid(struct fm10k_intfc *interface, u16 glort, u16 pvid)
if (vf_idx >= iov_data->num_vfs) if (vf_idx >= iov_data->num_vfs)
return FM10K_ERR_PARAM; return FM10K_ERR_PARAM;
/* determine if an update has occured and if so notify the VF */ /* determine if an update has occurred and if so notify the VF */
vf_info = &iov_data->vf_info[vf_idx]; vf_info = &iov_data->vf_info[vf_idx];
if (vf_info->sw_vid != pvid) { if (vf_info->sw_vid != pvid) {
vf_info->sw_vid = pvid; vf_info->sw_vid = pvid;
......
...@@ -949,10 +949,10 @@ static int __fm10k_maybe_stop_tx(struct fm10k_ring *tx_ring, u16 size) ...@@ -949,10 +949,10 @@ static int __fm10k_maybe_stop_tx(struct fm10k_ring *tx_ring, u16 size)
{ {
netif_stop_subqueue(tx_ring->netdev, tx_ring->queue_index); netif_stop_subqueue(tx_ring->netdev, tx_ring->queue_index);
/* Memory barrier before checking head and tail */
smp_mb(); smp_mb();
/* We need to check again in a case another CPU has just /* Check again in a case another CPU has just made room available */
* made room available. */
if (likely(fm10k_desc_unused(tx_ring) < size)) if (likely(fm10k_desc_unused(tx_ring) < size))
return -EBUSY; return -EBUSY;
......
...@@ -72,7 +72,7 @@ static bool fm10k_fifo_empty(struct fm10k_mbx_fifo *fifo) ...@@ -72,7 +72,7 @@ static bool fm10k_fifo_empty(struct fm10k_mbx_fifo *fifo)
* @fifo: pointer to FIFO * @fifo: pointer to FIFO
* @offset: offset to add to head * @offset: offset to add to head
* *
* This function returns the indicies into the fifo based on head + offset * This function returns the indices into the fifo based on head + offset
**/ **/
static u16 fm10k_fifo_head_offset(struct fm10k_mbx_fifo *fifo, u16 offset) static u16 fm10k_fifo_head_offset(struct fm10k_mbx_fifo *fifo, u16 offset)
{ {
...@@ -84,7 +84,7 @@ static u16 fm10k_fifo_head_offset(struct fm10k_mbx_fifo *fifo, u16 offset) ...@@ -84,7 +84,7 @@ static u16 fm10k_fifo_head_offset(struct fm10k_mbx_fifo *fifo, u16 offset)
* @fifo: pointer to FIFO * @fifo: pointer to FIFO
* @offset: offset to add to tail * @offset: offset to add to tail
* *
* This function returns the indicies into the fifo based on tail + offset * This function returns the indices into the fifo based on tail + offset
**/ **/
static u16 fm10k_fifo_tail_offset(struct fm10k_mbx_fifo *fifo, u16 offset) static u16 fm10k_fifo_tail_offset(struct fm10k_mbx_fifo *fifo, u16 offset)
{ {
...@@ -326,7 +326,7 @@ static u16 fm10k_mbx_validate_msg_size(struct fm10k_mbx_info *mbx, u16 len) ...@@ -326,7 +326,7 @@ static u16 fm10k_mbx_validate_msg_size(struct fm10k_mbx_info *mbx, u16 len)
* fm10k_mbx_write_copy - pulls data off of Tx FIFO and places it in mbmem * fm10k_mbx_write_copy - pulls data off of Tx FIFO and places it in mbmem
* @mbx: pointer to mailbox * @mbx: pointer to mailbox
* *
* This function will take a seciton of the Rx FIFO and copy it into the * This function will take a section of the Rx FIFO and copy it into the
mbx->tail--; mbx->tail--;
* mailbox memory. The offset in mbmem is based on the lower bits of the * mailbox memory. The offset in mbmem is based on the lower bits of the
* tail and len determines the length to copy. * tail and len determines the length to copy.
...@@ -418,7 +418,7 @@ static void fm10k_mbx_pull_head(struct fm10k_hw *hw, ...@@ -418,7 +418,7 @@ static void fm10k_mbx_pull_head(struct fm10k_hw *hw,
* @hw: pointer to hardware structure * @hw: pointer to hardware structure
* @mbx: pointer to mailbox * @mbx: pointer to mailbox
* *
* This function will take a seciton of the mailbox memory and copy it * This function will take a section of the mailbox memory and copy it
* into the Rx FIFO. The offset is based on the lower bits of the * into the Rx FIFO. The offset is based on the lower bits of the
* head and len determines the length to copy. * head and len determines the length to copy.
**/ **/
...@@ -464,7 +464,7 @@ static void fm10k_mbx_read_copy(struct fm10k_hw *hw, ...@@ -464,7 +464,7 @@ static void fm10k_mbx_read_copy(struct fm10k_hw *hw,
* @tail: tail index of message * @tail: tail index of message
* *
* This function will first validate the tail index and size for the * This function will first validate the tail index and size for the
* incoming message. It then updates the acknowlegment number and * incoming message. It then updates the acknowledgment number and
* copies the data into the FIFO. It will return the number of messages * copies the data into the FIFO. It will return the number of messages
* dequeued on success and a negative value on error. * dequeued on success and a negative value on error.
**/ **/
...@@ -761,7 +761,7 @@ static s32 fm10k_mbx_enqueue_tx(struct fm10k_hw *hw, ...@@ -761,7 +761,7 @@ static s32 fm10k_mbx_enqueue_tx(struct fm10k_hw *hw,
err = fm10k_fifo_enqueue(&mbx->tx, msg); err = fm10k_fifo_enqueue(&mbx->tx, msg);
} }
/* if we failed trhead the error */ /* if we failed treat the error */
if (err) { if (err) {
mbx->timeout = 0; mbx->timeout = 0;
mbx->tx_busy++; mbx->tx_busy++;
...@@ -815,7 +815,7 @@ static void fm10k_mbx_write(struct fm10k_hw *hw, struct fm10k_mbx_info *mbx) ...@@ -815,7 +815,7 @@ static void fm10k_mbx_write(struct fm10k_hw *hw, struct fm10k_mbx_info *mbx)
{ {
u32 mbmem = mbx->mbmem_reg; u32 mbmem = mbx->mbmem_reg;
/* write new msg header to notify recepient of change */ /* write new msg header to notify recipient of change */
fm10k_write_reg(hw, mbmem, mbx->mbx_hdr); fm10k_write_reg(hw, mbmem, mbx->mbx_hdr);
/* write mailbox to sent interrupt */ /* write mailbox to sent interrupt */
...@@ -1251,7 +1251,7 @@ static s32 fm10k_mbx_process_error(struct fm10k_hw *hw, ...@@ -1251,7 +1251,7 @@ static s32 fm10k_mbx_process_error(struct fm10k_hw *hw,
/* we will need to pull all of the fields for verification */ /* we will need to pull all of the fields for verification */
head = FM10K_MSG_HDR_FIELD_GET(*hdr, HEAD); head = FM10K_MSG_HDR_FIELD_GET(*hdr, HEAD);
/* we only have lower 10 bits of error number os add upper bits */ /* we only have lower 10 bits of error number so add upper bits */
err_no = FM10K_MSG_HDR_FIELD_GET(*hdr, ERR_NO); err_no = FM10K_MSG_HDR_FIELD_GET(*hdr, ERR_NO);
err_no |= ~FM10K_MSG_HDR_MASK(ERR_NO); err_no |= ~FM10K_MSG_HDR_MASK(ERR_NO);
...@@ -1548,7 +1548,7 @@ s32 fm10k_pfvf_mbx_init(struct fm10k_hw *hw, struct fm10k_mbx_info *mbx, ...@@ -1548,7 +1548,7 @@ s32 fm10k_pfvf_mbx_init(struct fm10k_hw *hw, struct fm10k_mbx_info *mbx,
mbx->timeout = 0; mbx->timeout = 0;
mbx->udelay = FM10K_MBX_INIT_DELAY; mbx->udelay = FM10K_MBX_INIT_DELAY;
/* initalize tail and head */ /* initialize tail and head */
mbx->tail = 1; mbx->tail = 1;
mbx->head = 1; mbx->head = 1;
...@@ -1627,7 +1627,7 @@ static void fm10k_sm_mbx_connect_reset(struct fm10k_mbx_info *mbx) ...@@ -1627,7 +1627,7 @@ static void fm10k_sm_mbx_connect_reset(struct fm10k_mbx_info *mbx)
mbx->local = FM10K_SM_MBX_VERSION; mbx->local = FM10K_SM_MBX_VERSION;
mbx->remote = 0; mbx->remote = 0;
/* initalize tail and head */ /* initialize tail and head */
mbx->tail = 1; mbx->tail = 1;
mbx->head = 1; mbx->head = 1;
......
...@@ -356,7 +356,7 @@ static void fm10k_free_all_rx_resources(struct fm10k_intfc *interface) ...@@ -356,7 +356,7 @@ static void fm10k_free_all_rx_resources(struct fm10k_intfc *interface)
* fm10k_request_glort_range - Request GLORTs for use in configuring rules * fm10k_request_glort_range - Request GLORTs for use in configuring rules
* @interface: board private structure * @interface: board private structure
* *
* This function allocates a range of glorts for this inteface to use. * This function allocates a range of glorts for this interface to use.
**/ **/
static void fm10k_request_glort_range(struct fm10k_intfc *interface) static void fm10k_request_glort_range(struct fm10k_intfc *interface)
{ {
...@@ -781,7 +781,7 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set) ...@@ -781,7 +781,7 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set)
fm10k_mbx_lock(interface); fm10k_mbx_lock(interface);
/* only need to update the VLAN if not in promiscous mode */ /* only need to update the VLAN if not in promiscuous mode */
if (!(netdev->flags & IFF_PROMISC)) { if (!(netdev->flags & IFF_PROMISC)) {
err = hw->mac.ops.update_vlan(hw, vid, 0, set); err = hw->mac.ops.update_vlan(hw, vid, 0, set);
if (err) if (err)
...@@ -970,7 +970,7 @@ static void fm10k_set_rx_mode(struct net_device *dev) ...@@ -970,7 +970,7 @@ static void fm10k_set_rx_mode(struct net_device *dev)
fm10k_mbx_lock(interface); fm10k_mbx_lock(interface);
/* syncronize all of the addresses */ /* synchronize all of the addresses */
if (xcast_mode != FM10K_XCAST_MODE_PROMISC) { if (xcast_mode != FM10K_XCAST_MODE_PROMISC) {
__dev_uc_sync(dev, fm10k_uc_sync, fm10k_uc_unsync); __dev_uc_sync(dev, fm10k_uc_sync, fm10k_uc_unsync);
if (xcast_mode != FM10K_XCAST_MODE_ALLMULTI) if (xcast_mode != FM10K_XCAST_MODE_ALLMULTI)
...@@ -1051,7 +1051,7 @@ void fm10k_restore_rx_state(struct fm10k_intfc *interface) ...@@ -1051,7 +1051,7 @@ void fm10k_restore_rx_state(struct fm10k_intfc *interface)
vid, true, 0); vid, true, 0);
} }
/* syncronize all of the addresses */ /* synchronize all of the addresses */
if (xcast_mode != FM10K_XCAST_MODE_PROMISC) { if (xcast_mode != FM10K_XCAST_MODE_PROMISC) {
__dev_uc_sync(netdev, fm10k_uc_sync, fm10k_uc_unsync); __dev_uc_sync(netdev, fm10k_uc_sync, fm10k_uc_unsync);
if (xcast_mode != FM10K_XCAST_MODE_ALLMULTI) if (xcast_mode != FM10K_XCAST_MODE_ALLMULTI)
......
...@@ -648,7 +648,7 @@ static void fm10k_configure_rx_ring(struct fm10k_intfc *interface, ...@@ -648,7 +648,7 @@ static void fm10k_configure_rx_ring(struct fm10k_intfc *interface,
/* Configure the Rx buffer size for one buff without split */ /* Configure the Rx buffer size for one buff without split */
srrctl |= FM10K_RX_BUFSZ >> FM10K_SRRCTL_BSIZEPKT_SHIFT; srrctl |= FM10K_RX_BUFSZ >> FM10K_SRRCTL_BSIZEPKT_SHIFT;
/* Configure the Rx ring to supress loopback packets */ /* Configure the Rx ring to suppress loopback packets */
srrctl |= FM10K_SRRCTL_LOOPBACK_SUPPRESS; srrctl |= FM10K_SRRCTL_LOOPBACK_SUPPRESS;
fm10k_write_reg(hw, FM10K_SRRCTL(reg_idx), srrctl); fm10k_write_reg(hw, FM10K_SRRCTL(reg_idx), srrctl);
......
...@@ -234,8 +234,7 @@ static s32 fm10k_update_vlan_pf(struct fm10k_hw *hw, u32 vid, u8 vsi, bool set) ...@@ -234,8 +234,7 @@ static s32 fm10k_update_vlan_pf(struct fm10k_hw *hw, u32 vid, u8 vsi, bool set)
vid = (vid << 17) >> 17; vid = (vid << 17) >> 17;
/* verify the reserved 0 fields are 0 */ /* verify the reserved 0 fields are 0 */
if (len >= FM10K_VLAN_TABLE_VID_MAX || if (len >= FM10K_VLAN_TABLE_VID_MAX || vid >= FM10K_VLAN_TABLE_VID_MAX)
vid >= FM10K_VLAN_TABLE_VID_MAX)
return FM10K_ERR_PARAM; return FM10K_ERR_PARAM;
/* Loop through the table updating all required VLANs */ /* Loop through the table updating all required VLANs */
...@@ -312,7 +311,7 @@ bool fm10k_glort_valid_pf(struct fm10k_hw *hw, u16 glort) ...@@ -312,7 +311,7 @@ bool fm10k_glort_valid_pf(struct fm10k_hw *hw, u16 glort)
} }
/** /**
* fm10k_update_uc_addr_pf - Update device unicast addresss * fm10k_update_xc_addr_pf - Update device addresses
* @hw: pointer to the HW structure * @hw: pointer to the HW structure
* @glort: base resource tag for this request * @glort: base resource tag for this request
* @mac: MAC address to add/remove from table * @mac: MAC address to add/remove from table
...@@ -356,7 +355,7 @@ static s32 fm10k_update_xc_addr_pf(struct fm10k_hw *hw, u16 glort, ...@@ -356,7 +355,7 @@ static s32 fm10k_update_xc_addr_pf(struct fm10k_hw *hw, u16 glort,
} }
/** /**
* fm10k_update_uc_addr_pf - Update device unicast addresss * fm10k_update_uc_addr_pf - Update device unicast addresses
* @hw: pointer to the HW structure * @hw: pointer to the HW structure
* @glort: base resource tag for this request * @glort: base resource tag for this request
* @mac: MAC address to add/remove from table * @mac: MAC address to add/remove from table
...@@ -454,7 +453,7 @@ static void fm10k_update_int_moderator_pf(struct fm10k_hw *hw) ...@@ -454,7 +453,7 @@ static void fm10k_update_int_moderator_pf(struct fm10k_hw *hw)
break; break;
} }
/* always reset VFITR2[0] to point to last enabled PF vector*/ /* always reset VFITR2[0] to point to last enabled PF vector */
fm10k_write_reg(hw, FM10K_ITR2(FM10K_ITR_REG_COUNT_PF), i); fm10k_write_reg(hw, FM10K_ITR2(FM10K_ITR_REG_COUNT_PF), i);
/* reset ITR2[0] to point to last enabled PF vector */ /* reset ITR2[0] to point to last enabled PF vector */
...@@ -812,7 +811,7 @@ static s32 fm10k_iov_assign_int_moderator_pf(struct fm10k_hw *hw, u16 vf_idx) ...@@ -812,7 +811,7 @@ static s32 fm10k_iov_assign_int_moderator_pf(struct fm10k_hw *hw, u16 vf_idx)
if (vf_idx >= hw->iov.num_vfs) if (vf_idx >= hw->iov.num_vfs)
return FM10K_ERR_PARAM; return FM10K_ERR_PARAM;
/* determine vector offset and count*/ /* determine vector offset and count */
vf_v_idx = fm10k_vf_vector_index(hw, vf_idx); vf_v_idx = fm10k_vf_vector_index(hw, vf_idx);
vf_v_limit = vf_v_idx + fm10k_vectors_per_pool(hw); vf_v_limit = vf_v_idx + fm10k_vectors_per_pool(hw);
...@@ -951,7 +950,7 @@ static s32 fm10k_iov_reset_resources_pf(struct fm10k_hw *hw, ...@@ -951,7 +950,7 @@ static s32 fm10k_iov_reset_resources_pf(struct fm10k_hw *hw,
if (vf_info->mbx.ops.disconnect) if (vf_info->mbx.ops.disconnect)
vf_info->mbx.ops.disconnect(hw, &vf_info->mbx); vf_info->mbx.ops.disconnect(hw, &vf_info->mbx);
/* determine vector offset and count*/ /* determine vector offset and count */
vf_v_idx = fm10k_vf_vector_index(hw, vf_idx); vf_v_idx = fm10k_vf_vector_index(hw, vf_idx);
vf_v_limit = vf_v_idx + fm10k_vectors_per_pool(hw); vf_v_limit = vf_v_idx + fm10k_vectors_per_pool(hw);
...@@ -1035,7 +1034,7 @@ static s32 fm10k_iov_reset_resources_pf(struct fm10k_hw *hw, ...@@ -1035,7 +1034,7 @@ static s32 fm10k_iov_reset_resources_pf(struct fm10k_hw *hw,
((u32)vf_info->mac[2]); ((u32)vf_info->mac[2]);
} }
/* map queue pairs back to VF from last to first*/ /* map queue pairs back to VF from last to first */
for (i = queues_per_pool; i--;) { for (i = queues_per_pool; i--;) {
fm10k_write_reg(hw, FM10K_TDBAL(vf_q_idx + i), tdbal); fm10k_write_reg(hw, FM10K_TDBAL(vf_q_idx + i), tdbal);
fm10k_write_reg(hw, FM10K_TDBAH(vf_q_idx + i), tdbah); fm10k_write_reg(hw, FM10K_TDBAH(vf_q_idx + i), tdbah);
...@@ -1141,7 +1140,7 @@ static s32 fm10k_iov_report_timestamp_pf(struct fm10k_hw *hw, ...@@ -1141,7 +1140,7 @@ static s32 fm10k_iov_report_timestamp_pf(struct fm10k_hw *hw,
* *
* This function is a default handler for MSI-X requests from the VF. The * This function is a default handler for MSI-X requests from the VF. The
* assumption is that in this case it is acceptable to just directly * assumption is that in this case it is acceptable to just directly
* hand off the message form the VF to the underlying shared code. * hand off the message from the VF to the underlying shared code.
**/ **/
s32 fm10k_iov_msg_msix_pf(struct fm10k_hw *hw, u32 **results, s32 fm10k_iov_msg_msix_pf(struct fm10k_hw *hw, u32 **results,
struct fm10k_mbx_info *mbx) struct fm10k_mbx_info *mbx)
...@@ -1160,7 +1159,7 @@ s32 fm10k_iov_msg_msix_pf(struct fm10k_hw *hw, u32 **results, ...@@ -1160,7 +1159,7 @@ s32 fm10k_iov_msg_msix_pf(struct fm10k_hw *hw, u32 **results,
* *
* This function is a default handler for MAC/VLAN requests from the VF. * 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 * The assumption is that in this case it is acceptable to just directly
* hand off the message form the VF to the underlying shared code. * 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, s32 fm10k_iov_msg_mac_vlan_pf(struct fm10k_hw *hw, u32 **results,
struct fm10k_mbx_info *mbx) struct fm10k_mbx_info *mbx)
...@@ -1573,7 +1572,7 @@ static s32 fm10k_get_host_state_pf(struct fm10k_hw *hw, bool *switch_ready) ...@@ -1573,7 +1572,7 @@ static s32 fm10k_get_host_state_pf(struct fm10k_hw *hw, bool *switch_ready)
s32 ret_val = 0; s32 ret_val = 0;
u32 dma_ctrl2; u32 dma_ctrl2;
/* verify the switch is ready for interraction */ /* verify the switch is ready for interaction */
dma_ctrl2 = fm10k_read_reg(hw, FM10K_DMA_CTRL2); dma_ctrl2 = fm10k_read_reg(hw, FM10K_DMA_CTRL2);
if (!(dma_ctrl2 & FM10K_DMA_CTRL2_SWITCH_READY)) if (!(dma_ctrl2 & FM10K_DMA_CTRL2_SWITCH_READY))
goto out; goto out;
......
...@@ -710,7 +710,7 @@ void fm10k_tlv_msg_test_create(u32 *msg, u32 attr_flags) ...@@ -710,7 +710,7 @@ void fm10k_tlv_msg_test_create(u32 *msg, u32 attr_flags)
/** /**
* fm10k_tlv_msg_test - Validate all results on test message receive * fm10k_tlv_msg_test - Validate all results on test message receive
* @hw: Pointer to hardware structure * @hw: Pointer to hardware structure
* @results: Pointer array to attributes in the mesage * @results: Pointer array to attributes in the message
* @mbx: Pointer to mailbox information structure * @mbx: Pointer to mailbox information structure
* *
* This function does a check to verify all attributes match what the test * This function does a check to verify all attributes match what the test
......
...@@ -596,7 +596,7 @@ struct fm10k_vf_info { ...@@ -596,7 +596,7 @@ struct fm10k_vf_info {
u16 sw_vid; /* Switch API assigned VLAN */ u16 sw_vid; /* Switch API assigned VLAN */
u16 pf_vid; /* PF assigned Default VLAN */ u16 pf_vid; /* PF assigned Default VLAN */
u8 mac[ETH_ALEN]; /* PF Default MAC address */ u8 mac[ETH_ALEN]; /* PF Default MAC address */
u8 vsi; /* VSI idenfifier */ u8 vsi; /* VSI identifier */
u8 vf_idx; /* which VF this is */ u8 vf_idx; /* which VF this is */
u8 vf_flags; /* flags indicating what modes u8 vf_flags; /* flags indicating what modes
* are supported for the port * are supported for the port
......
...@@ -37,7 +37,7 @@ static s32 fm10k_stop_hw_vf(struct fm10k_hw *hw) ...@@ -37,7 +37,7 @@ static s32 fm10k_stop_hw_vf(struct fm10k_hw *hw)
if (err) if (err)
return err; return err;
/* If permenant address is set then we need to restore it */ /* If permanent address is set then we need to restore it */
if (is_valid_ether_addr(perm_addr)) { if (is_valid_ether_addr(perm_addr)) {
bal = (((u32)perm_addr[3]) << 24) | bal = (((u32)perm_addr[3]) << 24) |
(((u32)perm_addr[4]) << 16) | (((u32)perm_addr[4]) << 16) |
...@@ -65,7 +65,7 @@ static s32 fm10k_stop_hw_vf(struct fm10k_hw *hw) ...@@ -65,7 +65,7 @@ static s32 fm10k_stop_hw_vf(struct fm10k_hw *hw)
* fm10k_reset_hw_vf - VF hardware reset * fm10k_reset_hw_vf - VF hardware reset
* @hw: pointer to hardware structure * @hw: pointer to hardware structure
* *
* This function should return the hardare to a state similar to the * This function should return the hardware to a state similar to the
* one it is in after just being initialized. * one it is in after just being initialized.
**/ **/
static s32 fm10k_reset_hw_vf(struct fm10k_hw *hw) static s32 fm10k_reset_hw_vf(struct fm10k_hw *hw)
...@@ -252,7 +252,7 @@ static s32 fm10k_read_mac_addr_vf(struct fm10k_hw *hw) ...@@ -252,7 +252,7 @@ static s32 fm10k_read_mac_addr_vf(struct fm10k_hw *hw)
} }
/** /**
* fm10k_update_uc_addr_vf - Update device unicast address * fm10k_update_uc_addr_vf - Update device unicast addresses
* @hw: pointer to the HW structure * @hw: pointer to the HW structure
* @glort: unused * @glort: unused
* @mac: MAC address to add/remove from table * @mac: MAC address to add/remove from table
...@@ -282,7 +282,7 @@ static s32 fm10k_update_uc_addr_vf(struct fm10k_hw *hw, u16 glort, ...@@ -282,7 +282,7 @@ static s32 fm10k_update_uc_addr_vf(struct fm10k_hw *hw, u16 glort,
memcmp(hw->mac.perm_addr, mac, ETH_ALEN)) memcmp(hw->mac.perm_addr, mac, ETH_ALEN))
return FM10K_ERR_PARAM; return FM10K_ERR_PARAM;
/* add bit to notify us if this is a set of clear operation */ /* add bit to notify us if this is a set or clear operation */
if (!add) if (!add)
vid |= FM10K_VLAN_CLEAR; vid |= FM10K_VLAN_CLEAR;
...@@ -295,7 +295,7 @@ static s32 fm10k_update_uc_addr_vf(struct fm10k_hw *hw, u16 glort, ...@@ -295,7 +295,7 @@ static s32 fm10k_update_uc_addr_vf(struct fm10k_hw *hw, u16 glort,
} }
/** /**
* fm10k_update_mc_addr_vf - Update device multicast address * fm10k_update_mc_addr_vf - Update device multicast addresses
* @hw: pointer to the HW structure * @hw: pointer to the HW structure
* @glort: unused * @glort: unused
* @mac: MAC address to add/remove from table * @mac: MAC address to add/remove from table
...@@ -319,7 +319,7 @@ static s32 fm10k_update_mc_addr_vf(struct fm10k_hw *hw, u16 glort, ...@@ -319,7 +319,7 @@ static s32 fm10k_update_mc_addr_vf(struct fm10k_hw *hw, u16 glort,
if (!is_multicast_ether_addr(mac)) if (!is_multicast_ether_addr(mac))
return FM10K_ERR_PARAM; return FM10K_ERR_PARAM;
/* add bit to notify us if this is a set of clear operation */ /* add bit to notify us if this is a set or clear operation */
if (!add) if (!add)
vid |= FM10K_VLAN_CLEAR; vid |= FM10K_VLAN_CLEAR;
...@@ -515,7 +515,7 @@ static s32 fm10k_adjust_systime_vf(struct fm10k_hw *hw, s32 ppb) ...@@ -515,7 +515,7 @@ static s32 fm10k_adjust_systime_vf(struct fm10k_hw *hw, s32 ppb)
* @hw: pointer to the hardware structure * @hw: pointer to the hardware structure
* *
* Function reads the content of 2 registers, combined to represent a 64 bit * Function reads the content of 2 registers, combined to represent a 64 bit
* value measured in nanosecods. In order to guarantee the value is accurate * value measured in nanoseconds. In order to guarantee the value is accurate
* we check the 32 most significant bits both before and after reading the * we check the 32 most significant bits both before and after reading the
* 32 least significant bits to verify they didn't change as we were reading * 32 least significant bits to verify they didn't change as we were reading
* the registers. * the registers.
......
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