| Message ID | 1413578646-18119-1-git-send-email-yorksun@freescale.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Friday, October 17, 2014 at 10:44:06 PM, York Sun wrote: > 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> > --- > Marek, please take a look at this change. I have no knowledge about > e1000 driver. So I don't know if the original change was intended. > Reverting this change fixes the problem I have on my board. > > drivers/net/e1000.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c > index 6e8765c..b092867 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) */ +CC Marcel. Marcel, can you please take a look at this and test this with i210 card ? Thanks! Best regards, Marek Vasut
On Sat, 2014-10-18 at 01:40 +0200, Marek Vasut wrote: > +CC Marcel. Marcel, can you please take a look at this and test this with i210 > card ? Good catch. Yes, I can confirm that this properly fixes at least one of the remaining issues as previously seen on the i210/i211. Acked-by: Marcel Ziswiler <marcel@ziswiler.com>
On Fri, Oct 17, 2014 at 01:44:06PM -0700, York Sun wrote: > 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> Applied to u-boot/master, thanks!
diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c index 6e8765c..b092867 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) */
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> --- Marek, please take a look at this change. I have no knowledge about e1000 driver. So I don't know if the original change was intended. Reverting this change fixes the problem I have on my board. drivers/net/e1000.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)