From: York Sun <yorksun@freescale.com>
Date: Fri, 17 Oct 2014 20:44:06 +0000 (-0700)
Subject: net/e1000: Fix EEPROM access error
X-Git-Tag: v2015.01-rc1~102
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=76f8cdb2036bf86ec7193ed13129797f0a32d13d;p=u-boot

net/e1000: Fix EEPROM access error

Commit 951860634fdb557bbb58e0f99215391bc0c29779 may have changed
the logic unintentially from "if (!(swfw_sync & (fwmask | swmask)))"
to "if ((swfw_sync & swmask) && !(swfw_sync & fwmask))". This change
breaks some e1000 NIC with a message "ERROR: Unable to read EEPROM!".

Signed-off-by: York Sun <yorksun@freescale.com>
CC: Marek Vasut <marex@denx.de>
CC: Tim Harvey <tharvey@gateworks.com>
Acked-by: Marcel Ziswiler <marcel@ziswiler.com>
---

diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 6e8765cf7b..b092867272 100644
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -1113,7 +1113,7 @@ e1000_swfw_sync_acquire(struct e1000_hw *hw, uint16_t mask)
 			return -E1000_ERR_SWFW_SYNC;
 
 		swfw_sync = E1000_READ_REG(hw, SW_FW_SYNC);
-		if ((swfw_sync & swmask) && !(swfw_sync & fwmask))
+		if (!(swfw_sync & (fwmask | swmask)))
 			break;
 
 		/* firmware currently using resource (fwmask) */