aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuinan Sun <guinanx.sun@intel.com>2020-07-06 08:11:59 +0000
committerKevin Bowling <kbowling@FreeBSD.org>2021-09-17 21:07:27 +0000
commitde0ae5d1cb896dbc04c5334ef0b864b3c841c3ce (patch)
treed2f98d6e40af3c0005e50bf82e550a4c1058d456
parent702cac6c6bf20ca43db26c38185f65fc9ed1935e (diff)
downloadsrc-de0ae5d1cb896dbc04c5334ef0b864b3c841c3ce.tar.gz
src-de0ae5d1cb896dbc04c5334ef0b864b3c841c3ce.zip
e1000: support flashless i211 PBA
Add support to print PBA when using flashless. Signed-off-by: Todd Fujinaka <todd.fujinaka@intel.com> Signed-off-by: Sasha Neftin <sasha.neftin@intel.com> Signed-off-by: Guinan Sun <guinanx.sun@intel.com> Reviewed-by: Wei Zhao <wei.zhao1@intel.com> Approved by: imp Obtained from: DPDK (d3c41d90dfd5b39dec14c74cf53086f4e6634aed) MFC after: 1 week
-rw-r--r--sys/dev/e1000/e1000_82575.c2
-rw-r--r--sys/dev/e1000/e1000_nvm.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/dev/e1000/e1000_82575.c b/sys/dev/e1000/e1000_82575.c
index d588539ca8e8..27e564d7841b 100644
--- a/sys/dev/e1000/e1000_82575.c
+++ b/sys/dev/e1000/e1000_82575.c
@@ -461,7 +461,7 @@ static s32 e1000_init_mac_params_82575(struct e1000_hw *hw)
if ((mac->type == e1000_i210) || (mac->type == e1000_i211))
mac->ops.init_hw = e1000_init_hw_i210;
else
- mac->ops.init_hw = e1000_init_hw_82575;
+ mac->ops.init_hw = e1000_init_hw_82575;
/* link setup */
mac->ops.setup_link = e1000_setup_link_generic;
/* physical interface link setup */
diff --git a/sys/dev/e1000/e1000_nvm.c b/sys/dev/e1000/e1000_nvm.c
index ecc7b013febb..f46444cf38b9 100644
--- a/sys/dev/e1000/e1000_nvm.c
+++ b/sys/dev/e1000/e1000_nvm.c
@@ -776,8 +776,9 @@ s32 e1000_read_pba_string_generic(struct e1000_hw *hw, u8 *pba_num,
DEBUGFUNC("e1000_read_pba_string_generic");
- if ((hw->mac.type >= e1000_i210) &&
- !e1000_get_flash_presence_i210(hw)) {
+ if ((hw->mac.type == e1000_i210 ||
+ hw->mac.type == e1000_i211) &&
+ !e1000_get_flash_presence_i210(hw)) {
DEBUGOUT("Flashless no PBA string\n");
return -E1000_ERR_NVM_PBA_SECTION;
}