From: Alexander Usyskin alexander.usyskin@intel.com
Add Cedar Fork (CDF) device ids, those belongs to the cannon point family.
Cc: stable@vger.kernel.org Signed-off-by: Alexander Usyskin alexander.usyskin@intel.com Signed-off-by: Tomas Winkler tomas.winkler@intel.com --- drivers/misc/mei/hw-me-regs.h | 2 ++ drivers/misc/mei/pci-me.c | 2 ++ 2 files changed, 4 insertions(+)
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h index d2359aed79ae..9392934e3a06 100644 --- a/drivers/misc/mei/hw-me-regs.h +++ b/drivers/misc/mei/hw-me-regs.h @@ -87,6 +87,8 @@ #define MEI_DEV_ID_CMP_H 0x06e0 /* Comet Lake H */ #define MEI_DEV_ID_CMP_H_3 0x06e4 /* Comet Lake H 3 (iTouch) */
+#define MEI_DEV_ID_CDF 0x18D3 /* Cedar Fork */ + #define MEI_DEV_ID_ICP_LP 0x34E0 /* Ice Lake Point LP */
#define MEI_DEV_ID_JSP_N 0x4DE0 /* Jasper Lake Point N */ diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c index ebdc2d6f8ddb..3d21c38e2dbb 100644 --- a/drivers/misc/mei/pci-me.c +++ b/drivers/misc/mei/pci-me.c @@ -102,6 +102,8 @@ static const struct pci_device_id mei_me_pci_tbl[] = { {MEI_PCI_DEVICE(MEI_DEV_ID_MCC, MEI_ME_PCH15_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_MCC_4, MEI_ME_PCH8_CFG)},
+ {MEI_PCI_DEVICE(MEI_DEV_ID_CDF, MEI_ME_PCH8_CFG)}, + /* required last entry */ {0, } };
Hi
[This is an automated email]
This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: all
The bot has tested the following trees: v5.5.11, v5.4.27, v4.19.112, v4.14.174, v4.9.217, v4.4.217.
v5.5.11: Build OK! v5.4.27: Build OK! v4.19.112: Build OK! v4.14.174: Failed to apply! Possible dependencies: 1be8624a0cbe ("mei: me: add mule creek canyon (EHL) device ids") 4d86dfd38285 ("mei: me: add comet point (lake) LP device ids") 559e575a8946 ("mei: me: add comet point (lake) H device ids") 82b29b9f72af ("mei: me: add comet point V device id") efe814e90b98 ("mei: me: add ice lake point device id.")
v4.9.217: Failed to apply! Possible dependencies: 1be8624a0cbe ("mei: me: add mule creek canyon (EHL) device ids") 4d86dfd38285 ("mei: me: add comet point (lake) LP device ids") 559e575a8946 ("mei: me: add comet point (lake) H device ids") 82b29b9f72af ("mei: me: add comet point V device id") efe814e90b98 ("mei: me: add ice lake point device id.") f8f4aa68a8ae ("mei: me: add cannon point device ids")
v4.4.217: Failed to apply! Possible dependencies: 1be8624a0cbe ("mei: me: add mule creek canyon (EHL) device ids") 4d86dfd38285 ("mei: me: add comet point (lake) LP device ids") 559e575a8946 ("mei: me: add comet point (lake) H device ids") 82b29b9f72af ("mei: me: add comet point V device id") efe814e90b98 ("mei: me: add ice lake point device id.") f8f4aa68a8ae ("mei: me: add cannon point device ids")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
linux-stable-mirror@lists.linaro.org