mbox series

[RFC,iwl-next,v1,0/4] Replace auxbus with ice_adapter in the PTP support code

Message ID 20240621084244.26525-1-sergey.temerkhanov@intel.com
Headers show
Series Replace auxbus with ice_adapter in the PTP support code | expand

Message

Sergey Temerkhanov June 21, 2024, 8:42 a.m. UTC
This series replaces multiple aux buses and devices used in
the PTP support code with struct ice_adapter holding the necessary
shared data

Patches 1,2 add convenience wrappers
Patch 3 does the main refactoring
Patch 4 finalizes the refactoring

Sergey Temerkhanov (4):
  ice: Introduce ice_get_phy_model() wrapper
  ice: Add ice_get_ctrl_ptp() wrapper to simplify the code
  ice: Use ice_adapter for PTP shared data instead of auxdev
  ice: Drop auxbus use for PTP to finalize ice_adapter move

 drivers/net/ethernet/intel/ice/ice.h         |   5 +
 drivers/net/ethernet/intel/ice/ice_adapter.c |   6 +
 drivers/net/ethernet/intel/ice/ice_adapter.h |  21 +-
 drivers/net/ethernet/intel/ice/ice_ptp.c     | 338 ++++---------------
 drivers/net/ethernet/intel/ice/ice_ptp.h     |  24 +-
 drivers/net/ethernet/intel/ice/ice_ptp_hw.c  |  22 +-
 drivers/net/ethernet/intel/ice/ice_ptp_hw.h  |   5 +
 7 files changed, 111 insertions(+), 310 deletions(-)

Comments

Michal Schmidt June 24, 2024, 1:38 p.m. UTC | #1
On Fri, Jun 21, 2024 at 10:44 AM Sergey Temerkhanov
<sergey.temerkhanov@intel.com> wrote:
> This series replaces multiple aux buses and devices used in
> the PTP support code with struct ice_adapter holding the necessary
> shared data
>
> Patches 1,2 add convenience wrappers
> Patch 3 does the main refactoring
> Patch 4 finalizes the refactoring
>
> Sergey Temerkhanov (4):
>   ice: Introduce ice_get_phy_model() wrapper
>   ice: Add ice_get_ctrl_ptp() wrapper to simplify the code
>   ice: Use ice_adapter for PTP shared data instead of auxdev
>   ice: Drop auxbus use for PTP to finalize ice_adapter move
>
>  drivers/net/ethernet/intel/ice/ice.h         |   5 +
>  drivers/net/ethernet/intel/ice/ice_adapter.c |   6 +
>  drivers/net/ethernet/intel/ice/ice_adapter.h |  21 +-
>  drivers/net/ethernet/intel/ice/ice_ptp.c     | 338 ++++---------------
>  drivers/net/ethernet/intel/ice/ice_ptp.h     |  24 +-
>  drivers/net/ethernet/intel/ice/ice_ptp_hw.c  |  22 +-
>  drivers/net/ethernet/intel/ice/ice_ptp_hw.h  |   5 +
>  7 files changed, 111 insertions(+), 310 deletions(-)

Hi Sergey,
This looks like a resend of your patchset from June 18.
I sent comments on June 20:
https://lists.osuosl.org/pipermail/intel-wired-lan/Week-of-Mon-20240617/042345.html
https://lists.osuosl.org/pipermail/intel-wired-lan/Week-of-Mon-20240617/042346.html

Michal
Pucha, HimasekharX Reddy July 11, 2024, 3:53 p.m. UTC | #2
> -----Original Message-----
> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Sergey Temerkhanov
> Sent: Friday, June 21, 2024 2:13 PM
> To: intel-wired-lan@lists.osuosl.org
> Cc: Temerkhanov, Sergey <sergey.temerkhanov@intel.com>
> Subject: [Intel-wired-lan] [RFC PATCH iwl-next v1 0/4] Replace auxbus with ice_adapter in the PTP support code
>
> This series replaces multiple aux buses and devices used in the PTP support code with struct ice_adapter holding the necessary shared data
>
> Patches 1,2 add convenience wrappers
> Patch 3 does the main refactoring
> Patch 4 finalizes the refactoring
>
> Sergey Temerkhanov (4):
>   ice: Introduce ice_get_phy_model() wrapper
>   ice: Add ice_get_ctrl_ptp() wrapper to simplify the code
>   ice: Use ice_adapter for PTP shared data instead of auxdev
>   ice: Drop auxbus use for PTP to finalize ice_adapter move
>
>  drivers/net/ethernet/intel/ice/ice.h         |   5 +
>  drivers/net/ethernet/intel/ice/ice_adapter.c |   6 +
>  drivers/net/ethernet/intel/ice/ice_adapter.h |  21 +-
>  drivers/net/ethernet/intel/ice/ice_ptp.c     | 338 ++++---------------
>  drivers/net/ethernet/intel/ice/ice_ptp.h     |  24 +-
>  drivers/net/ethernet/intel/ice/ice_ptp_hw.c  |  22 +-
>  drivers/net/ethernet/intel/ice/ice_ptp_hw.h  |   5 +
>  7 files changed, 111 insertions(+), 310 deletions(-)
>
> --
> 2.43.0
>

