[realtek] Ensure EEPROM writes reach chip before starting udelay()

On some systems, it appears to be possible for writes to the EEPROM
registers to be delayed for long enough that the EEPROM's setup and
hold times are violated, resulting in invalid data being read from the
EEPROM.

Fix by inserting a PCI read cycle immediately after writes to
RTL_9346CR, to ensure that the write has completed before starting the
udelay() used to time the SPI bus transitions.

Reported-by: Gelip <mrgelip@gmail.com>
Tested-by: Gelip <mrgelip@gmail.com>
Signed-off-by: Michael Brown <mcb30@ipxe.org>

diff --git a/src/drivers/net/realtek.c b/src/drivers/net/realtek.c
index 70c0ac1c6096f9c1188cdb547e750e6bf4825b51..f7b5ec58860c5327236dd7cbd2af0f066301ca91 100644 (file)
--- a/src/drivers/net/realtek.c
+++ b/src/drivers/net/realtek.c
@@ -74,6 +74,7 @@ static void realtek_spi_open_bit ( struct bit_basher *basher ) {
 
        /* Enable EEPROM access */
        writeb ( RTL_9346CR_EEM_EEPROM, rtl->regs + RTL_9346CR );
+       readb ( rtl->regs + RTL_9346CR ); /* Ensure write reaches chip */
 }
 
 /**
@@ -87,6 +88,7 @@ static void realtek_spi_close_bit ( struct bit_basher *basher ) {
 
        /* Disable EEPROM access */
        writeb ( RTL_9346CR_EEM_NORMAL, rtl->regs + RTL_9346CR );
+       readb ( rtl->regs + RTL_9346CR ); /* Ensure write reaches chip */
 }
 
 /**
@@ -129,6 +131,7 @@ static void realtek_spi_write_bit ( struct bit_basher *basher,
        reg &= ~mask;
        reg |= ( data & mask );
        writeb ( reg, rtl->regs + RTL_9346CR );
+       readb ( rtl->regs + RTL_9346CR ); /* Ensure write reaches chip */
        DBG_ENABLE ( DBGLVL_IO );
 }