summaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorGal Hammer <ghammer@redhat.com>2020-08-30 08:45:29 +0300
committerTony Nguyen <anthony.l.nguyen@intel.com>2020-09-29 00:42:45 +0300
commit2fc1d8ee1ed2dbf932419feb6c538fb82c5f4f76 (patch)
tree0a3e049f1ea7d8e5b842c4d85de0a38c5df4e1d9 /drivers/net
parent9cbc948b5a20c9c054d9631099c0426c16da546b (diff)
downloadlinux-2fc1d8ee1ed2dbf932419feb6c538fb82c5f4f76.tar.xz
igb: read PBA number from flash
Fixed flash presence check for 82576 controllers so the part number string is read and displayed correctly. Signed-off-by: Gal Hammer <ghammer@redhat.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/intel/igb/igb_main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index e53ed2de5cce..368f950f68b1 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -3532,7 +3532,9 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
"Width x1" : "unknown"), netdev->dev_addr);
}
- if ((hw->mac.type >= e1000_i210 ||
+ if ((hw->mac.type == e1000_82576 &&
+ rd32(E1000_EECD) & E1000_EECD_PRES) ||
+ (hw->mac.type >= e1000_i210 ||
igb_get_flash_presence_i210(hw))) {
ret_val = igb_read_part_string(hw, part_str,
E1000_PBANUM_LENGTH);