e1000e: Fix ethtool register test code

PATCH Applied Auke Kok 2 participants 2 messages Oct 4, 2007 – Oct 5, 2007

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Auke Kok

author

2007-10-04 22:05 UTC #0 lore raw

PATCH 1/1 e1000e: Fix ethtool register test code

A merge/cleanup code accidentally dropped 8254x code in and removed 8257x code here. Undo this mistake and use the pci-e relevant register test similar as to what is in e1000.

Signed-off-by Auke Kok <[email protected]>

---

 drivers/net/e1000e/ethtool.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

drivers/net/e1000e/ethtool.c +10 -4

index 3423f33..2e8218f 100644
@@ -784,10 +784,16 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data)
 	REG_SET_AND_CHECK(E1000_RCTL, before, 0x003FFFFB);
 	REG_SET_AND_CHECK(E1000_TCTL, 0xFFFFFFFF, 0x00000000);
 
-	REG_SET_AND_CHECK(E1000_RCTL, 0xFFFFFFFF, 0x01FFFFFF);
-	REG_PATTERN_TEST(E1000_RDBAL, 0xFFFFF000, 0xFFFFFFFF);
-	REG_PATTERN_TEST(E1000_TXCW, 0x0000FFFF, 0x0000FFFF);
-	REG_PATTERN_TEST(E1000_TDBAL, 0xFFFFF000, 0xFFFFFFFF);
+	REG_SET_AND_CHECK(E1000_RCTL, before, 0xFFFFFFFF);
+	REG_PATTERN_TEST(E1000_RDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
+	if ((mac->type != e1000_ich8lan) &&
+	    (mac->type != e1000_ich9lan))
+		REG_PATTERN_TEST(E1000_TXCW, 0xC000FFFF, 0x0000FFFF);
+	REG_PATTERN_TEST(E1000_TDBAL, 0xFFFFFFF0, 0xFFFFFFFF);
+	REG_PATTERN_TEST(E1000_TIDV, 0x0000FFFF, 0x0000FFFF);
+	for (i = 0; i < mac->rar_entry_count; i++)
+		REG_PATTERN_TEST_ARRAY(E1000_RA, ((i << 1) + 1),
+				       0x8003FFFF, 0xFFFFFFFF);
 
 	for (i = 0; i < mac->mta_reg_count; i++)
 		REG_PATTERN_TEST_ARRAY(E1000_MTA, i, 0xFFFFFFFF, 0xFFFFFFFF);

Jeff Garzik

Applied

2007-10-05 17:56 UTC #1 lore raw

Quoted 9 lines · Auke Kok

A merge/cleanup code accidentally dropped 8254x code in and removed 8257x code here. Undo this mistake and use the pci-e relevant register test similar as to what is in e1000.
Signed-off-by Auke Kok <[email protected]>
---
 drivers/net/e1000e/ethtool.c |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

applied