Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] igb: read PBA number from flash
@ 2020-08-30  5:45 Gal Hammer
  2020-09-04 20:21 ` Brown, Aaron F
  0 siblings, 1 reply; 3+ messages in thread
From: Gal Hammer @ 2020-08-30  5:45 UTC (permalink / raw)
  To: linux-kernel
  Cc: Jeff Kirsher, David S . Miller, Jakub Kicinski, intel-wired-lan,
	netdev, Marcel Apfelbaum, Gal Hammer

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>
---
 drivers/net/ethernet/intel/igb/igb_main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index d9c3a6b169f9..245e62b0a97e 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -3388,7 +3388,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);
-- 
2.26.2


^ permalink raw reply	[flat|nested] 3+ messages in thread
* [PATCH] igb: read PBA number from flash
@ 2020-08-20  8:54 Gal Hammer
  0 siblings, 0 replies; 3+ messages in thread
From: Gal Hammer @ 2020-08-20  8:54 UTC (permalink / raw)
  To: netdev
  Cc: Jeff Kirsher, David S . Miller, Jakub Kicinski, Marcel Apfelbaum,
	Gal Hammer

Fixed flash presence check for 82576 controllers so the part
number string is read the displayed correctly.

Signed-off-by: Gal Hammer <ghammer@redhat.com>
---
 drivers/net/ethernet/intel/igb/igb_main.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 4f05f6efe6af..9b6992adccd4 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -3389,7 +3389,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);
-- 
2.26.2


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-09-04 20:22 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-30  5:45 [PATCH] igb: read PBA number from flash Gal Hammer
2020-09-04 20:21 ` Brown, Aaron F
  -- strict thread matches above, loose matches on Subject: below --
2020-08-20  8:54 Gal Hammer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).