Nico Huber has uploaded this change for review.

View Change

fixup! nicintel_eeprom: Support for I210 emulated EEprom

Fix is_i210(), add a comment and break an overlong line.

Change-Id: I5d3f71e4e0f77cc8793e7f395baf69e1fad930a3
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/21934
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
(cherry picked from commit 4343e7d44006dcda2ea76b0e7625837832141539)
---
M nicintel_eeprom.c
1 file changed, 7 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/31/22331/1

diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c
index e4a91ef..c787580 100644
--- a/nicintel_eeprom.c
+++ b/nicintel_eeprom.c
@@ -80,6 +80,10 @@
 
 #define UNPROG_DEVICE 0x1509
 
+/*
+ * Warning: is_i210() below makes assumptions on these PCI ids.
+ *          It may have to be updated when this list is extended.
+ */
 const struct dev_entry nics_intel_ee[] = {
 	{PCI_VENDOR_ID_INTEL, 0x150e, OK, "Intel", "82580 Quad Gigabit Ethernet Controller (Copper)"},
 	{PCI_VENDOR_ID_INTEL, 0x150f, NT , "Intel", "82580 Quad Gigabit Ethernet Controller (Fiber)"},
@@ -99,7 +103,7 @@
 
 static inline bool is_i210(uint16_t device_id)
 {
-	return (device_id & 0xff00) == 0x1500;
+	return (device_id & 0xfff0) == 0x1530;
 }
 
 static int nicintel_ee_probe_i210(struct flashctx *flash)
@@ -218,7 +222,8 @@
 	return -1;
 }
 
-static int nicintel_ee_write_i210(struct flashctx *flash, const uint8_t *buf, unsigned int addr, unsigned int len)
+static int nicintel_ee_write_i210(struct flashctx *flash, const uint8_t *buf,
+				  unsigned int addr, unsigned int len)
 {
 	done_i20_write = true;
 

To view, visit change 22331. To unsubscribe, visit settings.