svn commit: r344031 - stable/12/sys/dev/e1000

[Patrick Kelsey]

Author: pkelsey
Date: Tue Feb 12 00:00:32 2019
New Revision: 344031
URL: https://svnweb.freebsd.org/changeset/base/344031

Log:
  MFC r343919:
  Fix em(4) interrupt routing
  
  When configured with more tx queues than rx queues,
  em_if_msix_intr_assign() was incorrectly routing the tx event
  interrupts.
  
  Reviewed by:	erj, marius
  Differential Revision:	https://reviews.freebsd.org/D19070

Modified:
  stable/12/sys/dev/e1000/if_em.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/e1000/if_em.c
==============================================================================
--- stable/12/sys/dev/e1000/if_em.c	Mon Feb 11 23:35:34 2019	(r344030)
+++ stable/12/sys/dev/e1000/if_em.c	Tue Feb 12 00:00:32 2019	(r344031)
@@ -1988,7 +1988,7 @@ em_if_msix_intr_assign(if_ctx_t ctx, int msix)
 		    &adapter->rx_queues[i % adapter->rx_num_queues].que_irq,
 		    IFLIB_INTR_TX, tx_que, tx_que->me, buf);
 
-		tx_que->msix = (vector % adapter->tx_num_queues);
+		tx_que->msix = (vector % adapter->rx_num_queues);
 
 		/*
 		 * Set the bit to enable interrupt
@@ -2001,9 +2001,9 @@ em_if_msix_intr_assign(if_ctx_t ctx, int msix)
 			adapter->ims |= tx_que->eims;
 			adapter->ivars |= (8 | tx_que->msix) << (8 + (i * 4));
 		} else if (adapter->hw.mac.type == e1000_82575) {
-			tx_que->eims = E1000_EICR_TX_QUEUE0 << (i %  adapter->tx_num_queues);
+			tx_que->eims = E1000_EICR_TX_QUEUE0 << i;
 		} else {
-			tx_que->eims = 1 << (i %  adapter->tx_num_queues);
+			tx_que->eims = 1 << i;
 		}
 	}