FAILED: patch "[PATCH] mei: me: add nova lake point H DID" failed to apply to 6.18-stable tree
Subsystems (3)
[email protected]
maintainerThe patch below does not apply to the 6.18-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y
git checkout FETCH_HEAD
git cherry-pick -x a5a1804332afc7035d5c5b880548262e81d796bc
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026042701-singular-disaster-12a5@gregkh' --subject-prefix 'PATCH 6.18.y' HEAD^..
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From a5a1804332afc7035d5c5b880548262e81d796bc Mon Sep 17 00:00:00 2001
From: Alexander Usyskin <[email protected]>
Date: Sun, 5 Apr 2026 17:17:58 +0300
Subject: [PATCH] mei: me: add nova lake point H DID
Add Nova Lake H device id.
drivers/misc/mei/hw-me-regs.h +1 -0
@@ -123,6 +123,7 @@#define PCI_DEVICE_ID_INTEL_MEI_WCL_P 0x4D70/* Wildcat Lake P */ #define PCI_DEVICE_ID_INTEL_MEI_NVL_S 0x6E68/* Nova Lake Point S */ +#define PCI_DEVICE_ID_INTEL_MEI_NVL_H 0xD370/* Nova Lake Point H */ #define PCI_DEVICE_ID_INTEL_MEI_CRI 0x6766/* Crescent Island */
drivers/misc/mei/pci-me.c +1 -0
@@ -131,6 +131,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = { {PCI_DEVICE_DATA(INTEL, MEI_WCL_P, MEI_ME_PCH15_CFG)}, {PCI_DEVICE_DATA(INTEL, MEI_NVL_S, MEI_ME_PCH15_CFG)}, + {PCI_DEVICE_DATA(INTEL, MEI_NVL_H, MEI_ME_PCH15_CFG)},/* required last entry */ {0, }
Sasha Levin
maintainerPATCH 1/2 mei: me: use PCI_DEVICE_DATA macro
From: Alexander Usyskin <[email protected]>
[ Upstream commit 9e7a2409ecf4d411b7cc91615b08f6a7576f0aaa ]
Drop old local MEI_PCI_DEVICE macro and use common PCI_DEVICE_DATA instead.
Update defines to adhere to current naming convention.
Stable-dep-of: a5a1804332af ("mei: me: add nova lake point H DID")
--- drivers/misc/mei/bus-fixup.c | 6 +- drivers/misc/mei/hw-me-regs.h | 162 +++++++++++++------------- drivers/misc/mei/hw-me.h | 6 - drivers/misc/mei/pci-me.c | 208 +++++++++++++++++----------------- 4 files changed, 188 insertions(+), 194 deletions(-)
drivers/misc/mei/bus-fixup.c +3 -3
@@ -303,9 +303,9 @@ static void mei_wd(struct mei_cl_device *cldev) {struct pci_dev *pdev =to_pci_dev (cldev->dev.parent); -if (pdev->device ==MEI_DEV_ID_WPT_LP || - pdev->device ==MEI_DEV_ID_SPT || - pdev->device ==MEI_DEV_ID_SPT_H ) +if (pdev->device ==PCI_DEVICE_ID_INTEL_MEI_WPT_LP || + pdev->device ==PCI_DEVICE_ID_INTEL_MEI_SPT || + pdev->device ==PCI_DEVICE_ID_INTEL_MEI_SPT_H ) cldev->me_cl->props.protocol_version =0x2 ; cldev->do_match =1 ;
drivers/misc/mei/hw-me-regs.h +81 -81
201 lines not on this page · raw message
drivers/misc/mei/hw-me.h +0 -6
@@ -33,12 +33,6 @@ struct mei_cfg { u32 hw_trc_supported:1; }; - -#define MEI_PCI_DEVICE (dev, cfg) \ - .vendor = PCI_VENDOR_ID_INTEL, .device = (dev), \ - .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, \ - .driver_data = (kernel_ulong_t)(cfg), -#define MEI_ME_RPM_TIMEOUT 500/* ms */ /**
drivers/misc/mei/pci-me.c +104 -104
214 lines not on this page · raw message
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 mei: me: add nova lake point H DID
From: Alexander Usyskin <[email protected]>
[ Upstream commit a5a1804332afc7035d5c5b880548262e81d796bc ]
Add Nova Lake H device id.
--- drivers/misc/mei/hw-me-regs.h | 1 + drivers/misc/mei/pci-me.c | 1 + 2 files changed, 2 insertions(+)
drivers/misc/mei/hw-me-regs.h +1 -0
@@ -123,6 +123,7 @@#define PCI_DEVICE_ID_INTEL_MEI_WCL_P 0x4D70/* Wildcat Lake P */ #define PCI_DEVICE_ID_INTEL_MEI_NVL_S 0x6E68/* Nova Lake Point S */ +#define PCI_DEVICE_ID_INTEL_MEI_NVL_H 0xD370/* Nova Lake Point H */ /* * MEI HW Section
drivers/misc/mei/pci-me.c +1 -0
@@ -130,6 +130,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = { {PCI_DEVICE_DATA(INTEL, MEI_WCL_P, MEI_ME_PCH15_CFG)}, {PCI_DEVICE_DATA(INTEL, MEI_NVL_S, MEI_ME_PCH15_CFG)}, + {PCI_DEVICE_DATA(INTEL, MEI_NVL_H, MEI_ME_PCH15_CFG)},/* required last entry */ {0, }
Signature · 1 line
2.53.0