diff options
Diffstat (limited to 'drivers/net/igb/e1000_nvm.c')
-rw-r--r-- | drivers/net/igb/e1000_nvm.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/igb/e1000_nvm.c b/drivers/net/igb/e1000_nvm.c index 780ba798ce8f..a84e4e429fa7 100644 --- a/drivers/net/igb/e1000_nvm.c +++ b/drivers/net/igb/e1000_nvm.c | |||
@@ -202,7 +202,7 @@ s32 igb_acquire_nvm(struct e1000_hw *hw) | |||
202 | if (!timeout) { | 202 | if (!timeout) { |
203 | eecd &= ~E1000_EECD_REQ; | 203 | eecd &= ~E1000_EECD_REQ; |
204 | wr32(E1000_EECD, eecd); | 204 | wr32(E1000_EECD, eecd); |
205 | hw_dbg(hw, "Could not acquire NVM grant\n"); | 205 | hw_dbg("Could not acquire NVM grant\n"); |
206 | ret_val = -E1000_ERR_NVM; | 206 | ret_val = -E1000_ERR_NVM; |
207 | } | 207 | } |
208 | 208 | ||
@@ -337,7 +337,7 @@ static s32 igb_ready_nvm_eeprom(struct e1000_hw *hw) | |||
337 | } | 337 | } |
338 | 338 | ||
339 | if (!timeout) { | 339 | if (!timeout) { |
340 | hw_dbg(hw, "SPI NVM Status error\n"); | 340 | hw_dbg("SPI NVM Status error\n"); |
341 | ret_val = -E1000_ERR_NVM; | 341 | ret_val = -E1000_ERR_NVM; |
342 | goto out; | 342 | goto out; |
343 | } | 343 | } |
@@ -368,7 +368,7 @@ s32 igb_read_nvm_eerd(struct e1000_hw *hw, u16 offset, u16 words, u16 *data) | |||
368 | */ | 368 | */ |
369 | if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) || | 369 | if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) || |
370 | (words == 0)) { | 370 | (words == 0)) { |
371 | hw_dbg(hw, "nvm parameter(s) out of bounds\n"); | 371 | hw_dbg("nvm parameter(s) out of bounds\n"); |
372 | ret_val = -E1000_ERR_NVM; | 372 | ret_val = -E1000_ERR_NVM; |
373 | goto out; | 373 | goto out; |
374 | } | 374 | } |
@@ -414,7 +414,7 @@ s32 igb_write_nvm_spi(struct e1000_hw *hw, u16 offset, u16 words, u16 *data) | |||
414 | */ | 414 | */ |
415 | if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) || | 415 | if ((offset >= nvm->word_size) || (words > (nvm->word_size - offset)) || |
416 | (words == 0)) { | 416 | (words == 0)) { |
417 | hw_dbg(hw, "nvm parameter(s) out of bounds\n"); | 417 | hw_dbg("nvm parameter(s) out of bounds\n"); |
418 | ret_val = -E1000_ERR_NVM; | 418 | ret_val = -E1000_ERR_NVM; |
419 | goto out; | 419 | goto out; |
420 | } | 420 | } |
@@ -489,14 +489,14 @@ s32 igb_read_part_num(struct e1000_hw *hw, u32 *part_num) | |||
489 | 489 | ||
490 | ret_val = hw->nvm.ops.read_nvm(hw, NVM_PBA_OFFSET_0, 1, &nvm_data); | 490 | ret_val = hw->nvm.ops.read_nvm(hw, NVM_PBA_OFFSET_0, 1, &nvm_data); |
491 | if (ret_val) { | 491 | if (ret_val) { |
492 | hw_dbg(hw, "NVM Read Error\n"); | 492 | hw_dbg("NVM Read Error\n"); |
493 | goto out; | 493 | goto out; |
494 | } | 494 | } |
495 | *part_num = (u32)(nvm_data << 16); | 495 | *part_num = (u32)(nvm_data << 16); |
496 | 496 | ||
497 | ret_val = hw->nvm.ops.read_nvm(hw, NVM_PBA_OFFSET_1, 1, &nvm_data); | 497 | ret_val = hw->nvm.ops.read_nvm(hw, NVM_PBA_OFFSET_1, 1, &nvm_data); |
498 | if (ret_val) { | 498 | if (ret_val) { |
499 | hw_dbg(hw, "NVM Read Error\n"); | 499 | hw_dbg("NVM Read Error\n"); |
500 | goto out; | 500 | goto out; |
501 | } | 501 | } |
502 | *part_num |= nvm_data; | 502 | *part_num |= nvm_data; |
@@ -522,7 +522,7 @@ s32 igb_read_mac_addr(struct e1000_hw *hw) | |||
522 | offset = i >> 1; | 522 | offset = i >> 1; |
523 | ret_val = hw->nvm.ops.read_nvm(hw, offset, 1, &nvm_data); | 523 | ret_val = hw->nvm.ops.read_nvm(hw, offset, 1, &nvm_data); |
524 | if (ret_val) { | 524 | if (ret_val) { |
525 | hw_dbg(hw, "NVM Read Error\n"); | 525 | hw_dbg("NVM Read Error\n"); |
526 | goto out; | 526 | goto out; |
527 | } | 527 | } |
528 | hw->mac.perm_addr[i] = (u8)(nvm_data & 0xFF); | 528 | hw->mac.perm_addr[i] = (u8)(nvm_data & 0xFF); |
@@ -556,14 +556,14 @@ s32 igb_validate_nvm_checksum(struct e1000_hw *hw) | |||
556 | for (i = 0; i < (NVM_CHECKSUM_REG + 1); i++) { | 556 | for (i = 0; i < (NVM_CHECKSUM_REG + 1); i++) { |
557 | ret_val = hw->nvm.ops.read_nvm(hw, i, 1, &nvm_data); | 557 | ret_val = hw->nvm.ops.read_nvm(hw, i, 1, &nvm_data); |
558 | if (ret_val) { | 558 | if (ret_val) { |
559 | hw_dbg(hw, "NVM Read Error\n"); | 559 | hw_dbg("NVM Read Error\n"); |
560 | goto out; | 560 | goto out; |
561 | } | 561 | } |
562 | checksum += nvm_data; | 562 | checksum += nvm_data; |
563 | } | 563 | } |
564 | 564 | ||
565 | if (checksum != (u16) NVM_SUM) { | 565 | if (checksum != (u16) NVM_SUM) { |
566 | hw_dbg(hw, "NVM Checksum Invalid\n"); | 566 | hw_dbg("NVM Checksum Invalid\n"); |
567 | ret_val = -E1000_ERR_NVM; | 567 | ret_val = -E1000_ERR_NVM; |
568 | goto out; | 568 | goto out; |
569 | } | 569 | } |
@@ -589,7 +589,7 @@ s32 igb_update_nvm_checksum(struct e1000_hw *hw) | |||
589 | for (i = 0; i < NVM_CHECKSUM_REG; i++) { | 589 | for (i = 0; i < NVM_CHECKSUM_REG; i++) { |
590 | ret_val = hw->nvm.ops.read_nvm(hw, i, 1, &nvm_data); | 590 | ret_val = hw->nvm.ops.read_nvm(hw, i, 1, &nvm_data); |
591 | if (ret_val) { | 591 | if (ret_val) { |
592 | hw_dbg(hw, "NVM Read Error while updating checksum.\n"); | 592 | hw_dbg("NVM Read Error while updating checksum.\n"); |
593 | goto out; | 593 | goto out; |
594 | } | 594 | } |
595 | checksum += nvm_data; | 595 | checksum += nvm_data; |
@@ -597,7 +597,7 @@ s32 igb_update_nvm_checksum(struct e1000_hw *hw) | |||
597 | checksum = (u16) NVM_SUM - checksum; | 597 | checksum = (u16) NVM_SUM - checksum; |
598 | ret_val = hw->nvm.ops.write_nvm(hw, NVM_CHECKSUM_REG, 1, &checksum); | 598 | ret_val = hw->nvm.ops.write_nvm(hw, NVM_CHECKSUM_REG, 1, &checksum); |
599 | if (ret_val) | 599 | if (ret_val) |
600 | hw_dbg(hw, "NVM Write Error while updating checksum.\n"); | 600 | hw_dbg("NVM Write Error while updating checksum.\n"); |
601 | 601 | ||
602 | out: | 602 | out: |
603 | return ret_val; | 603 | return ret_val; |