Hi,

The implementation of bus manager work, bm_work() function, has many
lines for the procedure to contend for bus manager as well as to
transfer phy configuration packet for root node selection and gap count
optimization.

This patchset is to refactor the code for the procedure. A new helper
function is added to contend for bus manager. The outcome of contention
is evaluated as a return code of the helper function, then the root node
at next generation is decided. The phy configuration packet is
transferred and generate bus reset lastly.

Takashi Sakamoto (6):
  firewire: core: remove useless generation check
  firewire: core: use switch statement to evaluate transaction result to
    CSR_BUS_MANAGER_ID
  firewire: core: code refactoring for the case of generation mismatch
  firewire: core: code refactoring to split contention procedure for bus
    manager
  firewire: core; eliminate pick_me goto label
  firewire: core: minor code refactoring to delete useless local
    variable

 drivers/firewire/core-card.c | 336 +++++++++++++++++++----------------
 1 file changed, 178 insertions(+), 158 deletions(-)


base-commit: e6d2338b6f3e522872f3a14fcc5e5de2f58bf23b
-- 
2.48.1

Hi,

This patchset is the revised version of my previous one:
https://lore.kernel.org/lkml/20250918230857.127400-1-o-takashi@sakamocchi.jp/

Changes from v1:
* Ensure to initialize local variable

Takashi Sakamoto (6):
  firewire: core: remove useless generation check
  firewire: core: use switch statement to evaluate transaction result to
    CSR_BUS_MANAGER_ID
  firewire: core: code refactoring for the case of generation mismatch
  firewire: core: code refactoring to split contention procedure for bus
    manager
  firewire: core; eliminate pick_me goto label
  firewire: core: minor code refactoring to delete useless local
    variable

 drivers/firewire/core-card.c | 335 ++++++++++++++++++-----------------
 1 file changed, 177 insertions(+), 158 deletions(-)


base-commit: e6d2338b6f3e522872f3a14fcc5e5de2f58bf23b
-- 
2.48.1

On Fri, Sep 19, 2025 at 08:54:42AM +0900, Takashi Sakamoto wrote:
> Hi,
> 
> This patchset is the revised version of my previous one:
> https://lore.kernel.org/lkml/20250918230857.127400-1-o-takashi@sakamocchi.jp/
> 
> Changes from v1:
> * Ensure to initialize local variable
> 
> Takashi Sakamoto (6):
>   firewire: core: remove useless generation check
>   firewire: core: use switch statement to evaluate transaction result to
>     CSR_BUS_MANAGER_ID
>   firewire: core: code refactoring for the case of generation mismatch
>   firewire: core: code refactoring to split contention procedure for bus
>     manager
>   firewire: core; eliminate pick_me goto label
>   firewire: core: minor code refactoring to delete useless local
>     variable
> 
>  drivers/firewire/core-card.c | 335 ++++++++++++++++++-----------------
>  1 file changed, 177 insertions(+), 158 deletions(-)

Applied to for-next branch.


Regards

Takashi Sakamoto