diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2017-11-23 12:12:37 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-11-24 10:06:14 +0100 |
| commit | 11369280720fab436dd4256157a7ff69857b0653 (patch) | |
| tree | 6b834614f3121cac95213ef4eda970c8e09db9db /drivers/net/e1000 | |
| parent | 2cf2fda0bebe48bba9279b5b12ffad7bfc133fb2 (diff) | |
| download | barebox-11369280720fab436dd4256157a7ff69857b0653.tar.gz barebox-11369280720fab436dd4256157a7ff69857b0653.tar.xz | |
net/e1000: expand timeout for flash erasure
Erasing the whole flash takes approximately 7s on one of my test
machines. Expand the timeout accordingly.
Note however that it is in general not allowed to hold the flash
semaphore for so long and "firmware might implement a timeout
mechanism and take ownership of the relevant [lock]" after one second.
So a chip erase should better only be done when firmware doesn't make
use of the flash.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net/e1000')
| -rw-r--r-- | drivers/net/e1000/eeprom.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c index 0d91a88bd7..0f1305c849 100644 --- a/drivers/net/e1000/eeprom.c +++ b/drivers/net/e1000/eeprom.c @@ -854,7 +854,7 @@ static int e1000_flash_mode_erase_chunk(struct e1000_hw *hw, loff_t offset, ret = e1000_poll_reg(hw, E1000_FLSWCTL, E1000_FLSWCTL_DONE | E1000_FLSWCTL_FLBUSY, E1000_FLSWCTL_DONE, - SECOND); + 10 * SECOND); if (ret < 0) { dev_err(hw->dev, "Timeout waiting for FLSWCTL.DONE to be set (erase)\n"); |