With these patch series observing PTP failed with below call stack.

[  +0.003443] ------------[ cut here ]------------
[  +0.000006] WARNING: CPU: 0 PID: 8 at drivers/net/ethernet/intel/ice/ice_ptp.c:2930 ice_ptp_init+0x2e8/0x5c0 [ice]
[  +0.000231] Modules linked in: ice(OE+) snd_seq_dummy snd_hrtimer snd_seq snd_timer snd_seq_device snd soundcore qrtr rfkill vfat fat rpcrdma sunrpc rdma_ucm ib_srpt intel_rapl_msr intel_rapl_common ib_isert intel_uncore_frequency intel_uncore_frequency_common iscsi_target_mod target_core_mod isst_if_common skx_edac nfit ib_iser libnvdimm libiscsi scsi_transport_iscsi rdma_cm x86_pkg_temp_thermal intel_powerclamp iw_cm coretemp ib_cm kvm_intel kvm ipmi_ssif rapl intel_cstate iTCO_wdt ib_uverbs iTCO_vendor_support lpc_ich intel_pch_thermal pcspkr acpi_power_meter intel_uncore mei_me ib_core ipmi_si i2c_i801 mei acpi_ipmi ioatdma ipmi_devintf i2c_smbus ipmi_msghandler joydev acpi_pad xfs libcrc32c ast drm_shmem_helper sd_mod drm_kms_helper t10_pi sg ixgbe drm i40e ahci crct10dif_pclmul libahci igb crc32_pclmul crc32c_intel ghash_clmulni_intel libata mdio i2c_algo_bit dca gnss libie wmi fuse [last unloaded: ice(OE)]
[  +0.000129] CPU: 0 PID: 8 Comm: kworker/0:0 Kdump: loaded Tainted: G        W  OE      6.10.0-rc5_next-queue_5th_July-01292-gd051d5283b53 #1
[  +0.000007] Hardware name: Intel Corporation S2600WFT/S2600WFT, BIOS SE5C620.86B.02.01.0010.010620200716 01/06/2020
[  +0.000004] Workqueue: events work_for_cpu_fn
[  +0.000010] RIP: 0010:ice_ptp_init+0x2e8/0x5c0 [ice]
[  +0.000189] Code: b6 83 e7 13 00 00 01 c0 88 83 ca 0b 00 00 e9 17 ff ff ff c7 83 1c 0b 00 00 00 00 00 00 48 8b 7b 08 48 85 ff 0f 85 53 fe ff ff <0f> 0b 41 bc ed ff ff ff 48 8b bb a8 0d 00 00 e9 56 ff ff ff e8 ff
[  +0.000006] RSP: 0018:ffffac214032fd38 EFLAGS: 00010246
[  +0.000005] RAX: 0000000000000000 RBX: ffff97597bfe01a0 RCX: ffffffff95696860
[  +0.000004] RDX: 0000000000000408 RSI: ffff9758f14f2c30 RDI: ffff975937623100
[  +0.000004] RBP: ffffac214032fd68 R08: ffff975887c4ce08 R09: ffff975887c4ce08
[  +0.000003] R10: ffff9763c3e93b38 R11: 0000000000000000 R12: ffff97597bfe01a0
[  +0.000003] R13: ffff97597bfe1548 R14: ffff975887c47000 R15: ffff97597bfe3530
[  +0.000003] FS:  0000000000000000(0000) GS:ffff97638fa00000(0000) knlGS:0000000000000000
[  +0.000005] CS:  0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[  +0.000004] CR2: 00007f6c0c58f9a0 CR3: 0000000c74998001 CR4: 00000000007706f0
[  +0.000004] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[  +0.000003] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
[  +0.000003] PKRU: 55555554
[  +0.000002] Call Trace:
[  +0.000006]  <TASK>
[  +0.000004]  ? __warn+0x7f/0x120
[  +0.000013]  ? ice_ptp_init+0x2e8/0x5c0 [ice]
[  +0.000190]  ? report_bug+0x18a/0x1a0
[  +0.000013]  ? handle_bug+0x3c/0x70
[  +0.000010]  ? exc_invalid_op+0x14/0x70
[  +0.000009]  ? asm_exc_invalid_op+0x16/0x20
[  +0.000009]  ? __pfx___device_attach_driver+0x10/0x10
[  +0.000013]  ? ice_ptp_init+0x2e8/0x5c0 [ice]
[  +0.000166]  ? ice_ptp_init+0x32/0x5c0 [ice]
[  +0.000159]  ice_init_features+0x1a6/0x280 [ice]
[  +0.000181]  ? ice_plug_aux_dev+0xd8/0x120 [ice]
[  +0.000209]  ice_load+0x2de/0x350 [ice]
[  +0.000180]  ice_probe+0x23c/0x300 [ice]
[  +0.000154]  local_pci_probe+0x43/0xa0
[  +0.000012]  work_for_cpu_fn+0x13/0x20
[  +0.000005]  process_one_work+0x179/0x390
[  +0.000010]  worker_thread+0x2e7/0x400
[  +0.000008]  ? __pfx_worker_thread+0x10/0x10
[  +0.000008]  kthread+0xcc/0x100
[  +0.000006]  ? __pfx_kthread+0x10/0x10
[  +0.000005]  ret_from_fork+0x2d/0x50
[  +0.000011]  ? __pfx_kthread+0x10/0x10
[  +0.000004]  ret_from_fork_asm+0x1a/0x30
[  +0.000010]  </TASK>
[  +0.000002] ---[ end trace 0000000000000000 ]---
[  +0.000006] ice 0000:18:00.1: PTP failed -19
Przemek Kitszel July 11, 2024, 9:03 p.m. UTC | #3
On 7/11/24 17:53, Pucha, HimasekharX Reddy wrote:
>> -----Original Message-----
>> From: Intel-wired-lan <intel-wired-lan-bounces@osuosl.org> On Behalf Of Sergey Temerkhanov
>> Sent: Friday, June 21, 2024 2:13 PM
>> To: intel-wired-lan@lists.osuosl.org
>> Cc: Temerkhanov, Sergey <sergey.temerkhanov@intel.com>
>> Subject: [Intel-wired-lan] [RFC PATCH iwl-next v1 0/4] Replace auxbus with ice_adapter in the PTP support code
>>
>> This series replaces multiple aux buses and devices used in the PTP support code with struct ice_adapter holding the necessary shared data
>>
>> Patches 1,2 add convenience wrappers
>> Patch 3 does the main refactoring
>> Patch 4 finalizes the refactoring
>>
>> Sergey Temerkhanov (4):
>>    ice: Introduce ice_get_phy_model() wrapper
>>    ice: Add ice_get_ctrl_ptp() wrapper to simplify the code
>>    ice: Use ice_adapter for PTP shared data instead of auxdev
>>    ice: Drop auxbus use for PTP to finalize ice_adapter move
>>
>>   drivers/net/ethernet/intel/ice/ice.h         |   5 +
>>   drivers/net/ethernet/intel/ice/ice_adapter.c |   6 +
>>   drivers/net/ethernet/intel/ice/ice_adapter.h |  21 +-
>>   drivers/net/ethernet/intel/ice/ice_ptp.c     | 338 ++++---------------
>>   drivers/net/ethernet/intel/ice/ice_ptp.h     |  24 +-
>>   drivers/net/ethernet/intel/ice/ice_ptp_hw.c  |  22 +-
>>   drivers/net/ethernet/intel/ice/ice_ptp_hw.h  |   5 +
>>   7 files changed, 111 insertions(+), 310 deletions(-)
>>
>> --
>> 2.43.0
>>
> 
> With these patch series observing PTP failed with below call stack.

Have you tried with v3 or this one (v1)?
Anyway, there were not much changes and we expect a followup.