Skip to content

Commit 8c289ea

Browse files
ausyskingregkh
authored andcommitted
mei: me: add tiger lake point device ids for H platforms.
Add Tiger Lake device ids H for HECI1. TGH_H is also used in Tatlow SPS platform we need to disable the mei interface there. Cc: <[email protected]> Signed-off-by: Alexander Usyskin <[email protected]> Signed-off-by: Tomas Winkler <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent f76d77f commit 8c289ea

File tree

4 files changed

+16
-0
lines changed

4 files changed

+16
-0
lines changed

drivers/misc/mei/hw-me-regs.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@
9494
#define MEI_DEV_ID_JSP_N 0x4DE0 /* Jasper Lake Point N */
9595

9696
#define MEI_DEV_ID_TGP_LP 0xA0E0 /* Tiger Lake Point LP */
97+
#define MEI_DEV_ID_TGP_H 0x43E0 /* Tiger Lake Point H */
9798

9899
#define MEI_DEV_ID_MCC 0x4B70 /* Mule Creek Canyon (EHL) */
99100
#define MEI_DEV_ID_MCC_4 0x4B75 /* Mule Creek Canyon 4 (EHL) */

drivers/misc/mei/hw-me.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1526,6 +1526,15 @@ static const struct mei_cfg mei_me_pch15_cfg = {
15261526
MEI_CFG_TRC,
15271527
};
15281528

1529+
/* Tiger Lake with quirk for SPS 5.0 and newer Firmware exclusion */
1530+
static const struct mei_cfg mei_me_pch15_sps_cfg = {
1531+
MEI_CFG_PCH8_HFS,
1532+
MEI_CFG_FW_VER_SUPP,
1533+
MEI_CFG_DMA_128,
1534+
MEI_CFG_TRC,
1535+
MEI_CFG_FW_SPS,
1536+
};
1537+
15291538
/*
15301539
* mei_cfg_list - A list of platform platform specific configurations.
15311540
* Note: has to be synchronized with enum mei_cfg_idx.
@@ -1544,6 +1553,7 @@ static const struct mei_cfg *const mei_cfg_list[] = {
15441553
[MEI_ME_PCH12_SPS_CFG] = &mei_me_pch12_sps_cfg,
15451554
[MEI_ME_PCH12_SPS_NODMA_CFG] = &mei_me_pch12_nodma_sps_cfg,
15461555
[MEI_ME_PCH15_CFG] = &mei_me_pch15_cfg,
1556+
[MEI_ME_PCH15_SPS_CFG] = &mei_me_pch15_sps_cfg,
15471557
};
15481558

15491559
const struct mei_cfg *mei_me_get_cfg(kernel_ulong_t idx)

drivers/misc/mei/hw-me.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@ struct mei_me_hw {
8787
* servers platforms with quirk for
8888
* SPS firmware exclusion.
8989
* @MEI_ME_PCH15_CFG: Platform Controller Hub Gen15 and newer
90+
* @MEI_ME_PCH15_SPS_CFG: Platform Controller Hub Gen15 and newer
91+
* servers platforms with quirk for
92+
* SPS firmware exclusion.
9093
* @MEI_ME_NUM_CFG: Upper Sentinel.
9194
*/
9295
enum mei_cfg_idx {
@@ -103,6 +106,7 @@ enum mei_cfg_idx {
103106
MEI_ME_PCH12_SPS_CFG,
104107
MEI_ME_PCH12_SPS_NODMA_CFG,
105108
MEI_ME_PCH15_CFG,
109+
MEI_ME_PCH15_SPS_CFG,
106110
MEI_ME_NUM_CFG,
107111
};
108112

drivers/misc/mei/pci-me.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
9696
{MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)},
9797

9898
{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH15_CFG)},
99+
{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_H, MEI_ME_PCH15_SPS_CFG)},
99100

100101
{MEI_PCI_DEVICE(MEI_DEV_ID_JSP_N, MEI_ME_PCH15_CFG)},
101102

0 commit comments

Comments
 (0)