From: Jari Ruusu <jariruusu@protonmail.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"stable@vger.kernel.org" <stable@vger.kernel.org>,
Jiri Kosina <jkosina@suse.cz>, Kalle Valo <kvalo@codeaurora.org>
Subject: Re: [PATCH 5.10 1/2] iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_gen2_enqueue_hcmd()
Date: Mon, 03 May 2021 11:23:20 +0000 [thread overview]
Message-ID: <Hig2EMhMlLkgVm8GsOtjPNaG0CIsMhzr2xut7H3zy7xwbsnbKXh9ka8t6dOUarQ6ZMKxTeYzZLlZWqH8echjcvuYsN8xYCfS2VDlwB0pgKo=@protonmail.com> (raw)
In-Reply-To: <YI6HFNNvzuHnv5VU@kroah.com>
On Sunday, May 2, 2021 2:03 PM, Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote:
> If you could provide backported patches to those kernels you think this
> is needed to, I can take them directly. Otherwise running sed isn't
> always the easiest thing to do on my end :)
iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_enqueue_hcmd()
upstream commit 2800aadc18a64c96b051bcb7da8a7df7d505db3f,
backport for linux-4.14.y (booted and ping tested)
Signed-off-by: Jari Ruusu <jariruusu@protonmail.com>
--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
@@ -1473,6 +1473,7 @@ static int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,
u32 cmd_pos;
const u8 *cmddata[IWL_MAX_CMD_TBS_PER_TFD];
u16 cmdlen[IWL_MAX_CMD_TBS_PER_TFD];
+ unsigned long flags2;
if (WARN(!trans->wide_cmd_header &&
group_id > IWL_ALWAYS_LONG_GROUP,
@@ -1556,10 +1557,10 @@ static int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,
goto free_dup_buf;
}
- spin_lock_bh(&txq->lock);
+ spin_lock_irqsave(&txq->lock, flags2);
if (iwl_queue_space(txq) < ((cmd->flags & CMD_ASYNC) ? 2 : 1)) {
- spin_unlock_bh(&txq->lock);
+ spin_unlock_irqrestore(&txq->lock, flags2);
IWL_ERR(trans, "No space in command queue\n");
iwl_op_mode_cmd_queue_full(trans->op_mode);
@@ -1720,7 +1721,7 @@ static int iwl_pcie_enqueue_hcmd(struct iwl_trans *trans,
spin_unlock_irqrestore(&trans_pcie->reg_lock, flags);
out:
- spin_unlock_bh(&txq->lock);
+ spin_unlock_irqrestore(&txq->lock, flags2);
free_dup_buf:
if (idx < 0)
kfree(dup_buf);
--
Jari Ruusu 4096R/8132F189 12D6 4C3A DCDA 0AA4 27BD ACDF F073 3C80 8132 F189
next prev parent reply other threads:[~2021-05-03 11:33 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-30 14:20 [PATCH 5.10 0/2] 5.10.34-rc1 review Greg Kroah-Hartman
2021-04-30 14:20 ` [PATCH 5.10 1/2] iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_gen2_enqueue_hcmd() Greg Kroah-Hartman
2021-05-01 7:12 ` Jari Ruusu
2021-05-02 11:03 ` Greg Kroah-Hartman
2021-05-03 11:20 ` Jari Ruusu
2021-05-03 11:22 ` Jari Ruusu
2021-05-03 11:23 ` Jari Ruusu [this message]
2021-05-03 11:24 ` Jari Ruusu
2021-05-03 11:25 ` Jari Ruusu
2021-05-03 11:27 ` Jari Ruusu
2021-05-04 7:24 ` Greg Kroah-Hartman
2021-05-04 13:05 ` Jari Ruusu
2021-05-04 13:36 ` Greg Kroah-Hartman
2021-05-04 14:22 ` Jari Ruusu
2021-05-04 15:35 ` Greg Kroah-Hartman
2021-05-04 17:02 ` Jari Ruusu
2021-05-04 17:18 ` Greg Kroah-Hartman
2021-05-04 17:04 ` Jari Ruusu
2021-04-30 14:20 ` [PATCH 5.10 2/2] mei: me: add Alder Lake P device id Greg Kroah-Hartman
2021-04-30 17:35 ` [PATCH 5.10 0/2] 5.10.34-rc1 review Fox Chen
2021-04-30 20:14 ` Pavel Machek
2021-04-30 22:35 ` Sudip Mukherjee
2021-04-30 23:29 ` Florian Fainelli
2021-05-01 7:45 ` Naresh Kamboju
2021-05-01 13:13 ` Guenter Roeck
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='Hig2EMhMlLkgVm8GsOtjPNaG0CIsMhzr2xut7H3zy7xwbsnbKXh9ka8t6dOUarQ6ZMKxTeYzZLlZWqH8echjcvuYsN8xYCfS2VDlwB0pgKo=@protonmail.com' \
--to=jariruusu@protonmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=jkosina@suse.cz \
--cc=kvalo@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@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).