Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a61cfe4f authored by Benjamin Poirier's avatar Benjamin Poirier Committed by Jeff Kirsher
Browse files

e1000e: Do not write lsc to ics in msi-x mode 



In msi-x mode, there is no handler for the lsc interrupt so there is no
point in writing that to ics now that we always assume Other interrupts
are caused by lsc.

Reviewed-by: default avatarJasna Hodzic <jhodzic@ucdavis.edu>
Signed-off-by: default avatarBenjamin Poirier <bpoirier@suse.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 16ecba59

drivers/net/ethernet/intel/e1000e/defines.h

+2 −1
Original line number Diff line number Diff line
@@ -441,12 +441,13 @@ 
#define E1000_IMS_RXQ1      E1000_ICR_RXQ1      /* Rx Queue 1 Interrupt */

#define E1000_IMS_TXQ0      E1000_ICR_TXQ0      /* Tx Queue 0 Interrupt */

#define E1000_IMS_TXQ1      E1000_ICR_TXQ1      /* Tx Queue 1 Interrupt */

#define E1000_IMS_OTHER     E1000_ICR_OTHER     /* Other Interrupts */

#define E1000_IMS_OTHER     E1000_ICR_OTHER     /* Other Interrupt */



/* Interrupt Cause Set */

#define E1000_ICS_LSC       E1000_ICR_LSC       /* Link Status Change */

#define E1000_ICS_RXSEQ     E1000_ICR_RXSEQ     /* Rx sequence error */

#define E1000_ICS_RXDMT0    E1000_ICR_RXDMT0    /* Rx desc min. threshold */

#define E1000_ICS_OTHER     E1000_ICR_OTHER     /* Other Interrupt */



/* Transmit Descriptor Control */

#define E1000_TXDCTL_PTHRESH 0x0000003F /* TXDCTL Prefetch Threshold */

drivers/net/ethernet/intel/e1000e/netdev.c

+17 −11
Original line number Diff line number Diff line
@@ -4132,10 +4132,24 @@ void e1000e_reset(struct e1000_adapter *adapter) 


}



void e1000e_up(struct e1000_adapter *adapter)

/**

 * e1000e_trigger_lsc - trigger an LSC interrupt

 * @adapter: 

 *

 * Fire a link status change interrupt to start the watchdog.

 **/

static void e1000e_trigger_lsc(struct e1000_adapter *adapter)

{

	struct e1000_hw *hw = &adapter->hw;



	if (adapter->msix_entries)

		ew32(ICS, E1000_ICS_OTHER);

	else

		ew32(ICS, E1000_ICS_LSC);

}



void e1000e_up(struct e1000_adapter *adapter)

{

	/* hardware has been reset, we need to reload some things */

	e1000_configure(adapter);
@@ -4147,11 +4161,7 @@ void e1000e_up(struct e1000_adapter *adapter) 


	netif_start_queue(adapter->netdev);



	/* fire a link change interrupt to start the watchdog */

	if (adapter->msix_entries)

		ew32(ICS, E1000_ICS_LSC | E1000_ICR_OTHER);

	else

		ew32(ICS, E1000_ICS_LSC);

	e1000e_trigger_lsc(adapter);

}



static void e1000e_flush_descriptors(struct e1000_adapter *adapter)
@@ -4576,11 +4586,7 @@ static int e1000_open(struct net_device *netdev) 
	hw->mac.get_link_status = true;

	pm_runtime_put(&pdev->dev);



	/* fire a link status change interrupt to start the watchdog */

	if (adapter->msix_entries)

		ew32(ICS, E1000_ICS_LSC | E1000_ICR_OTHER);

	else

		ew32(ICS, E1000_ICS_LSC);

	e1000e_trigger_lsc(adapter);



	return 0;