]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
fm10k: use actual hardware registers when checking for pending Tx
authorJacob Keller <jacob.e.keller@intel.com>
Tue, 7 Jun 2016 23:08:49 +0000 (16:08 -0700)
committerChuck Anderson <chuck.anderson@oracle.com>
Sun, 26 Feb 2017 06:04:20 +0000 (22:04 -0800)
Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <Krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Orabug: 25394529
(cherry picked from commit 34bad71c7c25840cd78dff12d75497d3aab5544d)
Signed-off-by: Jack Vogel <jack.vogel@oracle.com>
drivers/net/ethernet/intel/fm10k/fm10k_main.c

index dce321415e519bc180b0db6b8bbe95af46ec8a4a..765ff74000533ddff40b68489d9cc55dfbc85535 100644 (file)
@@ -1150,9 +1150,11 @@ static u64 fm10k_get_tx_completed(struct fm10k_ring *ring)
 
 static u64 fm10k_get_tx_pending(struct fm10k_ring *ring)
 {
-       /* use SW head and tail until we have real hardware */
-       u32 head = ring->next_to_clean;
-       u32 tail = ring->next_to_use;
+       struct fm10k_intfc *interface = ring->q_vector->interface;
+       struct fm10k_hw *hw = &interface->hw;
+
+       u32 head = fm10k_read_reg(hw, FM10K_TDH(ring->reg_idx));
+       u32 tail = fm10k_read_reg(hw, FM10K_TDT(ring->reg_idx));
 
        return ((head <= tail) ? tail : tail + ring->count) - head;
 }