Skip to content

Commit

Permalink
ixgbe: Change default Tx work limit size to 256 buffers
Browse files Browse the repository at this point in the history
This change makes it so that the default Tx work limit is 256 buffers or
1/2 of an entire ring instead of a full ring size so that it is much more
likely that we will be able to actually reach the work limit value.
Previously with the value set to an entire ring it would not have been
possible for us to trigger an event due to the fact that the Tx work is
stopped at the point where we cannot place one more buffer on the ring and
it is not restarted until cleanup is complete.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
  • Loading branch information
Alexander Duyck authored and Jeff Kirsher committed Sep 16, 2011
1 parent 4bc71cb commit 5922455
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions drivers/net/ethernet/intel/ixgbe/ixgbe.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@

/* TX/RX descriptor defines */
#define IXGBE_DEFAULT_TXD 512
#define IXGBE_DEFAULT_TX_WORK 256
#define IXGBE_MAX_TXD 4096
#define IXGBE_MIN_TXD 64

Expand Down
8 changes: 4 additions & 4 deletions drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -804,7 +804,7 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
struct ixgbe_tx_buffer *tx_buffer;
union ixgbe_adv_tx_desc *tx_desc;
unsigned int total_bytes = 0, total_packets = 0;
u16 budget = q_vector->tx.work_limit;
unsigned int budget = q_vector->tx.work_limit;
u16 i = tx_ring->next_to_clean;

tx_buffer = &tx_ring->tx_buffer_info[i];
Expand Down Expand Up @@ -891,7 +891,7 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
ixgbe_tx_timeout_reset(adapter);

/* the adapter is about to reset, no point in enabling stuff */
return budget;
return true;
}

#define TX_WAKE_THRESHOLD (DESC_NEEDED * 2)
Expand All @@ -908,7 +908,7 @@ static bool ixgbe_clean_tx_irq(struct ixgbe_q_vector *q_vector,
}
}

return budget;
return !!budget;
}

#ifdef CONFIG_IXGBE_DCA
Expand Down Expand Up @@ -5091,7 +5091,7 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
adapter->rx_ring_count = IXGBE_DEFAULT_RXD;

/* set default work limits */
adapter->tx_work_limit = adapter->tx_ring_count;
adapter->tx_work_limit = IXGBE_DEFAULT_TX_WORK;

/* initialize eeprom parameters */
if (ixgbe_init_eeprom_params_generic(hw)) {
Expand Down

0 comments on commit 5922455

Please sign in to comment.