Commit 9150b76a authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Jeff Garzik
Browse files

e1000: remove irq_sem 



irq_sem was just a hack to prevent interrupts from being enabled
unexpectedly in deep call paths.  Simply finding those call paths and
fixing them by hand results in a driver that behaves as we expect and
doesn't need the atomic at all.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 74ef9c39

drivers/net/e1000/e1000.h

+0 −1
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ struct e1000_adapter { 
#ifdef CONFIG_E1000_NAPI

	spinlock_t tx_queue_lock;

#endif

	atomic_t irq_sem;

	unsigned int total_tx_bytes;

	unsigned int total_tx_packets;

	unsigned int total_rx_bytes;

drivers/net/e1000/e1000_main.c

+15 −26
Original line number Diff line number Diff line
@@ -347,7 +347,6 @@ static void e1000_free_irq(struct e1000_adapter *adapter) 
static void

e1000_irq_disable(struct e1000_adapter *adapter)

{

	atomic_inc(&adapter->irq_sem);

	E1000_WRITE_REG(&adapter->hw, IMC, ~0);

	E1000_WRITE_FLUSH(&adapter->hw);

	synchronize_irq(adapter->pdev->irq);
@@ -361,11 +360,9 @@ e1000_irq_disable(struct e1000_adapter *adapter) 
static void

e1000_irq_enable(struct e1000_adapter *adapter)

{

	if (likely(atomic_dec_and_test(&adapter->irq_sem))) {

	E1000_WRITE_REG(&adapter->hw, IMS, IMS_ENABLE_MASK);

	E1000_WRITE_FLUSH(&adapter->hw);

}

}



static void

e1000_update_mng_vlan(struct e1000_adapter *adapter)
@@ -638,7 +635,6 @@ e1000_down(struct e1000_adapter *adapter) 


#ifdef CONFIG_E1000_NAPI

	napi_disable(&adapter->napi);

	atomic_set(&adapter->irq_sem, 0);

#endif

	e1000_irq_disable(adapter);
@@ -1396,7 +1392,6 @@ e1000_sw_init(struct e1000_adapter *adapter) 
#endif



	/* Explicitly disable IRQ since the NIC can be in any state. */

	atomic_set(&adapter->irq_sem, 0);

	e1000_irq_disable(adapter);



	spin_lock_init(&adapter->stats_lock);
@@ -3836,11 +3831,8 @@ e1000_intr_msi(int irq, void *data) 
#endif

	uint32_t icr = E1000_READ_REG(hw, ICR);



#ifdef CONFIG_E1000_NAPI

	/* read ICR disables interrupts using IAM, so keep up with our

	 * enable/disable accounting */

	atomic_inc(&adapter->irq_sem);

#endif

	/* in NAPI mode read ICR disables interrupts using IAM */



	if (icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {

		hw->get_link_status = 1;

		/* 80003ES2LAN workaround-- For packet buffer work-around on
@@ -3910,12 +3902,8 @@ e1000_intr(int irq, void *data) 
	             !(icr & E1000_ICR_INT_ASSERTED)))

		return IRQ_NONE;



	/* Interrupt Auto-Mask...upon reading ICR,

	 * interrupts are masked.  No need for the

	 * IMC write, but it does mean we should

	 * account for it ASAP. */

	if (likely(hw->mac_type >= e1000_82571))

		atomic_inc(&adapter->irq_sem);

	/* Interrupt Auto-Mask...upon reading ICR, interrupts are masked.  No

	 * need for the IMC write */

#endif



	if (unlikely(icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC))) {
@@ -3939,7 +3927,6 @@ e1000_intr(int irq, void *data) 
#ifdef CONFIG_E1000_NAPI

	if (unlikely(hw->mac_type < e1000_82571)) {

		/* disable interrupts, without the synchronize_irq bit */

		atomic_inc(&adapter->irq_sem);

		E1000_WRITE_REG(hw, IMC, ~0);

		E1000_WRITE_FLUSH(hw);

	}
@@ -3964,10 +3951,8 @@ e1000_intr(int irq, void *data) 
	 * in dead lock. Writing IMC forces 82547 into

	 * de-assertion state.

	 */

	if (hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2) {

		atomic_inc(&adapter->irq_sem);

	if (hw->mac_type == e1000_82547 || hw->mac_type == e1000_82547_rev_2)

		E1000_WRITE_REG(hw, IMC, ~0);

	}



	adapter->total_tx_bytes = 0;

	adapter->total_rx_bytes = 0;
@@ -5001,6 +4986,7 @@ e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp) 
	struct e1000_adapter *adapter = netdev_priv(netdev);

	uint32_t ctrl, rctl;



	if (!test_bit(__E1000_DOWN, &adapter->flags))

		e1000_irq_disable(adapter);

	adapter->vlgrp = grp;
@@ -5038,6 +5024,7 @@ e1000_vlan_rx_register(struct net_device *netdev, struct vlan_group *grp) 
		}

	}



	if (!test_bit(__E1000_DOWN, &adapter->flags))

		e1000_irq_enable(adapter);

}
@@ -5064,8 +5051,10 @@ e1000_vlan_rx_kill_vid(struct net_device *netdev, uint16_t vid) 
	struct e1000_adapter *adapter = netdev_priv(netdev);

	uint32_t vfta, index;



	if (!test_bit(__E1000_DOWN, &adapter->flags))

		e1000_irq_disable(adapter);

	vlan_group_set_device(adapter->vlgrp, vid, NULL);

	if (!test_bit(__E1000_DOWN, &adapter->flags))

		e1000_irq_enable(adapter);



	if ((adapter->hw.mng_cookie.status &

CRA Git | Maintained and supported by SUSTech CRA and CCSE