Commit ad8c48ad authored by Catalin(ux aka Dino) BOIE's avatar Catalin(ux aka Dino) BOIE Committed by Jeff Garzik
Browse files

Fix io ordering problems in e100 



Checking e100.c code against Documentation/io_ordering.txt I found the
following problem:

spin_lock_irq...
write
spin-unlock
e100_write_flush

The attached patch fix the code like this:

spin_lock_irq...
write
e100_write_flush
spin-unlock

Signed-off-by: default avatarCatalin BOIE <catab@umbrella.ro>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent e72fd96e

drivers/net/e100.c

+3 −3
Original line number Diff line number Diff line
@@ -598,8 +598,8 @@ static void e100_enable_irq(struct nic *nic) 


	spin_lock_irqsave(&nic->cmd_lock, flags);

	writeb(irq_mask_none, &nic->csr->scb.cmd_hi);

	spin_unlock_irqrestore(&nic->cmd_lock, flags);

	e100_write_flush(nic);

	spin_unlock_irqrestore(&nic->cmd_lock, flags);

}



static void e100_disable_irq(struct nic *nic)
@@ -608,8 +608,8 @@ static void e100_disable_irq(struct nic *nic) 


	spin_lock_irqsave(&nic->cmd_lock, flags);

	writeb(irq_mask_all, &nic->csr->scb.cmd_hi);

	spin_unlock_irqrestore(&nic->cmd_lock, flags);

	e100_write_flush(nic);

	spin_unlock_irqrestore(&nic->cmd_lock, flags);

}



static void e100_hw_reset(struct nic *nic)
@@ -1582,8 +1582,8 @@ static void e100_watchdog(unsigned long data) 
	 * interrupt mask bit and the SW Interrupt generation bit */

	spin_lock_irq(&nic->cmd_lock);

	writeb(readb(&nic->csr->scb.cmd_hi) | irq_sw_gen,&nic->csr->scb.cmd_hi);

	spin_unlock_irq(&nic->cmd_lock);

	e100_write_flush(nic);

	spin_unlock_irq(&nic->cmd_lock);



	e100_update_stats(nic);

	e100_adjust_adaptive_ifs(nic, cmd.speed, cmd.duplex);

CRA Git | Maintained and supported by SUSTech CRA and CCSE