| Message ID | 20230729151516.24153-1-mschmidt@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 611e1b016c7beceec5ae82ac62d4a7ca224c8f9d |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] octeon_ep: initialize mbox mutexes | expand |
On Sat, Jul 29, 2023 at 05:15:16PM +0200, Michal Schmidt 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(). > > Fixes: 577f0d1b1c5f ("octeon_ep: add separate mailbox command and response queues") > Signed-off-by: Michal Schmidt <mschmidt@redhat.com> > --- > drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.c | 3 +++ > 1 file changed, 3 insertions(+) > Thanks, Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: 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!
diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.c b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.c index 035ead7935c7..dab61cc1acb5 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.c @@ -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);
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 <mschmidt@redhat.com> --- drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.c | 3 +++ 1 file changed, 3 insertions(+)