Commit 8c289ea0 authored by Alexander Usyskin's avatar Alexander Usyskin Committed by Greg Kroah-Hartman
Browse files

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: <stable@vger.kernel.org>
Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Link: https://lore.kernel.org/r/20200619165121.2145330-7-tomas.winkler@intel.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f76d77f5

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

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ 
#define MEI_DEV_ID_JSP_N      0x4DE0  /* Jasper Lake Point N */



#define MEI_DEV_ID_TGP_LP     0xA0E0  /* Tiger Lake Point LP */

#define MEI_DEV_ID_TGP_H      0x43E0  /* Tiger Lake Point H */



#define MEI_DEV_ID_MCC        0x4B70  /* Mule Creek Canyon (EHL) */

#define MEI_DEV_ID_MCC_4      0x4B75  /* Mule Creek Canyon 4 (EHL) */

drivers/misc/mei/hw-me.c

+10 −0
Original line number Diff line number Diff line
@@ -1526,6 +1526,15 @@ static const struct mei_cfg mei_me_pch15_cfg = { 
	MEI_CFG_TRC,

};



/* Tiger Lake with quirk for SPS 5.0 and newer Firmware exclusion */

static const struct mei_cfg mei_me_pch15_sps_cfg = {

	MEI_CFG_PCH8_HFS,

	MEI_CFG_FW_VER_SUPP,

	MEI_CFG_DMA_128,

	MEI_CFG_TRC,

	MEI_CFG_FW_SPS,

};



/*

 * mei_cfg_list - A list of platform platform specific configurations.

 * Note: has to be synchronized with  enum mei_cfg_idx.
@@ -1544,6 +1553,7 @@ static const struct mei_cfg *const mei_cfg_list[] = { 
	[MEI_ME_PCH12_SPS_CFG] = &mei_me_pch12_sps_cfg,

	[MEI_ME_PCH12_SPS_NODMA_CFG] = &mei_me_pch12_nodma_sps_cfg,

	[MEI_ME_PCH15_CFG] = &mei_me_pch15_cfg,

	[MEI_ME_PCH15_SPS_CFG] = &mei_me_pch15_sps_cfg,

};



const struct mei_cfg *mei_me_get_cfg(kernel_ulong_t idx)

drivers/misc/mei/hw-me.h

+4 −0
Original line number Diff line number Diff line
@@ -87,6 +87,9 @@ struct mei_me_hw { 
 *                         servers platforms with quirk for

 *                         SPS firmware exclusion.

 * @MEI_ME_PCH15_CFG:      Platform Controller Hub Gen15 and newer

 * @MEI_ME_PCH15_SPS_CFG:  Platform Controller Hub Gen15 and newer

 *                         servers platforms with quirk for

 *                         SPS firmware exclusion.

 * @MEI_ME_NUM_CFG:        Upper Sentinel.

 */

enum mei_cfg_idx {
@@ -103,6 +106,7 @@ enum mei_cfg_idx { 
	MEI_ME_PCH12_SPS_CFG,

	MEI_ME_PCH12_SPS_NODMA_CFG,

	MEI_ME_PCH15_CFG,

	MEI_ME_PCH15_SPS_CFG,

	MEI_ME_NUM_CFG,

};

drivers/misc/mei/pci-me.c

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = { 
	{MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)},



	{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH15_CFG)},

	{MEI_PCI_DEVICE(MEI_DEV_ID_TGP_H, MEI_ME_PCH15_SPS_CFG)},



	{MEI_PCI_DEVICE(MEI_DEV_ID_JSP_N, MEI_ME_PCH15_CFG)},

CRA Git | Maintained and supported by SUSTech CRA and CCSE