|
@@ -1129,8 +1129,10 @@ static struct igb_reg_test reg_test_82576[] = {
|
|
|
{ E1000_RDBAH(4), 0x40, 12, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
|
|
|
{ E1000_RDLEN(4), 0x40, 12, PATTERN_TEST, 0x000FFFF0, 0x000FFFFF },
|
|
|
/* Enable all RX queues before testing. */
|
|
|
- { E1000_RXDCTL(0), 0x100, 4, WRITE_NO_TEST, 0, E1000_RXDCTL_QUEUE_ENABLE },
|
|
|
- { E1000_RXDCTL(4), 0x40, 12, WRITE_NO_TEST, 0, E1000_RXDCTL_QUEUE_ENABLE },
|
|
|
+ { E1000_RXDCTL(0), 0x100, 4, WRITE_NO_TEST, 0,
|
|
|
+ E1000_RXDCTL_QUEUE_ENABLE },
|
|
|
+ { E1000_RXDCTL(4), 0x40, 12, WRITE_NO_TEST, 0,
|
|
|
+ E1000_RXDCTL_QUEUE_ENABLE },
|
|
|
/* RDH is read-only for 82576, only test RDT. */
|
|
|
{ E1000_RDT(0), 0x100, 4, PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
|
|
|
{ E1000_RDT(4), 0x40, 12, PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
|
|
@@ -1167,7 +1169,8 @@ static struct igb_reg_test reg_test_82575[] = {
|
|
|
{ E1000_RDBAH(0), 0x100, 4, PATTERN_TEST, 0xFFFFFFFF, 0xFFFFFFFF },
|
|
|
{ E1000_RDLEN(0), 0x100, 4, PATTERN_TEST, 0x000FFF80, 0x000FFFFF },
|
|
|
/* Enable all four RX queues before testing. */
|
|
|
- { E1000_RXDCTL(0), 0x100, 4, WRITE_NO_TEST, 0, E1000_RXDCTL_QUEUE_ENABLE },
|
|
|
+ { E1000_RXDCTL(0), 0x100, 4, WRITE_NO_TEST, 0,
|
|
|
+ E1000_RXDCTL_QUEUE_ENABLE },
|
|
|
/* RDH is read-only for 82575, only test RDT. */
|
|
|
{ E1000_RDT(0), 0x100, 4, PATTERN_TEST, 0x0000FFFF, 0x0000FFFF },
|
|
|
{ E1000_RXDCTL(0), 0x100, 4, WRITE_NO_TEST, 0, 0 },
|
|
@@ -1220,8 +1223,8 @@ static bool reg_set_and_check(struct igb_adapter *adapter, u64 *data,
|
|
|
val = rd32(reg);
|
|
|
if ((write & mask) != (val & mask)) {
|
|
|
dev_err(&adapter->pdev->dev,
|
|
|
- "set/check reg %04X test failed: got 0x%08X expected 0x%08X\n", reg,
|
|
|
- (val & mask), (write & mask));
|
|
|
+ "set/check reg %04X test failed: got 0x%08X expected 0x%08X\n",
|
|
|
+ reg, (val & mask), (write & mask));
|
|
|
*data = reg;
|
|
|
return 1;
|
|
|
}
|