mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-01 08:27:59 +00:00
Code Issues Releases Activity

e1000: Update igb driver version to 2.5.28-fbsd

Browse Source 
Bump to the current out of tree driver version since we only have some
gratuitous changes.

MFC after:	1 week
This commit is contained in:
Kevin Bowling 2024-09-20 23:27:54 -07:00
parent 36c516b311
commit ddfec1fb68
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/dev/e1000/e1000_base.c
View File

@ -162,7 +162,8 @@ void e1000_rx_fifo_flush_base(struct e1000_hw *hw)
rfctl |= E1000_RFCTL_IPV6_EX_DIS; rfctl |= E1000_RFCTL_IPV6_EX_DIS;
E1000_WRITE_REG(hw, E1000_RFCTL, rfctl); E1000_WRITE_REG(hw, E1000_RFCTL, rfctl);
if (!(E1000_READ_REG(hw, E1000_MANC) & E1000_MANC_RCV_TCO_EN)) if (hw->mac.type != e1000_82575 ||
!(E1000_READ_REG(hw, E1000_MANC) & E1000_MANC_RCV_TCO_EN))
return; return;
/* Disable all Rx queues */ /* Disable all Rx queues */

14
sys/dev/e1000/e1000_i210.c
View File

@ -362,7 +362,7 @@ s32 e1000_read_invm_version(struct e1000_hw *hw,
E1000_INVM_RECORD_SIZE_IN_BYTES); E1000_INVM_RECORD_SIZE_IN_BYTES);
u32 buffer[E1000_INVM_SIZE]; u32 buffer[E1000_INVM_SIZE];
s32 status = -E1000_ERR_INVM_VALUE_NOT_FOUND; s32 status = -E1000_ERR_INVM_VALUE_NOT_FOUND;
u16 version = 0; u16 nvm_version = 0;
DEBUGFUNC("e1000_read_invm_version"); DEBUGFUNC("e1000_read_invm_version");
@ -379,14 +379,14 @@ s32 e1000_read_invm_version(struct e1000_hw *hw,
/* Check if we have first version location used */ /* Check if we have first version location used */
if ((i == 1) && ((*record & E1000_INVM_VER_FIELD_ONE) == 0)) { if ((i == 1) && ((*record & E1000_INVM_VER_FIELD_ONE) == 0)) {
version = 0; nvm_version = 0;
status = E1000_SUCCESS; status = E1000_SUCCESS;
break; break;
} }
/* Check if we have second version location used */ /* Check if we have second version location used */
else if ((i == 1) && else if ((i == 1) &&
((*record & E1000_INVM_VER_FIELD_TWO) == 0)) { ((*record & E1000_INVM_VER_FIELD_TWO) == 0)) {
version = (*record & E1000_INVM_VER_FIELD_ONE) >> 3; nvm_version = (*record & E1000_INVM_VER_FIELD_ONE) >> 3;
status = E1000_SUCCESS; status = E1000_SUCCESS;
break; break;
} }
@ -397,7 +397,7 @@ s32 e1000_read_invm_version(struct e1000_hw *hw,
else if ((((*record & E1000_INVM_VER_FIELD_ONE) == 0) && else if ((((*record & E1000_INVM_VER_FIELD_ONE) == 0) &&
((*record & 0x3) == 0)) || (((*record & 0x3) != 0) && ((*record & 0x3) == 0)) || (((*record & 0x3) != 0) &&
(i != 1))) { (i != 1))) {
version = (*next_record & E1000_INVM_VER_FIELD_TWO) nvm_version = (*next_record & E1000_INVM_VER_FIELD_TWO)
>> 13; >> 13;
status = E1000_SUCCESS; status = E1000_SUCCESS;
break; break;
@ -408,16 +408,16 @@ s32 e1000_read_invm_version(struct e1000_hw *hw,
*/ */
else if (((*record & E1000_INVM_VER_FIELD_TWO) == 0) && else if (((*record & E1000_INVM_VER_FIELD_TWO) == 0) &&
((*record & 0x3) == 0)) { ((*record & 0x3) == 0)) {
version = (*record & E1000_INVM_VER_FIELD_ONE) >> 3; nvm_version = (*record & E1000_INVM_VER_FIELD_ONE) >> 3;
status = E1000_SUCCESS; status = E1000_SUCCESS;
break; break;
} }
} }
if (status == E1000_SUCCESS) { if (status == E1000_SUCCESS) {
invm_ver->invm_major = (version & E1000_INVM_MAJOR_MASK) invm_ver->invm_major = (nvm_version & E1000_INVM_MAJOR_MASK)
>> E1000_INVM_MAJOR_SHIFT; >> E1000_INVM_MAJOR_SHIFT;
invm_ver->invm_minor = version & E1000_INVM_MINOR_MASK; invm_ver->invm_minor = nvm_version & E1000_INVM_MINOR_MASK;
} }
/* Read Image Type */ /* Read Image Type */
for (i = 1; i < invm_blocks; i++) { for (i = 1; i < invm_blocks; i++) {

2
sys/dev/e1000/e1000_phy.c
View File

@ -1037,7 +1037,7 @@ static s32 e1000_set_master_slave_mode(struct e1000_hw *hw)
break; break;
case e1000_ms_auto: case e1000_ms_auto:
phy_data &= ~CR_1000T_MS_ENABLE; phy_data &= ~CR_1000T_MS_ENABLE;
/* FALLTHROUGH */ break;
default: default:
break; break;
} }

2
sys/dev/e1000/if_em.c
View File

@ -37,7 +37,7 @@
* Driver version: * Driver version:
*********************************************************************/ *********************************************************************/
static const char em_driver_version[] = "7.7.8-fbsd"; static const char em_driver_version[] = "7.7.8-fbsd";
static const char igb_driver_version[] = "2.5.19-fbsd"; static const char igb_driver_version[] = "2.5.28-fbsd";
/********************************************************************* /*********************************************************************
* PCI Device ID Table * PCI Device ID Table