mirror of
https://github.com/armbian/build.git
synced 2025-08-26 17:01:10 +02:00
76 lines
2.5 KiB
Diff
76 lines
2.5 KiB
Diff
diff --git a/Makefile b/Makefile
|
|
index fd5c8b5c013bf..ac2f14a067d33 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 14be76d4c2e61..cb34925e10f15 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 a7e179626b635..c3393b383e598 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 8c7138247869a..833fd133d15bd 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);
|