e1000: fix I219 hang on reset #540
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kev009
commented
Sep 23, 2021
| tctl = E1000_READ_REG(hw, E1000_TCTL); | ||
| E1000_WRITE_REG(hw, E1000_TCTL, tctl | E1000_TCTL_EN); | ||
|
|
||
| txd = &txr->tx_base[txr->tx_cidx_processed]; |
There was a problem hiding this comment.
Not sure this index is correct, although it seems like we just need a scratch descriptor prior to the head.
kev009
commented
Sep 23, 2021
| txd->upper.data = 0; | ||
|
|
||
| /* flush descriptors to memory before notifying the HW */ | ||
| wmb(); |
There was a problem hiding this comment.
These membars are from the OOT driver and are macro'd out to nothing in e1000_osdep.h,
kev009
commented
Sep 23, 2021
| @@ -37,7 +37,8 @@ | |||
| /********************************************************************* | |||
| * Driver version: | |||
| *********************************************************************/ | |||
| char em_driver_version[] = "7.6.1-k"; | |||
| char em_driver_version[] = "7.7.8-fbsd"; | |||
| char igb_driver_version[] = "2.5.19-fbsd"; | |||
There was a problem hiding this comment.
Incrementing these to avoid confusion in users; we are roughly on par with these OOT versions.
Clear the rings before reset to avoid a HW hang. Inspired by em-7.7.8 and DPDK (1fc9701238edcf0541289b9ae15565b6d9d7ab30)
kev009
force-pushed
the
i219-flush-desc
branch
from
52a0443
to
9891b29
Compare
|
what's the status of this pull request? IT looks like it's stalled and hasn't landed in main yet. |
|
@bsdimp it needs review, hopefully from intel |
ricera
approved these changes
Feb 8, 2023
| @@ -588,7 +590,7 @@ static struct if_shared_ctx igb_sctx_init = { | |||
| .isc_ntxqs = 1, | |||
| .isc_admin_intrcnt = 1, | |||
| .isc_vendor_info = igb_vendor_info_array, | |||
| .isc_driver_version = em_driver_version, | |||
| .isc_driver_version = igb_driver_version, | |||
| @@ -1907,6 +1909,10 @@ em_if_stop(if_ctx_t ctx) | |||
|
|
|||
| INIT_DEBUGOUT("em_if_stop: begin"); | |||
|
|
|||
| /* I219 needs special flushing to avoid hangs */ | |||
| if (sc->hw.mac.type >= e1000_pch_spt && sc->hw.mac.type < igb_mac_min) | |||
There was a problem hiding this comment.
Looking here: https://git.dpdk.org/dpdk/tree/drivers/net/e1000/em_ethdev.c#n728, this check was updated to apply this workaround to cnp in addition to spt, but I see that the device ID list only goes up to (7) for DPDK, and not up to the current (23) that we're up to, so maybe this check doesn't need to change and we should apply it to everything spt and newer.
|
Merged as ae1dca7 |
freebsd-git
pushed a commit
that referenced
this pull request
Feb 8, 2023
Clear the rings before reset to avoid a HW hang. Inspired by em-7.7.8 and DPDK (1fc9701238edcf0541289b9ae15565b6d9d7ab30) Reviewed by: erj MFC after: 2 weeks Sponsored by: BBOX.io Pull Request: #540
freebsd-git
pushed a commit
that referenced
this pull request
Feb 8, 2023
Incrementing these to avoid confusion in users; we are on par with these out of tree versions. Reviewed by: erj MFC after: 2 weeks Sponsored by: BBOX.io Pull Request: #540
|
thanks @kev009 for closing these |
hardenedbsd-services
pushed a commit
to HardenedBSD/hardenedBSD
that referenced
this pull request
Feb 10, 2023
Pull a part the locking from the static range. This enables locking to be added to a range directly, and does not require it to be made static. This is useful in cases where the source of memory is shared between threads, but not static. I.e. there are multiple instances of the same type.
bsdjhb
pushed a commit
to bsdjhb/cheribsd
that referenced
this pull request
Mar 22, 2023
Clear the rings before reset to avoid a HW hang. Inspired by em-7.7.8 and DPDK (1fc9701238edcf0541289b9ae15565b6d9d7ab30) Reviewed by: erj MFC after: 2 weeks Sponsored by: BBOX.io Pull Request: freebsd/freebsd-src#540
bsdjhb
pushed a commit
to bsdjhb/cheribsd
that referenced
this pull request
Mar 22, 2023
Incrementing these to avoid confusion in users; we are on par with these out of tree versions. Reviewed by: erj MFC after: 2 weeks Sponsored by: BBOX.io Pull Request: freebsd/freebsd-src#540
fichtner
pushed a commit
to opnsense/src
that referenced
this pull request
May 9, 2023
Clear the rings before reset to avoid a HW hang. Inspired by em-7.7.8 and DPDK (1fc9701238edcf0541289b9ae15565b6d9d7ab30) Reviewed by: erj Sponsored by: BBOX.io Pull Request: freebsd/freebsd-src#540 (cherry picked from commit ae1dca7)
fichtner
pushed a commit
to opnsense/src
that referenced
this pull request
May 9, 2023
Incrementing these to avoid confusion in users; we are on par with these out of tree versions. Reviewed by: erj Sponsored by: BBOX.io Pull Request: freebsd/freebsd-src#540 (cherry picked from commit 647f2d2)
laffer1
pushed a commit
to MidnightBSD/src
that referenced
this pull request
Jun 27, 2023
Clear the rings before reset to avoid a HW hang. Inspired by em-7.7.8 and DPDK (1fc9701238edcf0541289b9ae15565b6d9d7ab30) Reviewed by: erj Sponsored by: BBOX.io Pull Request: freebsd/freebsd-src#540 (cherry picked from commit ae1dca798e0f826de46f4ec11914ba4c91928d7a)
laffer1
pushed a commit
to MidnightBSD/src
that referenced
this pull request
Jun 27, 2023
Incrementing these to avoid confusion in users; we are on par with these out of tree versions. Reviewed by: erj Sponsored by: BBOX.io Pull Request: freebsd/freebsd-src#540 (cherry picked from commit 647f2d2bc0cb9357ac083bf2aae4b669167dd66b)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Clear the rings before reset to avoid a HW hang.
Inspired by em-7.7.8 and DPDK (1fc9701238edcf0541289b9ae15565b6d9d7ab30)
@ricera