Re: [PATCH] firewire: core: Initialize topology_map.lock

[Takashi S. <o-t...@sa...>]

Hi,

Thanks for your sending the patch. I completely overlooked the lack of
initialization... Your patch fixes the same issue reported by Erhard
Furtner[1].

On Fri, Nov 14, 2025 at 12:25:31AM +0200, Ville Syrjala wrote:
> From: Ville Syrjälä <vil...@li...>
> 
> Lockdep barfs on the new uninitialized spinlock.
> Initialize it.
> 
> protip: enable lockdep (CONFIG_PROVE_LOCKING=y) when
>         doing locking changes
> 
> firewire_ohci 0000:02:01.1: added OHCI v1.10 device as card 0, 4 IR + 4 IT contexts, quirks 0x11
> INFO: trying to register non-static key.
> The code is fine but needs lockdep annotation, or maybe
> you didn't initialize this object before use?
> turning off the locking correctness validator.
> CPU: 0 UID: 0 PID: 1042 Comm: irq/17-firewire Not tainted 6.17.0-rc2-cl-bisect2-00026-g7d138cb269db #136 PREEMPT
> Hardware name: Dell Inc. Latitude E5400                  /0D695C, BIOS A19 06/13/2013
> Call Trace:
>  <TASK>
>  dump_stack_lvl+0x6d/0xa0
>  register_lock_class+0x783/0x790
>  ? find_held_lock+0x2b/0x80
>  ? __mod_timer+0x110/0x320
>  ? __mod_timer+0x110/0x320
>  __lock_acquire+0x405/0x2600
>  lock_acquire+0xca/0x2e0
>  ? fw_core_handle_bus_reset+0x888/0xca0 [firewire_core]
>  ? fw_core_handle_bus_reset+0x878/0xca0 [firewire_core]
>  ? fw_core_handle_bus_reset+0x878/0xca0 [firewire_core]
>  _raw_spin_lock+0x2e/0x40
>  ? fw_core_handle_bus_reset+0x888/0xca0 [firewire_core]
>  fw_core_handle_bus_reset+0x888/0xca0 [firewire_core]
>  handle_selfid_complete_event+0x35c/0x7a0 [firewire_ohci]
>  ? irq_thread+0x8d/0x280
>  irq_thread_fn+0x18/0x50
>  irq_thread+0x15a/0x280
>  ? irq_check_status_bit+0x100/0x100
>  ? lockdep_hardirqs_on+0x78/0x100
>  ? irq_finalize_oneshot.part.0+0xc0/0xc0
>  ? irq_forced_thread_fn+0x60/0x60
>  kthread+0x114/0x200
>  ? kthreads_online_cpu+0x110/0x110
>  ret_from_fork+0x158/0x1e0
>  ? kthreads_online_cpu+0x110/0x110
>  ret_from_fork_asm+0x11/0x20
>  </TASK>
> 
> Cc: lin...@li...
> Cc: Takashi Sakamoto <o-t...@sa...>
> Fixes: 7d138cb269db ("firewire: core: use spin lock specific to topology map")
> Signed-off-by: Ville Syrjälä <vil...@li...>
> ---
>  drivers/firewire/core-card.c | 2 ++
>  1 file changed, 2 insertions(+)

Applied to for-linus branch. I will send it to upstream as a part of
fixes for v6.18-rc6 kernel.

[1] https://lore.kernel.org/lkml/992...@ma.../


Thanks

Takashi Sakamoto