[Bug 265714] igc(4) drops link under high traffic

https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D265714

--- Comment #58 from Tomasz "CeDeROM" CEDRO <[email protected]> ---
I also have problem backporting to stable/14, sorry, do you know what
additional commits do I miss? :-)

# git checkout --track origin/stable/14
branch 'stable/14' set up to track 'origin/stable/14'.
Switched to a new branch 'stable/14'

# git pull
Already up to date.

# git cherry-pick 297394e995e5ea1ea9bc85e609ca116255d51e97=20
9d30fd353dd3eacb095ce98cb9c91ec015b9af64=20
cecb0f45cb83349c60514da38fddce83ad042468=20
4a28d390f5fbae2483e88805559881b04ccf9a80=20
709426551c6a3607fb5a33f5b8dbb87cfa9c8125=20
a108ee9138a698f212d6d6832d54e88ce6786617=20
8f779f159e2198c85b4fcb8685989879a9330104
Auto-merging share/man/man4/igc.4
On branch stable/14
Your branch is up to date with 'origin/stable/14'.

You are currently cherry-picking commit 297394e995e5.
  (all conflicts fixed: run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

nothing to commit, working tree clean
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:

    git commit --allow-empty

Otherwise, please use 'git cherry-pick --skip'

# git commit --allow-empty

# git cherry-pick --continue

# git commit --allow-empty
[detached HEAD e34637e3d70f] igc(4): document adaptive interrupt moderation
 Author: Kevin Bowling <[email protected]>
 Date: Sat Jul 25 17:10:38 2026 -0700
hexagon# git cherry-pick --continue
Auto-merging sys/dev/igc/if_igc.c
[detached HEAD 1a02a700d43e] igc: Disable ASPM L1.2 on I226 to prevent RX
stalls
 Author: Michael Adler <[email protected]>
 Date: Thu Jul 9 13:02:37 2026 -0400
 3 files changed, 66 insertions(+)
[detached HEAD 2222df13f495] igc: Apply ASPM L1.2 workaround to all I226
devices
 Author: Michael Adler <[email protected]>
 Date: Fri Jul 31 16:54:00 2026 -0700
 1 file changed, 5 insertions(+)
Auto-merging sys/dev/igc/if_igc.c
[detached HEAD 64edcfc0b200] igc: Disable PCIe L1.2 on I225
 Author: Kevin Bowling <[email protected]>
 Date: Mon Aug 3 02:55:15 2026 -0700
 3 files changed, 52 insertions(+), 20 deletions(-)
Auto-merging sys/dev/igc/if_igc.c
[detached HEAD 013eaf9d4559] igc: Work around I225 v1 minimum IPG erratum
 Author: Kevin Bowling <[email protected]>
 Date: Mon Aug 3 03:28:49 2026 -0700
 2 files changed, 30 insertions(+)
Auto-merging sys/dev/igc/if_igc.c
[detached HEAD 89996d34bf2a] igc: Correct hardware error statistics
 Author: Kevin Bowling <[email protected]>
 Date: Mon Aug 3 03:31:36 2026 -0700
 4 files changed, 17 insertions(+), 3 deletions(-)
Auto-merging share/man/man4/igc.4
CONFLICT (content): Merge conflict in share/man/man4/igc.4
Auto-merging sys/dev/igc/if_igc.c
error: could not apply 8f779f159e21... igc: Add VLAN hardware filtering
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config set advice.mergeConflict false"

# git status
HEAD detached from origin/stable/14
You are currently cherry-picking commit 8f779f159e21.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
        modified:   sys/dev/igc/if_igc.c
        modified:   sys/dev/igc/if_igc.h

Unmerged paths:
  (use "git add <file>..." to mark resolution)
        both modified:   share/man/man4/igc.4

# vim share/man/man4/igc.4
# git add share/man/man4/igc.4
# git cherry-pick --continue

4034a2a6dd86 (HEAD) HEAD@{0}: commit (cherry-pick): igc: Add VLAN hardware
filtering
89996d34bf2a HEAD@{1}: cherry-pick: igc: Correct hardware error statistics
013eaf9d4559 HEAD@{2}: cherry-pick: igc: Work around I225 v1 minimum IPG
erratum
64edcfc0b200 HEAD@{3}: cherry-pick: igc: Disable PCIe L1.2 on I225
2222df13f495 HEAD@{4}: cherry-pick: igc: Apply ASPM L1.2 workaround to all =
I226
devices
1a02a700d43e HEAD@{5}: cherry-pick: igc: Disable ASPM L1.2 on I226 to preve=
nt
RX stalls
e34637e3d70f HEAD@{6}: commit (cherry-pick): igc(4): document adaptive
interrupt moderation
0194bbf16ff9 HEAD@{7}: commit (cherry-pick): igc(4): document adaptive
interrupt moderation
58c826d72918 (origin/stable/14, stable/14) HEAD@{8}: checkout: moving from
stable/14 to origin/stable/14

# make buildkernel
(..)
cc -target x86_64-unknown-freebsd14.5
--sysroot=3D/usr/obj/usr/src/amd64.amd64/tmp
-B/usr/obj/usr/src/amd64.amd64/tmp/usr/bin -c -O2 -pipe  -fno-strict-aliasi=
ng
-march=3Darrowlake-s -g -nostdinc  -I. -I/usr/src/sys
-I/usr/src/sys/contrib/ck/include -I/usr/src/sys/contrib/libfdt -D_KERNEL
-DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common=20=20=20
-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer -MD  -MF.depend.if_igc=
.o
-MTif_igc.o -ffile-prefix-map=3D/usr/src/sys=3D/usr/src/sys
-ffile-prefix-map=3D/usr/obj/usr/src/amd64.amd64/sys/GENERIC=3D/usr/obj/usr=
/src/amd64.amd64/sys/GENERIC
-ffile-prefix-map=3D/usr/obj/usr/src/amd64.amd64/tmp=3D/sysroot
-fdebug-prefix-map=3D./machine=3D/usr/src/sys/amd64/include
-fdebug-prefix-map=3D./x86=3D/usr/src/sys/x86/include
-fdebug-prefix-map=3D./i386=3D/usr/src/sys/i386/include -mcmodel=3Dkernel
-mno-red-zone -mno-mmx -mno-sse -msoft-float  -fno-asynchronous-unwind-tabl=
es
-ffreestanding -fwrapv -fstack-protector-strong -Wall -Wstrict-prototypes
-Wmissing-prototypes -Wpointer-arith -Wcast-qual -Wundef -Wno-pointer-sign
-D__printf__=3D__freebsd_kprintf__ -Wmissing-include-dirs
-fdiagnostics-show-option -Wno-unknown-pragmas -Wno-error=3Dtautological-co=
mpare
-Wno-error=3Dempty-body -Wno-error=3Dparentheses-equality
-Wno-error=3Dunused-function -Wno-error=3Dpointer-sign
-Wno-error=3Dshift-negative-value -Wno-address-of-packed-member
-Wno-format-zero-length   -mno-aes -mno-avx  -std=3Dgnu99 -Werror
/usr/src/sys/dev/igc/if_igc.c
/usr/src/sys/dev/igc/if_igc.c:1574:10: error: use of undeclared identifier
'PCIM_L1PM_CTL1_ASPM_L1_2'
 1574 |                 mask =3D PCIM_L1PM_CTL1_ASPM_L1_2 |
      |                        ^
/usr/src/sys/dev/igc/if_igc.c:1575:7: error: use of undeclared identifier
'PCIM_L1PM_CTL1_PCIPM_L1_2'
 1575 |                     PCIM_L1PM_CTL1_PCIPM_L1_2;
      |                     ^
/usr/src/sys/dev/igc/if_igc.c:1577:10: error: use of undeclared identifier
'PCIM_L1PM_CTL1_ASPM_L1_2'
 1577 |                 mask =3D PCIM_L1PM_CTL1_ASPM_L1_2;
      |                        ^
/usr/src/sys/dev/igc/if_igc.c:1584:36: error: use of undeclared identifier
'PCIR_L1PM_CTL1'
 1584 |         ctl1 =3D pci_read_config(dev, cap + PCIR_L1PM_CTL1, 4);
      |                                           ^
/usr/src/sys/dev/igc/if_igc.c:1586:30: error: use of undeclared identifier
'PCIR_L1PM_CTL1'
 1586 |         pci_write_config(dev, cap + PCIR_L1PM_CTL1, ctl1, 4);
      |                                     ^
5 errors generated.
*** Error code 1

Stop.
make[2]: stopped making "all" in /usr/obj/usr/src/amd64.amd64/sys/GENERIC
       69.51 real        63.22 user         6.30 sys
*** Error code 1

--=20
You are receiving this mail because:
You are the assignee for the bug.=