[PATCH v2 2/3] e1000: implement support for smaller flash chips

[Uwe Kleine-König]

Even though the register description of the FLA register suggests (on
page 386 of the i210 datasheet (rev. 3.1)) that 2 MB, 4 MB and 8 MB are
the only supported flash sizes, the list of supported flashes (on page
794 of the same document) lists for example a Micron M25PE80 which only
has a size of 1 MB.

Also in general it seems sensible to stick to the formula given for the
meaning of the values that are not explicitly listed.

Acked-by: Andrey Smirnov <andrew.smirnov at gmail.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
---
 drivers/net/e1000/e1000.h  |  3 ---
 drivers/net/e1000/eeprom.c | 14 +++-----------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index 45514629dd72..f2da08b4d5c1 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -2105,9 +2105,6 @@ struct e1000_eeprom_info {
 #define E1000_FLA			0x1201C
 #define E1000_FLA_FL_SIZE_SHIFT		17
 #define E1000_FLA_FL_SIZE_MASK		(0b111 << E1000_FLA_FL_SIZE_SHIFT) /* EEprom Size */
-#define E1000_FLA_FL_SIZE_2MB		0b101
-#define E1000_FLA_FL_SIZE_4MB		0b110
-#define E1000_FLA_FL_SIZE_8MB		0b111
 
 
 #define E1000_FLSWCTL_ADDR(a)		((a) & 0x00FFFFFF)
diff --git a/drivers/net/e1000/eeprom.c b/drivers/net/e1000/eeprom.c
index 1a0c6e15abef..739bc17a519e 100644
--- a/drivers/net/e1000/eeprom.c
+++ b/drivers/net/e1000/eeprom.c
@@ -414,17 +414,9 @@ int32_t e1000_init_eeprom_params(struct e1000_hw *hw)
 			fla &= E1000_FLA_FL_SIZE_MASK;
 			fla >>= E1000_FLA_FL_SIZE_SHIFT;
 
-			switch (fla) {
-			case E1000_FLA_FL_SIZE_8MB:
-				eeprom->word_size = SZ_8M / 2;
-				break;
-			case E1000_FLA_FL_SIZE_4MB:
-				eeprom->word_size = SZ_4M / 2;
-				break;
-			case E1000_FLA_FL_SIZE_2MB:
-				eeprom->word_size = SZ_2M / 2;
-				break;
-			default:
+			if (fla) {
+				eeprom->word_size = (SZ_64K << fla) / 2;
+			} else {
 				eeprom->word_size = 2048;
 				dev_info(hw->dev, "Unprogrammed Flash detected, "
 					 "limiting access to first 4KB\n");
-- 
2.11.0