[net-next 3/6] igb: Don't let ethtool try to write to iNVM in i210/i211

STALE4733d SUPERSEDED

From: Jeff Kirsher <hidden>
Date: 2013-11-01 13:56:55
Subsystem: intel ethernet drivers, networking drivers, the rest · Maintainers: Tony Nguyen, Przemek Kitszel, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds

Revision v1 of 220 in this series.

Revisions (220)

2011-01-22 v1
2011-01-28 v1
2011-01-28 v1
2011-01-28 v2 [diff vs current]
2011-01-28 v1
2011-02-08 v1
2011-02-08 v1
2011-02-11 v2 [diff vs current]
2011-02-17 v1
2011-02-24 v1
2011-03-02 v1
2011-03-03 v1
2011-03-08 v1
2011-03-11 v1
2011-03-12 v1
2011-09-16 v1
2011-09-17 v1
2011-09-17 v1
2011-09-23 v2 [diff vs current]
2011-09-30 v1
2011-10-05 v3 [diff vs current]
2011-10-06 v1
2011-10-07 v1
2011-10-08 v1
2011-10-11 v2 [diff vs current]
2011-10-13 v2 [diff vs current]
2011-10-14 v1
2011-10-16 v2 [diff vs current]
2011-10-17 v1
2011-10-17 v2 [diff vs current]
2011-10-18 v3 [diff vs current]
2011-10-21 v1
2011-11-16 v1
2011-12-03 v1
2011-12-05 v2 [diff vs current]
2011-12-23 v1
2012-01-03 v1
2012-01-03 v1
2012-01-05 v2 [diff vs current]
2012-01-19 v1
2012-01-26 v1
2012-01-27 v1
2012-02-07 v1
2012-02-08 v1
2012-02-09 v2 [diff vs current]
2012-02-09 v1
2012-02-10 v2 [diff vs current]
2012-02-11 v1
2012-02-13 v1
2012-02-24 v1
2012-02-25 v1
2012-03-01 v1
2012-03-03 v1
2012-03-03 v1
2012-03-03 v1
2012-03-13 v1
2012-03-14 v1
2012-03-17 v1
2012-03-19 v1
2012-03-28 v1
2012-04-03 v1
2012-04-03 v1
2012-04-14 v1
2012-04-27 v1
2012-04-30 v1
2012-05-01 v2 [diff vs current]
2012-05-01 v1
2012-05-02 v2 [diff vs current]
2012-05-04 v1
2012-05-04 v2 [diff vs current]
2012-05-05 v1
2012-05-10 v1
2012-05-17 v1
2012-05-17 v2 [diff vs current]
2012-06-06 v1
2012-06-09 v1
2012-06-14 v1
2012-06-20 v1
2012-06-20 v1
2012-07-11 v1
2012-07-14 v1
2012-07-17 v1
2012-07-18 v1
2012-07-18 v1
2012-07-20 v1
2012-07-20 v1
2012-07-21 v1
2012-08-21 v1
2012-08-23 v1
2012-08-31 v1
2012-09-05 v1
2012-09-05 v1
2012-09-17 v1
2012-09-17 v1
2012-09-19 v1
2012-09-20 v2 [diff vs current]
2012-09-22 v1
2012-09-24 v1
2012-10-03 v1
2012-10-09 v1
2012-10-19 v1
2012-10-20 v1
2012-10-23 v1
2012-10-23 v1
2012-10-26 v1
2012-10-27 v2 [diff vs current]
2012-10-30 v1
2012-11-01 v1
2012-11-13 v1
2012-11-15 v1
2012-11-21 v1
2012-11-22 v2 [diff vs current]
2012-11-28 v1
2012-12-01 v1
2012-12-07 v1
2013-01-11 v1
2013-01-16 v2 [diff vs current]
2013-01-17 v1
2013-01-18 v2 [diff vs current]
2013-01-19 v1
2013-01-23 v1
2013-01-28 v1
2013-02-08 v1
2013-03-05 v1
2013-03-07 v1
2013-03-08 v1
2013-03-26 v1
2013-03-27 v1
2013-03-28 v1
2013-04-04 v1
2013-04-12 v1
2013-04-18 v2 [diff vs current]
2013-04-18 v1
2013-04-20 v1
2013-04-25 v2 [diff vs current]
2013-04-26 v1
2013-05-21 v1
2013-06-14 v1
2013-06-26 v1
2013-07-28 v1
2013-07-29 v1
2013-07-31 v2 [diff vs current]
2013-08-21 v1
2013-08-22 v2 [diff vs current]
2013-08-23 v2 [diff vs current]
2013-08-28 v1
2013-08-29 v2 [diff vs current]
2013-08-30 v3 [diff vs current]
2013-09-04 v1
2013-09-04 v4 [diff vs current]
2013-09-06 v1
2013-09-06 v5 [diff vs current]
2013-09-06 v6 [diff vs current]
2013-09-11 v7 [diff vs current]
2013-09-13 v1
2013-09-24 v1
2013-09-27 v2 [diff vs current]
2013-10-01 v1
2013-10-10 v1
2013-10-18 v1
2013-10-22 v2 [diff vs current]
2013-10-24 v1
2013-10-29 v1
2013-11-01 v1 current
2013-11-19 v1
2013-11-28 v1
2013-11-30 v2 [diff vs current]
2013-12-06 v1
2013-12-07 v1
2013-12-10 v1
2013-12-12 v1
2013-12-16 v2 [diff vs current]
2013-12-18 v1
2013-12-18 v1
2013-12-19 v1
2013-12-20 v2 [diff vs current]
2013-12-20 v3 [diff vs current]
2013-12-28 v4 [diff vs current]
2014-01-01 v1
2014-01-02 v1
2014-01-03 v2 [diff vs current]
2014-01-04 v5 [diff vs current]
2014-01-05 v1
2014-01-06 v1
2014-01-07 v1
2014-01-08 v2 [diff vs current]
2014-01-09 v1
2014-01-10 v1
2014-01-10 v2 [diff vs current]
2014-01-11 v3 [diff vs current]
2014-03-06 v1
2014-03-07 v2 [diff vs current]
2014-03-08 v1
2014-03-12 v1
2014-03-13 v2 [diff vs current]
2014-03-14 v1
2014-03-14 v2 [diff vs current]
2014-03-17 v1
2014-03-19 v2 [diff vs current]
2014-03-20 v3 [diff vs current]
2014-03-20 v1
2014-03-21 v1
2014-03-26 v1
2014-03-28 v2 [diff vs current]
2014-03-31 v1
2014-04-11 v1
2014-04-19 v1
2014-04-22 v1
2014-04-23 v1
2014-04-24 v1
2014-04-25 v2 [diff vs current]
2014-04-28 v1
2014-05-05 v1
2014-05-14 v1
2014-05-21 v1
2014-05-23 v2 [diff vs current]
2014-05-27 v1
2014-05-29 v1
2014-06-03 v1
2014-06-04 v2 [diff vs current]

From: "Fujinaka, Todd" <redacted>

Don't let ethtool try to write to iNVM in i210/i211.

This fixes an issue seen by Marek Vasut.

Reported-by: Marek Vasut <marex@denx.de>
Signed-off-by: Todd Fujinaka <redacted>
Signed-off-by: Jeff Kirsher <redacted>
---
 drivers/net/ethernet/intel/igb/igb_ethtool.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c
index 0ae3177..b918ba3 100644
--- a/drivers/net/ethernet/intel/igb/igb_ethtool.c
+++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c

@@ -771,8 +771,10 @@ static int igb_set_eeprom(struct net_device *netdev,
 	if (eeprom->len == 0)
 		return -EOPNOTSUPP;
 
-	if (hw->mac.type == e1000_i211)
+	if ((hw->mac.type >= e1000_i210) &&
+	    !igb_get_flash_presence_i210(hw)) {
 		return -EOPNOTSUPP;
+	}
 
 	if (eeprom->magic != (hw->vendor_id | (hw->device_id << 16)))
 		return -EFAULT;

-- 
1.8.3.1

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help