Skip to contentSkip to conversation

octeon_ep: initialize mbox mutexes

PATCH Applied Michal Schmidt 3 participants 3 messages Jul 29, 2023 – Jul 31, 2023

Subsystems (3)
Networking Network drivers Marvell octeon endpoint driver
lore
Share & tools
lore

Michal Schmidt

author
#0 lore raw

PATCH 1/1 octeon_ep: initialize mbox mutexes

The two mbox-related mutexes are destroyed in octep_ctrl_mbox_uninit(), but the corresponding mutex_init calls were missing.
A "DEBUG_LOCKS_WARN_ON(lock->magic != lock)" warning was emitted with CONFIG_DEBUG_MUTEXES on.

Initialize the two mutexes in octep_ctrl_mbox_init().

Fixes 577f0d1b1c5f ("octeon_ep: add separate mailbox command and response queues")
Signed-off-by Michal Schmidt <[email protected]>
---
 drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.c +3 -0
index 035ead7935c7..dab61cc1acb5 100644
@@ -98,6 +98,9 @@ int octep_ctrl_mbox_init(struct octep_ctrl_mbox *mbox)
 	writeq(OCTEP_CTRL_MBOX_STATUS_INIT,
 	       OCTEP_CTRL_MBOX_INFO_HOST_STATUS(mbox->barmem));
 
+	mutex_init(&mbox->h2fq_lock);
+	mutex_init(&mbox->f2hq_lock);
+
 	mbox->h2fq.sz = readl(OCTEP_CTRL_MBOX_H2FQ_SZ(mbox->barmem));
 	mbox->h2fq.hw_prod = OCTEP_CTRL_MBOX_H2FQ_PROD(mbox->barmem);
 	mbox->h2fq.hw_cons = OCTEP_CTRL_MBOX_H2FQ_CONS(mbox->barmem);
Signature · 1 line
2.41.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Michal Schmidt

The two mbox-related mutexes are destroyed in octep_ctrl_mbox_uninit(), but the corresponding mutex_init calls were missing.
A "DEBUG_LOCKS_WARN_ON(lock->magic != lock)" warning was emitted with CONFIG_DEBUG_MUTEXES on.

Quoted 8 lines

Initialize the two mutexes in octep_ctrl_mbox_init().

Fixes 577f0d1b1c5f ("octeon_ep: add separate mailbox command and response queues")
Signed-off-by Michal Schmidt <[email protected]>
---
 drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.c | 3 +++
 1 file changed, 3 insertions(+)

Thanks,

Reviewed-by Leon Romanovsky <[email protected]>
CI Applied
#2 lore raw
In reply to Michal Schmidt
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:

Quoted 8 lines · On Sat, 29 Jul 2023 17:15:16 +0200 you wrote:

The two mbox-related mutexes are destroyed in octep_ctrl_mbox_uninit(), but the corresponding mutex_init calls were missing.
A "DEBUG_LOCKS_WARN_ON(lock->magic != lock)" warning was emitted with CONFIG_DEBUG_MUTEXES on.

Initialize the two mutexes in octep_ctrl_mbox_init().

[...]

Here is the summary with links:
- [net] octeon_ep: initialize mbox mutexes

    https://git.kernel.org/netdev/net/c/611e1b016c7b

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html