From: Tony Nguyen <anthony.l.nguyen@intel.com>
To: davem@davemloft.net
Cc: Gal Hammer <ghammer@redhat.com>,
netdev@vger.kernel.org, nhorman@redhat.com, sassmann@redhat.com,
anthony.l.nguyen@intel.com, Aaron Brown <aaron.f.brown@intel.com>
Subject: [net-next v2 02/15] igb: read PBA number from flash
Date: Mon, 28 Sep 2020 14:50:05 -0700 [thread overview]
Message-ID: <20200928215018.952991-3-anthony.l.nguyen@intel.com> (raw)
In-Reply-To: <20200928215018.952991-1-anthony.l.nguyen@intel.com>
From: Gal Hammer <ghammer@redhat.com>
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>
---
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 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);
--
2.26.2
next prev parent reply other threads:[~2020-09-28 23:54 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-28 21:50 [net-next v2 00/15] 1GbE Intel Wired LAN Driver Updates 2020-09-28 Tony Nguyen
2020-09-28 21:50 ` Tony Nguyen [this message]
2020-09-28 21:50 ` [net-next v2 04/15] igc: Rename IGC_TSYNCTXCTL_VALID macro Tony Nguyen
2020-09-28 21:50 ` [net-next v2 05/15] igc: Don't reschedule ptp_tx work Tony Nguyen
2020-09-28 21:50 ` [net-next v2 06/15] igc: Remove timeout check from " Tony Nguyen
2020-09-28 21:50 ` [net-next v2 07/15] igc: Clean RX descriptor error flags Tony Nguyen
2020-09-28 21:50 ` [net-next v2 08/15] igc: Expose LPI counters Tony Nguyen
2020-09-28 21:50 ` [net-next v2 09/15] igc: Remove references to SYSTIMR register Tony Nguyen
2020-09-28 21:50 ` [net-next v2 10/15] igc: Save PTP time before a reset Tony Nguyen
2020-09-28 21:50 ` [net-next v2 11/15] igc: Remove reset disable flag Tony Nguyen
2020-09-28 21:50 ` [net-next v2 12/15] igc: Export a way to read the PTP timer Tony Nguyen
2020-09-28 21:50 ` [net-next v2 13/15] igc: Reject schedules with a base_time in the future Tony Nguyen
2020-09-28 21:50 ` [net-next v2 14/15] igc: Clean up nvm_info structure Tony Nguyen
2020-09-28 21:50 ` [net-next v2 15/15] e1000e: Add support for Meteor Lake Tony Nguyen
2020-09-28 21:54 ` [net-next v2 00/15] 1GbE Intel Wired LAN Driver Updates 2020-09-28 David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200928215018.952991-3-anthony.l.nguyen@intel.com \
--to=anthony.l.nguyen@intel.com \
--cc=aaron.f.brown@intel.com \
--cc=davem@davemloft.net \
--cc=ghammer@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=nhorman@redhat.com \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.