From: Jiri Kosina <jikos@kernel.org>
To: Heiner Kallweit <hkallweit1@gmail.com>
Cc: Kalle Valo <kvalo@codeaurora.org>,
linux-wireless <linux-wireless@vger.kernel.org>
Subject: [PATCH] iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_gen2_enqueue_hcmd()
Date: Wed, 7 Apr 2021 09:51:20 +0200 (CEST) [thread overview]
Message-ID: <nycvar.YFH.7.76.2104070918090.12405@cbobk.fhfr.pm> (raw)
In-Reply-To: <b71f7f03-fa87-74ab-4f10-5cebe3e70b60@gmail.com>
On Wed, 7 Apr 2021, Heiner Kallweit wrote:
> Same fix as in 2800aadc18a6 ("iwlwifi: Fix softirq/hardirq disabling in
> iwl_pcie_enqueue_hcmd()") is needed for iwl_pcie_gen2_enqueue_hcmd.
> I get the same lockdep warning on AX210.
Makes sense, it's being called from exactly the same contexts.
From: Jiri Kosina <jkosina@suse.cz>
Subject: [PATCH] iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_gen2_enqueue_hcmd()
Analogically to what we did in 2800aadc18a6 ("iwlwifi: Fix
softirq/hardirq disabling in iwl_pcie_enqueue_hcmd()"), we must apply the
same fix to iwl_pcie_gen2_enqueue_hcmd(), as it's being called from
exactly the same contexts.
Reported-by: Heiner Kallweit <hkallweit1@gmail.com
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
---
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
index 4456abb9a074..34bde8c87324 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
@@ -40,6 +40,7 @@ int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans,
const u8 *cmddata[IWL_MAX_CMD_TBS_PER_TFD];
u16 cmdlen[IWL_MAX_CMD_TBS_PER_TFD];
struct iwl_tfh_tfd *tfd;
+ unsigned long flags;
copy_size = sizeof(struct iwl_cmd_header_wide);
cmd_size = sizeof(struct iwl_cmd_header_wide);
@@ -108,14 +109,14 @@ int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans,
goto free_dup_buf;
}
- spin_lock_bh(&txq->lock);
+ spin_lock_irqsave(&txq->lock, flags);
idx = iwl_txq_get_cmd_index(txq, txq->write_ptr);
tfd = iwl_txq_get_tfd(trans, txq, txq->write_ptr);
memset(tfd, 0, sizeof(*tfd));
if (iwl_txq_space(trans, txq) < ((cmd->flags & CMD_ASYNC) ? 2 : 1)) {
- spin_unlock_bh(&txq->lock);
+ spin_unlock_irqrestore(&txq->lock, flags);
IWL_ERR(trans, "No space in command queue\n");
iwl_op_mode_cmd_queue_full(trans->op_mode);
@@ -250,7 +251,7 @@ int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans,
spin_unlock(&trans_pcie->reg_lock);
out:
- spin_unlock_bh(&txq->lock);
+ spin_unlock_irqrestore(&txq->lock, flags);
free_dup_buf:
if (idx < 0)
kfree(dup_buf);
--
Jiri Kosina
SUSE Labs
next prev parent reply other threads:[~2021-04-07 7:51 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-07 5:55 iwl_pcie_gen2_enqueue_hcmd needs same fix as iwl_pcie_enqueue_hcmd Heiner Kallweit
2021-04-07 7:51 ` Jiri Kosina [this message]
2021-04-07 7:55 ` [PATCH] iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_gen2_enqueue_hcmd() Johannes Berg
2021-04-07 7:56 ` Johannes Berg
2021-04-07 8:30 ` Heiner Kallweit
2021-04-17 8:50 ` Kalle Valo
[not found] ` <20210417085010.58522C433C6@smtp.codeaurora.org>
2021-04-17 9:12 ` Jiri Kosina
2021-04-17 9:13 ` [PATCH v2] " Jiri Kosina
2021-04-19 17:36 ` Kalle Valo
2021-04-17 9:24 ` [PATCH] " Jiri Kosina
2021-04-17 12:06 ` Sedat Dilek
2021-04-18 6:47 ` Sedat Dilek
2021-04-18 6:46 ` Kalle Valo
2021-04-18 7:07 ` Sedat Dilek
2021-04-15 12:04 Hans de Goede
2021-04-15 12:21 ` Johannes Berg
2021-04-15 12:37 ` Coelho, Luciano
2021-04-15 12:37 ` Johannes Berg
2021-04-15 12:43 ` Coelho, Luciano
2021-04-15 12:44 ` Jiri Kosina
2021-04-15 13:04 ` Coelho, Luciano
2021-04-15 13:06 ` Johannes Berg
2021-04-15 13:54 ` Coelho, Luciano
2021-04-15 15:32 ` Hans de Goede
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.YFH.7.76.2104070918090.12405@cbobk.fhfr.pm \
--to=jikos@kernel.org \
--cc=hkallweit1@gmail.com \
--cc=kvalo@codeaurora.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).