* Linux 5.10.34
@ 2021-05-02 9:51 Greg Kroah-Hartman
2021-05-02 9:51 ` Greg Kroah-Hartman
2021-05-04 1:27 ` Samuel Zou
0 siblings, 2 replies; 3+ messages in thread
From: Greg Kroah-Hartman @ 2021-05-02 9:51 UTC (permalink / raw)
To: linux-kernel, akpm, torvalds, stable; +Cc: lwn, jslaby, Greg Kroah-Hartman
I'm announcing the release of the 5.10.34 kernel.
All users of the 5.10 kernel series must upgrade.
The updated 5.10.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.10.y
and can be browsed at the normal kernel.org git web browser:
https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 +-
drivers/misc/mei/hw-me-regs.h | 1 +
drivers/misc/mei/pci-me.c | 1 +
drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 7 ++++---
4 files changed, 7 insertions(+), 4 deletions(-)
Greg Kroah-Hartman (1):
Linux 5.10.34
Jiri Kosina (1):
iwlwifi: Fix softirq/hardirq disabling in iwl_pcie_gen2_enqueue_hcmd()
Tomas Winkler (1):
mei: me: add Alder Lake P device id.
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: Linux 5.10.34 2021-05-02 9:51 Linux 5.10.34 Greg Kroah-Hartman @ 2021-05-02 9:51 ` Greg Kroah-Hartman 2021-05-04 1:27 ` Samuel Zou 1 sibling, 0 replies; 3+ messages in thread From: Greg Kroah-Hartman @ 2021-05-02 9:51 UTC (permalink / raw) To: linux-kernel, akpm, torvalds, stable; +Cc: lwn, jslaby, Greg Kroah-Hartman diff --git a/Makefile b/Makefile index fd5c8b5c013b..ac2f14a067d3 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 10 -SUBLEVEL = 33 +SUBLEVEL = 34 EXTRAVERSION = NAME = Dare mighty things diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h index 14be76d4c2e6..cb34925e10f1 100644 --- a/drivers/misc/mei/hw-me-regs.h +++ b/drivers/misc/mei/hw-me-regs.h @@ -105,6 +105,7 @@ #define MEI_DEV_ID_ADP_S 0x7AE8 /* Alder Lake Point S */ #define MEI_DEV_ID_ADP_LP 0x7A60 /* Alder Lake Point LP */ +#define MEI_DEV_ID_ADP_P 0x51E0 /* Alder Lake Point P */ /* * MEI HW Section diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index a7e179626b63..c3393b383e59 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -111,6 +111,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = { {MEI_PCI_DEVICE(MEI_DEV_ID_ADP_S, MEI_ME_PCH15_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_ADP_LP, MEI_ME_PCH15_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_ADP_P, MEI_ME_PCH15_CFG)}, /* required last entry */ {0, } diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c index 8c7138247869..833fd133d15b 100644 --- a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c +++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c @@ -87,6 +87,7 @@ static 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); @@ -155,14 +156,14 @@ static 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); @@ -297,7 +298,7 @@ static 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); ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: Linux 5.10.34 2021-05-02 9:51 Linux 5.10.34 Greg Kroah-Hartman 2021-05-02 9:51 ` Greg Kroah-Hartman @ 2021-05-04 1:27 ` Samuel Zou 1 sibling, 0 replies; 3+ messages in thread From: Samuel Zou @ 2021-05-04 1:27 UTC (permalink / raw) To: Greg Kroah-Hartman, linux-kernel, akpm, torvalds, stable; +Cc: lwn, jslaby On 2021/5/2 17:51, Greg Kroah-Hartman wrote: > I'm announcing the release of the 5.10.34 kernel. > > All users of the 5.10 kernel series must upgrade. > > The updated 5.10.y git tree can be found at: > git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-5.10.y > and can be browsed at the normal kernel.org git web browser: > https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary > > thanks, > > greg k-h > Tested on arm64 and x86 for 5.10.34, Kernel repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git Branch: linux-5.10.y Version: 5.10.34 Commit: 0aa66717f684f0280cc9bccf50f603e80d05495b Compiler: gcc version 7.3.0 (GCC) arm64: -------------------------------------------------------------------- Testcase Result Summary: total: 7955 passed: 7955 failed: 0 timeout: 0 -------------------------------------------------------------------- x86: -------------------------------------------------------------------- Testcase Result Summary: total: 7955 passed: 7955 failed: 0 timeout: 0 -------------------------------------------------------------------- Tested-by: Hulk Robot <hulkrobot@huawei.com> ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-05-04 1:27 UTC | newest] Thread overview: 3+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2021-05-02 9:51 Linux 5.10.34 Greg Kroah-Hartman 2021-05-02 9:51 ` Greg Kroah-Hartman 2021-05-04 1:27 ` Samuel Zou
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox