| Message ID | 20181003202511.29684-3-jeffrey.t.kirsher@intel.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
| Series | 10GbE Intel Wired LAN Driver Updates 2018-10-03 | expand |
Hello! On 10/3/2018 11:25 PM, Jeff Kirsher wrote: > From: Radoslaw Tyl <radoslawx.tyl@intel.com> > > We have Tx hang when number Tx and XDP queues are more than 64. ^ of > In XDP always is MTQC == 0x0 (64TxQs). We need more space for Tx queues. > > Signed-off-by: Radoslaw Tyl <radoslawx.tyl@intel.com> > Tested-by: Andrew Bowers <andrewx.bowers@intel.com> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > index 140e87a10ff5..ddc22557155b 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c > @@ -3577,12 +3577,18 @@ static void ixgbe_setup_mtqc(struct ixgbe_adapter *adapter) > else > mtqc |= IXGBE_MTQC_64VF; > } else { > - if (tcs > 4) > + if (tcs > 4) { > mtqc = IXGBE_MTQC_RT_ENA | IXGBE_MTQC_8TC_8TQ; > - else if (tcs > 1) > + } else if (tcs > 1) { > mtqc = IXGBE_MTQC_RT_ENA | IXGBE_MTQC_4TC_4TQ; > - else > - mtqc = IXGBE_MTQC_64Q_1PB; > + } else { > + u8 max_txq = adapter->num_tx_queues + > + adapter->num_xdp_queues; Empty line needed here, after declaration. > + if (max_txq > 63) > + mtqc = IXGBE_MTQC_RT_ENA | IXGBE_MTQC_4TC_4TQ; > + else > + mtqc = IXGBE_MTQC_64Q_1PB; > + } > } > > IXGBE_WRITE_REG(hw, IXGBE_MTQC, mtqc); MBR, Sergei
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index 140e87a10ff5..ddc22557155b 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -3577,12 +3577,18 @@ static void ixgbe_setup_mtqc(struct ixgbe_adapter *adapter) else mtqc |= IXGBE_MTQC_64VF; } else { - if (tcs > 4) + if (tcs > 4) { mtqc = IXGBE_MTQC_RT_ENA | IXGBE_MTQC_8TC_8TQ; - else if (tcs > 1) + } else if (tcs > 1) { mtqc = IXGBE_MTQC_RT_ENA | IXGBE_MTQC_4TC_4TQ; - else - mtqc = IXGBE_MTQC_64Q_1PB; + } else { + u8 max_txq = adapter->num_tx_queues + + adapter->num_xdp_queues; + if (max_txq > 63) + mtqc = IXGBE_MTQC_RT_ENA | IXGBE_MTQC_4TC_4TQ; + else + mtqc = IXGBE_MTQC_64Q_1PB; + } } IXGBE_WRITE_REG(hw, IXGBE_MTQC, mtqc);