| Message ID | 20240528074614.3306301-1-jani.nikula@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [core-for-CI] Revert "igc: fix a log entry using uninitialized netdev" | expand |
> -----Original Message----- > From: Intel-gfx <intel-gfx-bounces@lists.freedesktop.org> On Behalf Of Jani > Nikula > Sent: Tuesday, May 28, 2024 1:16 PM > To: intel-gfx@lists.freedesktop.org > Cc: Nikula, Jani <jani.nikula@intel.com> > Subject: [core-for-CI PATCH] Revert "igc: fix a log entry using uninitialized > netdev" > > This reverts commit 86167183a17e03ec77198897975e9fdfbd53cb0b. > > The commit moved igc_ptp_init() which initializes spinlocks after > igt_reset() which ends up using the adapter->ptp_tx_lock. Lockdep isn't > happy: > > <3>[ 10.648947] INFO: trying to register non-static key. > <3>[ 10.648950] The code is fine but needs lockdep annotation, or maybe > <3>[ 10.648951] you didn't initialize this object before use? > <3>[ 10.648952] turning off the locking correctness validator. > <4>[ 10.648954] CPU: 2 PID: 313 Comm: systemd-udevd Not tainted 6.9.0- > next-20240513-next-20240513-g6ba6c795dc73+ #1 > <4>[ 10.648958] Hardware name: Intel Corporation Arrow Lake Client > Platform/MTL-S UDIMM 2DPC EVCRB, BIOS > MTLSFWI1.R00.3473.D80.2311222130 11/22/2023 > <4>[ 10.648960] Call Trace: > <4>[ 10.648962] <TASK> > <4>[ 10.648964] dump_stack_lvl+0x82/0xd0 > <4>[ 10.648971] register_lock_class+0x795/0x7e0 > <4>[ 10.648978] ? __free_object+0xa1/0x340 > <4>[ 10.648983] ? lockdep_hardirqs_on+0xc1/0x140 > <4>[ 10.648990] __lock_acquire+0x75/0x2260 > <4>[ 10.648993] ? __switch_to+0x123/0x600 > <4>[ 10.648997] ? _raw_spin_unlock_irqrestore+0x58/0x70 > <4>[ 10.649002] lock_acquire+0xd9/0x2f0 > <4>[ 10.649006] ? igc_ptp_clear_tx_tstamp+0x28/0x60 [igc] > <4>[ 10.649027] _raw_spin_lock_irqsave+0x3d/0x60 > <4>[ 10.649030] ? igc_ptp_clear_tx_tstamp+0x28/0x60 [igc] > <4>[ 10.649038] igc_ptp_clear_tx_tstamp+0x28/0x60 [igc] > <4>[ 10.649048] igc_ptp_set_timestamp_mode.isra.0+0x20b/0x230 [igc] > <4>[ 10.649056] igc_ptp_reset+0x31/0x180 [igc] > <4>[ 10.649066] igc_reset+0xb4/0x100 [igc] > <4>[ 10.649079] igc_probe+0x797/0x8e0 [igc] > <4>[ 10.649091] pci_device_probe+0x95/0x120 > <4>[ 10.649095] really_probe+0xd9/0x370 > <4>[ 10.649099] ? __pfx___driver_attach+0x10/0x10 > <4>[ 10.649101] __driver_probe_device+0x73/0x150 > <4>[ 10.649103] driver_probe_device+0x19/0xa0 > <4>[ 10.649105] __driver_attach+0xb6/0x180 > <4>[ 10.649107] ? __pfx___driver_attach+0x10/0x10 > <4>[ 10.649109] bus_for_each_dev+0x77/0xd0 > <4>[ 10.649114] bus_add_driver+0x110/0x240 > <4>[ 10.649117] driver_register+0x5b/0x110 > <4>[ 10.649120] ? __pfx_igc_init_module+0x10/0x10 [igc] > <4>[ 10.649130] do_one_initcall+0x5c/0x2b0 > <4>[ 10.649134] ? kmalloc_trace_noprof+0x22f/0x290 > <4>[ 10.649141] ? do_init_module+0x1e/0x210 > <4>[ 10.669989] do_init_module+0x5f/0x210 > <4>[ 10.669993] load_module+0x1d44/0x1fc0 > <4>[ 10.670001] ? init_module_from_file+0x86/0xd0 > <4>[ 10.670004] init_module_from_file+0x86/0xd0 > <4>[ 10.670009] idempotent_init_module+0x17c/0x230 > <4>[ 10.670015] __x64_sys_finit_module+0x56/0xb0 > <4>[ 10.670019] do_syscall_64+0x69/0x140 > <4>[ 10.670023] entry_SYSCALL_64_after_hwframe+0x76/0x7e > <4>[ 10.670027] RIP: 0033:0x7f6d2704595d > <4>[ 10.670030] Code: 00 c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 48 89 > f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 > f0 ff ff 73 01 c3 48 > 8b 0d 03 35 0d 00 f7 d8 64 89 01 48 > <4>[ 10.670032] RSP: 002b:00007ffc72aad018 EFLAGS: 00000246 ORIG_RAX: > 0000000000000139 > <4>[ 10.670036] RAX: ffffffffffffffda RBX: 000055d3f0e69690 RCX: > 00007f6d2704595d > <4>[ 10.670038] RDX: 0000000000000000 RSI: 00007f6d26f25ded RDI: > 0000000000000010 > <4>[ 10.670039] RBP: 0000000000020000 R08: 0000000000000000 R09: > 0000000000000000 > <4>[ 10.670041] R10: 0000000000000010 R11: 0000000000000246 R12: > 00007f6d26f25ded > <4>[ 10.670042] R13: 0000000000000000 R14: 000055d3f0c64d20 R15: > 000055d3f0e69690 > <4>[ 10.670046] </TASK> > <6>[ 10.672046] pps pps0: new PPS source ptp0 > > References: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11198 > References: https://lore.kernel.org/r/87o78rmkhu.fsf@intel.com > Signed-off-by: Jani Nikula <jani.nikula@intel.com> Acked-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com> > --- > drivers/net/ethernet/intel/igc/igc_main.c | 5 ++--- > 1 file changed, 2 insertions(+), 3 deletions(-) > > diff --git a/drivers/net/ethernet/intel/igc/igc_main.c > b/drivers/net/ethernet/intel/igc/igc_main.c > index 12f004f46082..ace2fbfd87d6 100644 > --- a/drivers/net/ethernet/intel/igc/igc_main.c > +++ b/drivers/net/ethernet/intel/igc/igc_main.c > @@ -7028,6 +7028,8 @@ static int igc_probe(struct pci_dev *pdev, > device_set_wakeup_enable(&adapter->pdev->dev, > adapter->flags & > IGC_FLAG_WOL_SUPPORTED); > > + igc_ptp_init(adapter); > + > igc_tsn_clear_schedule(adapter); > > /* reset the hardware with the new settings */ @@ -7049,9 +7051,6 > @@ static int igc_probe(struct pci_dev *pdev, > /* Check if Media Autosense is enabled */ > adapter->ei = *ei; > > - /* do hw tstamp init after resetting */ > - igc_ptp_init(adapter); > - > /* print pcie link status and MAC address */ > pcie_print_link_status(pdev); > netdev_info(netdev, "MAC: %pM\n", netdev->dev_addr); > -- > 2.39.2
On Tue, 28 May 2024, Patchwork <patchwork@emeril.freedesktop.org> wrote: > == Series Details == > > Series: Revert "igc: fix a log entry using uninitialized netdev" > URL : https://patchwork.freedesktop.org/series/134112/ > State : failure > > == Summary == > > CI Bug Log - changes from CI_DRM_14828 -> Patchwork_134112v1 > ==================================================== > > Summary > ------- > > **FAILURE** > > Serious unknown changes coming with Patchwork_134112v1 absolutely need to be > verified manually. > > If you think the reported changes have nothing to do with the changes > introduced in Patchwork_134112v1, please notify your bug team (I915-ci-infra@lists.freedesktop.org) to allow them > to document this new failure mode, which will reduce false positives in CI. > > External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/index.html > > Participating hosts (37 -> 38) > ------------------------------ > > Additional (4): bat-dg1-7 bat-kbl-2 fi-elk-e7500 bat-jsl-3 > Missing (3): bat-mtlp-9 fi-tgl-1115g4 fi-bsw-n3050 > > Possible new issues > ------------------- > > Here are the unknown changes that may have been introduced in Patchwork_134112v1: > > ### IGT changes ### > > #### Possible regressions #### > > * igt@i915_pm_rpm@module-reload: > - fi-cfl-guc: [PASS][1] -> [INCOMPLETE][2] > [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14828/fi-cfl-guc/igt@i915_pm_rpm@module-reload.html > [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/fi-cfl-guc/igt@i915_pm_rpm@module-reload.html > > * igt@i915_selftest@live@hugepages: > - bat-adlp-9: [PASS][3] -> [INCOMPLETE][4] > [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_14828/bat-adlp-9/igt@i915_selftest@live@hugepages.html > [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-adlp-9/igt@i915_selftest@live@hugepages.html Unrelated, and the trybot run with the same diff passed BAT [1]. Pushed to core-for-CI. BR, Jani. [1] https://patchwork.freedesktop.org/series/134085/ > > > Known issues > ------------ > > Here are the changes found in Patchwork_134112v1 that come from known issues: > > ### IGT changes ### > > #### Issues hit #### > > * igt@debugfs_test@basic-hwmon: > - bat-jsl-3: NOTRUN -> [SKIP][5] ([i915#9318]) > [5]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-jsl-3/igt@debugfs_test@basic-hwmon.html > - bat-arls-1: NOTRUN -> [SKIP][6] ([i915#9318]) > [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-1/igt@debugfs_test@basic-hwmon.html > - bat-adls-6: NOTRUN -> [SKIP][7] ([i915#9318]) > [7]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-adls-6/igt@debugfs_test@basic-hwmon.html > - fi-rkl-11600: NOTRUN -> [SKIP][8] ([i915#9318]) > [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/fi-rkl-11600/igt@debugfs_test@basic-hwmon.html > - bat-arls-2: NOTRUN -> [SKIP][9] ([i915#9318]) > [9]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-2/igt@debugfs_test@basic-hwmon.html > > * igt@fbdev@info: > - bat-kbl-2: NOTRUN -> [SKIP][10] ([i915#1849]) > [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-kbl-2/igt@fbdev@info.html > > * igt@gem_huc_copy@huc-copy: > - bat-jsl-3: NOTRUN -> [SKIP][11] ([i915#2190]) > [11]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-jsl-3/igt@gem_huc_copy@huc-copy.html > - fi-rkl-11600: NOTRUN -> [SKIP][12] ([i915#2190]) > [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/fi-rkl-11600/igt@gem_huc_copy@huc-copy.html > > * igt@gem_lmem_swapping@basic: > - bat-jsl-3: NOTRUN -> [SKIP][13] ([i915#4613]) +3 other tests skip > [13]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-jsl-3/igt@gem_lmem_swapping@basic.html > - bat-arls-1: NOTRUN -> [SKIP][14] ([i915#10213]) +3 other tests skip > [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-1/igt@gem_lmem_swapping@basic.html > - fi-rkl-11600: NOTRUN -> [SKIP][15] ([i915#4613]) +3 other tests skip > [15]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/fi-rkl-11600/igt@gem_lmem_swapping@basic.html > > * igt@gem_lmem_swapping@parallel-random-engines: > - bat-kbl-2: NOTRUN -> [SKIP][16] +39 other tests skip > [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-kbl-2/igt@gem_lmem_swapping@parallel-random-engines.html > - bat-adls-6: NOTRUN -> [SKIP][17] ([i915#4613]) +3 other tests skip > [17]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-adls-6/igt@gem_lmem_swapping@parallel-random-engines.html > > * igt@gem_lmem_swapping@verify-random: > - bat-arls-2: NOTRUN -> [SKIP][18] ([i915#10213]) +3 other tests skip > [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-2/igt@gem_lmem_swapping@verify-random.html > > * igt@gem_mmap@basic: > - bat-arls-1: NOTRUN -> [SKIP][19] ([i915#4083]) > [19]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-1/igt@gem_mmap@basic.html > - bat-dg1-7: NOTRUN -> [SKIP][20] ([i915#4083]) > [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-dg1-7/igt@gem_mmap@basic.html > - bat-arls-2: NOTRUN -> [SKIP][21] ([i915#4083]) > [21]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-2/igt@gem_mmap@basic.html > > * igt@gem_mmap_gtt@basic: > - bat-arls-2: NOTRUN -> [SKIP][22] ([i915#10196] / [i915#4077]) +2 other tests skip > [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-2/igt@gem_mmap_gtt@basic.html > > * igt@gem_render_tiled_blits@basic: > - bat-arls-2: NOTRUN -> [SKIP][23] ([i915#10197] / [i915#10211] / [i915#4079]) > [23]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-2/igt@gem_render_tiled_blits@basic.html > - bat-arls-1: NOTRUN -> [SKIP][24] ([i915#10197] / [i915#10211] / [i915#4079]) > [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-1/igt@gem_render_tiled_blits@basic.html > > * igt@gem_tiled_blits@basic: > - bat-arls-1: NOTRUN -> [SKIP][25] ([i915#10196] / [i915#4077]) +2 other tests skip > [25]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-1/igt@gem_tiled_blits@basic.html > - bat-dg1-7: NOTRUN -> [SKIP][26] ([i915#4077]) +2 other tests skip > [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-dg1-7/igt@gem_tiled_blits@basic.html > > * igt@gem_tiled_pread_basic: > - fi-rkl-11600: NOTRUN -> [SKIP][27] ([i915#3282]) > [27]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/fi-rkl-11600/igt@gem_tiled_pread_basic.html > - bat-dg1-7: NOTRUN -> [SKIP][28] ([i915#4079]) +1 other test skip > [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-dg1-7/igt@gem_tiled_pread_basic.html > - bat-arls-2: NOTRUN -> [SKIP][29] ([i915#10206] / [i915#4079]) > [29]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-2/igt@gem_tiled_pread_basic.html > - bat-arls-1: NOTRUN -> [SKIP][30] ([i915#10206] / [i915#4079]) > [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-1/igt@gem_tiled_pread_basic.html > - bat-adls-6: NOTRUN -> [SKIP][31] ([i915#3282]) > [31]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-adls-6/igt@gem_tiled_pread_basic.html > > * igt@i915_pm_rps@basic-api: > - bat-arls-1: NOTRUN -> [SKIP][32] ([i915#10209]) > [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-1/igt@i915_pm_rps@basic-api.html > - bat-dg1-7: NOTRUN -> [SKIP][33] ([i915#6621]) > [33]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-dg1-7/igt@i915_pm_rps@basic-api.html > - bat-arls-2: NOTRUN -> [SKIP][34] ([i915#10209]) > [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-2/igt@i915_pm_rps@basic-api.html > > * igt@kms_addfb_basic@addfb25-y-tiled-small-legacy: > - bat-arls-2: NOTRUN -> [SKIP][35] ([i915#10200]) +9 other tests skip > [35]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-2/igt@kms_addfb_basic@addfb25-y-tiled-small-legacy.html > > * igt@kms_addfb_basic@basic-y-tiled-legacy: > - bat-arls-1: NOTRUN -> [SKIP][36] ([i915#10200]) +9 other tests skip > [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-1/igt@kms_addfb_basic@basic-y-tiled-legacy.html > - bat-dg1-7: NOTRUN -> [SKIP][37] ([i915#4215]) > [37]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-dg1-7/igt@kms_addfb_basic@basic-y-tiled-legacy.html > > * igt@kms_addfb_basic@bo-too-small-due-to-tiling: > - bat-dg1-7: NOTRUN -> [SKIP][38] ([i915#4212]) +7 other tests skip > [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-dg1-7/igt@kms_addfb_basic@bo-too-small-due-to-tiling.html > > * igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy: > - bat-jsl-3: NOTRUN -> [SKIP][39] ([i915#4103]) +1 other test skip > [39]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-jsl-3/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html > - bat-adls-6: NOTRUN -> [SKIP][40] ([i915#4103]) +1 other test skip > [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-adls-6/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html > - bat-arls-1: NOTRUN -> [SKIP][41] ([i915#10202]) +1 other test skip > [41]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-1/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html > - bat-dg1-7: NOTRUN -> [SKIP][42] ([i915#4103] / [i915#4213]) +1 other test skip > [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-dg1-7/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html > - fi-rkl-11600: NOTRUN -> [SKIP][43] ([i915#4103]) +1 other test skip > [43]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/fi-rkl-11600/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html > - bat-arls-2: NOTRUN -> [SKIP][44] ([i915#10202]) +1 other test skip > [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-2/igt@kms_cursor_legacy@basic-busy-flip-before-cursor-legacy.html > > * igt@kms_dsc@dsc-basic: > - fi-rkl-11600: NOTRUN -> [SKIP][45] ([i915#3555] / [i915#3840]) > [45]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/fi-rkl-11600/igt@kms_dsc@dsc-basic.html > - bat-arls-2: NOTRUN -> [SKIP][46] ([i915#9886]) > [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-2/igt@kms_dsc@dsc-basic.html > - bat-jsl-3: NOTRUN -> [SKIP][47] ([i915#3555] / [i915#9886]) > [47]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-jsl-3/igt@kms_dsc@dsc-basic.html > - bat-adls-6: NOTRUN -> [SKIP][48] ([i915#3555] / [i915#3840]) > [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-adls-6/igt@kms_dsc@dsc-basic.html > - bat-arls-1: NOTRUN -> [SKIP][49] ([i915#9886]) > [49]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-1/igt@kms_dsc@dsc-basic.html > - bat-dg1-7: NOTRUN -> [SKIP][50] ([i915#3555] / [i915#3840]) > [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-dg1-7/igt@kms_dsc@dsc-basic.html > > * igt@kms_force_connector_basic@force-load-detect: > - bat-jsl-3: NOTRUN -> [SKIP][51] > [51]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-jsl-3/igt@kms_force_connector_basic@force-load-detect.html > - bat-adls-6: NOTRUN -> [SKIP][52] > [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-adls-6/igt@kms_force_connector_basic@force-load-detect.html > - bat-arls-1: NOTRUN -> [SKIP][53] ([i915#10207]) > [53]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-1/igt@kms_force_connector_basic@force-load-detect.html > - bat-dg1-7: NOTRUN -> [SKIP][54] > [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-dg1-7/igt@kms_force_connector_basic@force-load-detect.html > - fi-rkl-11600: NOTRUN -> [SKIP][55] > [55]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/fi-rkl-11600/igt@kms_force_connector_basic@force-load-detect.html > - bat-arls-2: NOTRUN -> [SKIP][56] ([i915#10207]) > [56]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-2/igt@kms_force_connector_basic@force-load-detect.html > > * igt@kms_hdmi_inject@inject-audio: > - bat-dg1-7: NOTRUN -> [SKIP][57] ([i915#433]) > [57]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-dg1-7/igt@kms_hdmi_inject@inject-audio.html > > * igt@kms_pipe_crc_basic@compare-crc-sanitycheck-nv12@pipe-a-hdmi-a-1: > - fi-elk-e7500: NOTRUN -> [SKIP][58] +24 other tests skip > [58]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/fi-elk-e7500/igt@kms_pipe_crc_basic@compare-crc-sanitycheck-nv12@pipe-a-hdmi-a-1.html > > * igt@kms_pm_backlight@basic-brightness: > - bat-arls-1: NOTRUN -> [SKIP][59] ([i915#9812]) > [59]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-1/igt@kms_pm_backlight@basic-brightness.html > - bat-adls-6: NOTRUN -> [SKIP][60] ([i915#5354]) > [60]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-adls-6/igt@kms_pm_backlight@basic-brightness.html > - fi-rkl-11600: NOTRUN -> [SKIP][61] ([i915#5354]) > [61]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/fi-rkl-11600/igt@kms_pm_backlight@basic-brightness.html > - bat-dg1-7: NOTRUN -> [SKIP][62] ([i915#5354]) > [62]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-dg1-7/igt@kms_pm_backlight@basic-brightness.html > > * igt@kms_psr@psr-primary-mmap-gtt: > - bat-arls-1: NOTRUN -> [SKIP][63] ([i915#9732]) +3 other tests skip > [63]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-1/igt@kms_psr@psr-primary-mmap-gtt.html > - bat-adls-6: NOTRUN -> [SKIP][64] ([i915#1072] / [i915#9732]) +3 other tests skip > [64]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-adls-6/igt@kms_psr@psr-primary-mmap-gtt.html > > * igt@kms_psr@psr-primary-mmap-gtt@edp-1: > - bat-arls-2: NOTRUN -> [SKIP][65] ([i915#10196] / [i915#4077] / [i915#9688]) > [65]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-2/igt@kms_psr@psr-primary-mmap-gtt@edp-1.html > > * igt@kms_psr@psr-primary-page-flip: > - bat-dg1-7: NOTRUN -> [SKIP][66] ([i915#1072] / [i915#9732]) +3 other tests skip > [66]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-dg1-7/igt@kms_psr@psr-primary-page-flip.html > - fi-rkl-11600: NOTRUN -> [SKIP][67] ([i915#1072] / [i915#9732]) +3 other tests skip > [67]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/fi-rkl-11600/igt@kms_psr@psr-primary-page-flip.html > > * igt@kms_setmode@basic-clone-single-crtc: > - fi-rkl-11600: NOTRUN -> [SKIP][68] ([i915#3555]) > [68]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/fi-rkl-11600/igt@kms_setmode@basic-clone-single-crtc.html > - bat-arls-2: NOTRUN -> [SKIP][69] ([i915#10208] / [i915#8809]) > [69]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-2/igt@kms_setmode@basic-clone-single-crtc.html > - bat-jsl-3: NOTRUN -> [SKIP][70] ([i915#3555]) > [70]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-jsl-3/igt@kms_setmode@basic-clone-single-crtc.html > - bat-adls-6: NOTRUN -> [SKIP][71] ([i915#3555]) > [71]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-adls-6/igt@kms_setmode@basic-clone-single-crtc.html > - bat-arls-1: NOTRUN -> [SKIP][72] ([i915#10208] / [i915#8809]) > [72]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-1/igt@kms_setmode@basic-clone-single-crtc.html > - bat-dg1-7: NOTRUN -> [SKIP][73] ([i915#3555]) > [73]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-dg1-7/igt@kms_setmode@basic-clone-single-crtc.html > > * igt@prime_vgem@basic-fence-mmap: > - bat-dg1-7: NOTRUN -> [SKIP][74] ([i915#3708] / [i915#4077]) +1 other test skip > [74]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-dg1-7/igt@prime_vgem@basic-fence-mmap.html > - bat-arls-2: NOTRUN -> [SKIP][75] ([i915#10196] / [i915#3708] / [i915#4077]) +1 other test skip > [75]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-2/igt@prime_vgem@basic-fence-mmap.html > > * igt@prime_vgem@basic-fence-read: > - bat-adls-6: NOTRUN -> [SKIP][76] ([i915#3291]) +2 other tests skip > [76]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-adls-6/igt@prime_vgem@basic-fence-read.html > - bat-dg1-7: NOTRUN -> [SKIP][77] ([i915#3708]) +3 other tests skip > [77]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-dg1-7/igt@prime_vgem@basic-fence-read.html > - bat-arls-2: NOTRUN -> [SKIP][78] ([i915#10212] / [i915#3708]) > [78]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-2/igt@prime_vgem@basic-fence-read.html > - bat-arls-1: NOTRUN -> [SKIP][79] ([i915#10212] / [i915#3708]) > [79]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-1/igt@prime_vgem@basic-fence-read.html > > * igt@prime_vgem@basic-gtt: > - bat-arls-1: NOTRUN -> [SKIP][80] ([i915#10196] / [i915#3708] / [i915#4077]) +1 other test skip > [80]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-1/igt@prime_vgem@basic-gtt.html > > * igt@prime_vgem@basic-read: > - fi-rkl-11600: NOTRUN -> [SKIP][81] ([i915#3291] / [i915#3708]) +2 other tests skip > [81]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/fi-rkl-11600/igt@prime_vgem@basic-read.html > - bat-arls-2: NOTRUN -> [SKIP][82] ([i915#10214] / [i915#3708]) > [82]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-2/igt@prime_vgem@basic-read.html > - bat-arls-1: NOTRUN -> [SKIP][83] ([i915#10214] / [i915#3708]) > [83]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-1/igt@prime_vgem@basic-read.html > > * igt@prime_vgem@basic-write: > - bat-arls-2: NOTRUN -> [SKIP][84] ([i915#10216] / [i915#3708]) > [84]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-2/igt@prime_vgem@basic-write.html > - bat-arls-1: NOTRUN -> [SKIP][85] ([i915#10216] / [i915#3708]) > [85]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/bat-arls-1/igt@prime_vgem@basic-write.html > > > [i915#10196]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10196 > [i915#10197]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10197 > [i915#10200]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10200 > [i915#10202]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10202 > [i915#10206]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10206 > [i915#10207]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10207 > [i915#10208]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10208 > [i915#10209]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10209 > [i915#10211]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10211 > [i915#10212]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10212 > [i915#10213]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10213 > [i915#10214]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10214 > [i915#10216]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/10216 > [i915#1072]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/1072 > [i915#1849]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/1849 > [i915#2190]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/2190 > [i915#3282]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3282 > [i915#3291]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3291 > [i915#3555]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3555 > [i915#3708]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3708 > [i915#3840]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3840 > [i915#4077]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4077 > [i915#4079]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4079 > [i915#4083]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4083 > [i915#4103]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4103 > [i915#4212]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4212 > [i915#4213]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4213 > [i915#4215]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4215 > [i915#433]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/433 > [i915#4613]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/4613 > [i915#5354]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/5354 > [i915#6621]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/6621 > [i915#8809]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/8809 > [i915#9318]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9318 > [i915#9688]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9688 > [i915#9732]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9732 > [i915#9812]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9812 > [i915#9886]: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/9886 > > > Build changes > ------------- > > * Linux: CI_DRM_14828 -> Patchwork_134112v1 > > CI-20190529: 20190529 > CI_DRM_14828: abaeae202dfb4e361edd660a124e22178340725d @ git://anongit.freedesktop.org/gfx-ci/linux > IGT_7871: 1d7b961235e345db20933c057f265898e2e96fd2 @ https://gitlab.freedesktop.org/drm/igt-gpu-tools.git > Patchwork_134112v1: abaeae202dfb4e361edd660a124e22178340725d @ git://anongit.freedesktop.org/gfx-ci/linux > > == Logs == > > For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_134112v1/index.html
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index 12f004f46082..ace2fbfd87d6 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -7028,6 +7028,8 @@ static int igc_probe(struct pci_dev *pdev, device_set_wakeup_enable(&adapter->pdev->dev, adapter->flags & IGC_FLAG_WOL_SUPPORTED); + igc_ptp_init(adapter); + igc_tsn_clear_schedule(adapter); /* reset the hardware with the new settings */ @@ -7049,9 +7051,6 @@ static int igc_probe(struct pci_dev *pdev, /* Check if Media Autosense is enabled */ adapter->ei = *ei; - /* do hw tstamp init after resetting */ - igc_ptp_init(adapter); - /* print pcie link status and MAC address */ pcie_print_link_status(pdev); netdev_info(netdev, "MAC: %pM\n", netdev->dev_addr);
This reverts commit 86167183a17e03ec77198897975e9fdfbd53cb0b. The commit moved igc_ptp_init() which initializes spinlocks after igt_reset() which ends up using the adapter->ptp_tx_lock. Lockdep isn't happy: <3>[ 10.648947] INFO: trying to register non-static key. <3>[ 10.648950] The code is fine but needs lockdep annotation, or maybe <3>[ 10.648951] you didn't initialize this object before use? <3>[ 10.648952] turning off the locking correctness validator. <4>[ 10.648954] CPU: 2 PID: 313 Comm: systemd-udevd Not tainted 6.9.0-next-20240513-next-20240513-g6ba6c795dc73+ #1 <4>[ 10.648958] Hardware name: Intel Corporation Arrow Lake Client Platform/MTL-S UDIMM 2DPC EVCRB, BIOS MTLSFWI1.R00.3473.D80.2311222130 11/22/2023 <4>[ 10.648960] Call Trace: <4>[ 10.648962] <TASK> <4>[ 10.648964] dump_stack_lvl+0x82/0xd0 <4>[ 10.648971] register_lock_class+0x795/0x7e0 <4>[ 10.648978] ? __free_object+0xa1/0x340 <4>[ 10.648983] ? lockdep_hardirqs_on+0xc1/0x140 <4>[ 10.648990] __lock_acquire+0x75/0x2260 <4>[ 10.648993] ? __switch_to+0x123/0x600 <4>[ 10.648997] ? _raw_spin_unlock_irqrestore+0x58/0x70 <4>[ 10.649002] lock_acquire+0xd9/0x2f0 <4>[ 10.649006] ? igc_ptp_clear_tx_tstamp+0x28/0x60 [igc] <4>[ 10.649027] _raw_spin_lock_irqsave+0x3d/0x60 <4>[ 10.649030] ? igc_ptp_clear_tx_tstamp+0x28/0x60 [igc] <4>[ 10.649038] igc_ptp_clear_tx_tstamp+0x28/0x60 [igc] <4>[ 10.649048] igc_ptp_set_timestamp_mode.isra.0+0x20b/0x230 [igc] <4>[ 10.649056] igc_ptp_reset+0x31/0x180 [igc] <4>[ 10.649066] igc_reset+0xb4/0x100 [igc] <4>[ 10.649079] igc_probe+0x797/0x8e0 [igc] <4>[ 10.649091] pci_device_probe+0x95/0x120 <4>[ 10.649095] really_probe+0xd9/0x370 <4>[ 10.649099] ? __pfx___driver_attach+0x10/0x10 <4>[ 10.649101] __driver_probe_device+0x73/0x150 <4>[ 10.649103] driver_probe_device+0x19/0xa0 <4>[ 10.649105] __driver_attach+0xb6/0x180 <4>[ 10.649107] ? __pfx___driver_attach+0x10/0x10 <4>[ 10.649109] bus_for_each_dev+0x77/0xd0 <4>[ 10.649114] bus_add_driver+0x110/0x240 <4>[ 10.649117] driver_register+0x5b/0x110 <4>[ 10.649120] ? __pfx_igc_init_module+0x10/0x10 [igc] <4>[ 10.649130] do_one_initcall+0x5c/0x2b0 <4>[ 10.649134] ? kmalloc_trace_noprof+0x22f/0x290 <4>[ 10.649141] ? do_init_module+0x1e/0x210 <4>[ 10.669989] do_init_module+0x5f/0x210 <4>[ 10.669993] load_module+0x1d44/0x1fc0 <4>[ 10.670001] ? init_module_from_file+0x86/0xd0 <4>[ 10.670004] init_module_from_file+0x86/0xd0 <4>[ 10.670009] idempotent_init_module+0x17c/0x230 <4>[ 10.670015] __x64_sys_finit_module+0x56/0xb0 <4>[ 10.670019] do_syscall_64+0x69/0x140 <4>[ 10.670023] entry_SYSCALL_64_after_hwframe+0x76/0x7e <4>[ 10.670027] RIP: 0033:0x7f6d2704595d <4>[ 10.670030] Code: 00 c3 66 2e 0f 1f 84 00 00 00 00 00 90 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 03 35 0d 00 f7 d8 64 89 01 48 <4>[ 10.670032] RSP: 002b:00007ffc72aad018 EFLAGS: 00000246 ORIG_RAX: 0000000000000139 <4>[ 10.670036] RAX: ffffffffffffffda RBX: 000055d3f0e69690 RCX: 00007f6d2704595d <4>[ 10.670038] RDX: 0000000000000000 RSI: 00007f6d26f25ded RDI: 0000000000000010 <4>[ 10.670039] RBP: 0000000000020000 R08: 0000000000000000 R09: 0000000000000000 <4>[ 10.670041] R10: 0000000000000010 R11: 0000000000000246 R12: 00007f6d26f25ded <4>[ 10.670042] R13: 0000000000000000 R14: 000055d3f0c64d20 R15: 000055d3f0e69690 <4>[ 10.670046] </TASK> <6>[ 10.672046] pps pps0: new PPS source ptp0 References: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/11198 References: https://lore.kernel.org/r/87o78rmkhu.fsf@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com> --- drivers/net/ethernet/intel/igc/igc_main.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)