mei: me: add comet point (lake) LP device ids
Subsystems (3)
PATCH 1/2 mei: me: add comet point (lake) LP device ids
Add Comet Point devices IDs for Comet Lake U platforms.
--- drivers/misc/mei/hw-me-regs.h | 3 +++ drivers/misc/mei/pci-me.c | 3 +++ 2 files changed, 6 insertions(+)
drivers/misc/mei/hw-me-regs.h +3 -0
@@ -79,6 +79,9 @@#define MEI_DEV_ID_CNP_H 0xA360/* Cannon Point H */ #define MEI_DEV_ID_CNP_H_4 0xA364/* Cannon Point H 4 (iTouch) */ +#define MEI_DEV_ID_CMP_LP 0x02e0/* Comet Point LP */ +#define MEI_DEV_ID_CMP_LP_3 0x02e4/* Comet Point LP 3 (iTouch) */ +#define MEI_DEV_ID_ICP_LP 0x34E0/* Ice Lake Point LP */ #define MEI_DEV_ID_TGP_LP 0xA0E0/* Tiger Lake Point LP */
drivers/misc/mei/pci-me.c +3 -0
@@ -96,6 +96,9 @@ static const struct pci_device_id mei_me_pci_tbl[] = { {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H, MEI_ME_PCH12_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_CNP_H_4, MEI_ME_PCH8_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_CMP_LP, MEI_ME_PCH12_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_CMP_LP_3, MEI_ME_PCH8_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_ICP_LP, MEI_ME_PCH12_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_TGP_LP, MEI_ME_PCH12_CFG)},
Signature · 1 line
2.21.0
PATCH 2/2 mei: avoid FW version request on Ibex Peak and earlier
From: Alexander Usyskin <[email protected]>
The fixed MKHI client on PCH 6 gen platforms
does not support fw version retrieval.
The error is not fatal, but it fills up the kernel logs and slows down the driver start.
This patch disables requesting FW version on GEN6 and earlier platforms.
Fixes warning:
[ 15.964298] mei mei::55213584-9a29-4916-badf-0fb7ed682aeb:01: Could not read FW version [ 15.964301] mei mei::55213584-9a29-4916-badf-0fb7ed682aeb:01: version command failed -5
--- drivers/misc/mei/bus-fixup.c | 16 +++++++++++++--- drivers/misc/mei/hw-me.c | 21 ++++++++++++++++++--- drivers/misc/mei/hw-me.h | 8 ++++++-- drivers/misc/mei/mei_dev.h | 4 ++++ drivers/misc/mei/pci-me.c | 10 +++++----- 5 files changed, 46 insertions(+), 13 deletions(-)
drivers/misc/mei/bus-fixup.c +13 -3
@@ -218,13 +218,23 @@ static void mei_mkhi_fix(struct mei_cl_device *cldev) {int ret; +dev_dbg (&cldev->dev,"running hook %s\n" , __func__); + +/* No need to enable the client if nothing is needed from it */ +if (!cldev->bus->fw_f_fw_ver_supported && + !cldev->bus->hbm_f_os_supported) +return ; + ret =mei_cldev_enable (cldev);if (ret)return ; - ret =mei_fwver (cldev); -if (ret <0 ) -dev_err (&cldev->dev,"FW version command failed %d\n" , ret); +if (cldev->bus->fw_f_fw_ver_supported) { + ret =mei_fwver (cldev); +if (ret <0 ) +dev_err (&cldev->dev,"FW version command failed %d\n" , + ret); + }if (cldev->bus->hbm_f_os_supported) { ret =mei_osver (cldev);
drivers/misc/mei/hw-me.c +18 -3
@@ -1355,6 +1355,8 @@ static bool mei_me_fw_type_sps(struct pci_dev *pdev)#define MEI_CFG_FW_SPS \ .quirk_probe = mei_me_fw_type_sps +#define MEI_CFG_FW_VER_SUPP \ + .fw_ver_supported = 1#define MEI_CFG_ICH_HFS \ .fw_status.count = 0
@@ -1392,31 +1394,41 @@ static const struct mei_cfg mei_me_ich10_cfg = { MEI_CFG_ICH10_HFS, }; -/* PCH devices */ -static const struct mei_cfg mei_me_pch_cfg = { +/* PCH6 devices */ +static const struct mei_cfg mei_me_pch6_cfg = {MEI_CFG_PCH_HFS , }; +/* PCH7 devices */ +static const struct mei_cfg mei_me_pch7_cfg = { +MEI_CFG_PCH_HFS , +MEI_CFG_FW_VER_SUPP , +}; +/* PCH Cougar Point and Patsburg with quirk for Node Manager exclusion */ static const struct mei_cfg mei_me_pch_cpt_pbg_cfg = {MEI_CFG_PCH_HFS , +MEI_CFG_FW_VER_SUPP ,MEI_CFG_FW_NM , };/* PCH8 Lynx Point and newer devices */ static const struct mei_cfg mei_me_pch8_cfg = {MEI_CFG_PCH8_HFS , +MEI_CFG_FW_VER_SUPP , };/* PCH8 Lynx Point with quirk for SPS Firmware exclusion */ static const struct mei_cfg mei_me_pch8_sps_cfg = {MEI_CFG_PCH8_HFS , +MEI_CFG_FW_VER_SUPP ,MEI_CFG_FW_SPS , };/* Cannon Lake and newer devices */ static const struct mei_cfg mei_me_pch12_cfg = {MEI_CFG_PCH8_HFS , +MEI_CFG_FW_VER_SUPP ,MEI_CFG_DMA_128 , };
@@ -1428,7 +1440,8 @@ static const struct mei_cfg *const mei_cfg_list[] = { [MEI_ME_UNDEF_CFG] = NULL, [MEI_ME_ICH_CFG] = &mei_me_ich_cfg, [MEI_ME_ICH10_CFG] = &mei_me_ich10_cfg, - [MEI_ME_PCH_CFG] = &mei_me_pch_cfg, + [MEI_ME_PCH6_CFG] = &mei_me_pch6_cfg, + [MEI_ME_PCH7_CFG] = &mei_me_pch7_cfg, [MEI_ME_PCH_CPT_PBG_CFG] = &mei_me_pch_cpt_pbg_cfg, [MEI_ME_PCH8_CFG] = &mei_me_pch8_cfg, [MEI_ME_PCH8_SPS_CFG] = &mei_me_pch8_sps_cfg,
@@ -1473,6 +1486,8 @@ struct mei_device *mei_me_dev_init(struct pci_dev *pdev,mei_device_init (dev, &pdev->dev, &mei_me_hw_ops); hw->cfg = cfg; + dev->fw_f_fw_ver_supported = cfg->fw_ver_supported; +return dev; }
drivers/misc/mei/hw-me.h +6 -2
@@ -20,11 +20,13 @@* @fw_status: FW status * @quirk_probe: device exclusion quirk * @dma_size: device DMA buffers size +* @fw_ver_supported: is fw version retrievable from FW */ struct mei_cfg {const struct mei_fw_status fw_status;bool (*quirk_probe)(struct pci_dev *pdev);size_t dma_size[DMA_DSCR_NUM ]; +u32 fw_ver_supported:1 ; };
@@ -62,7 +64,8 @@ struct mei_me_hw {* @MEI_ME_UNDEF_CFG: Lower sentinel. * @MEI_ME_ICH_CFG: I/O Controller Hub legacy devices. * @MEI_ME_ICH10_CFG: I/O Controller Hub platforms Gen10 -* @MEI_ME_PCH_CFG: Platform Controller Hub platforms (Up to Gen8). +* @MEI_ME_PCH6_CFG: Platform Controller Hub platforms (Gen6). +* @MEI_ME_PCH7_CFG: Platform Controller Hub platforms (Gen7). * @MEI_ME_PCH_CPT_PBG_CFG:Platform Controller Hub workstations * with quirk for Node Manager exclusion. * @MEI_ME_PCH8_CFG: Platform Controller Hub Gen8 and newer
@@ -77,7 +80,8 @@ enum mei_cfg_idx {MEI_ME_UNDEF_CFG ,MEI_ME_ICH_CFG ,MEI_ME_ICH10_CFG , -MEI_ME_PCH_CFG , +MEI_ME_PCH6_CFG , +MEI_ME_PCH7_CFG ,MEI_ME_PCH_CPT_PBG_CFG ,MEI_ME_PCH8_CFG , MEI_ME_PCH8_SPS_CFG,
drivers/misc/mei/mei_dev.h +4 -0
@@ -426,6 +426,8 @@ struct mei_fw_version {* * @fw_ver : FW versions * +* @fw_f_fw_ver_supported : fw feature: fw version supported +* * @me_clients_rwsem: rw lock over me_clients list * @me_clients : list of FW clients * @me_clients_map : FW clients bit map
@@ -506,6 +508,8 @@ struct mei_device {struct mei_fw_version fw_ver[MEI_MAX_FW_VER_BLOCKS ]; + unsigned int fw_f_fw_ver_supported:1; +struct rw_semaphore me_clients_rwsem;struct list_head me_clients;DECLARE_BITMAP (me_clients_map,MEI_CLIENTS_MAX );
drivers/misc/mei/pci-me.c +5 -5
@@ -61,13 +61,13 @@ static const struct pci_device_id mei_me_pci_tbl[] = { {MEI_PCI_DEVICE(MEI_DEV_ID_ICH10_3, MEI_ME_ICH10_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_ICH10_4, MEI_ME_ICH10_CFG)}, - {MEI_PCI_DEVICE(MEI_DEV_ID_IBXPK_1, MEI_ME_PCH_CFG)}, - {MEI_PCI_DEVICE(MEI_DEV_ID_IBXPK_2, MEI_ME_PCH_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_IBXPK_1, MEI_ME_PCH6_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_IBXPK_2, MEI_ME_PCH6_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_CPT_1, MEI_ME_PCH_CPT_PBG_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_PBG_1, MEI_ME_PCH_CPT_PBG_CFG)}, - {MEI_PCI_DEVICE(MEI_DEV_ID_PPT_1, MEI_ME_PCH_CFG)}, - {MEI_PCI_DEVICE(MEI_DEV_ID_PPT_2, MEI_ME_PCH_CFG)}, - {MEI_PCI_DEVICE(MEI_DEV_ID_PPT_3, MEI_ME_PCH_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_PPT_1, MEI_ME_PCH7_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_PPT_2, MEI_ME_PCH7_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_PPT_3, MEI_ME_PCH7_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_LPT_H, MEI_ME_PCH8_SPS_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_LPT_W, MEI_ME_PCH8_SPS_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_LPT_LP, MEI_ME_PCH8_CFG)},
Signature · 1 line
2.21.0
A message that is not in the archive (sent off-list or not yet received): [email protected]
Re: [char-misc for v4.5-rc2 2/2] mei: avoid FW version request on Ibex Peak and earlier
Dear Sasha,
Quoted 2 lines · Sasha Levin
This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: 4.18+
I’ll still need to test it.
Quoted 8 lines
The bot has tested the following trees: v5.3.1, v5.2.17, v4.19.75.
v5.3.1: Build OK!
v5.2.17: Build OK!
v4.19.75: Failed to apply! Possible dependencies:
ce0925e8c2f8("mei: dma ring buffers allocation")
Quoted 7 lines
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
--
Thanks,
Sasha
Could you please add a space after the two minuses: -- ? That would make it a valid signature separator, and mail clients can strip it.
Kind regards,
Paul
Sasha Levin
maintainerRe: [char-misc for v4.5-rc2 2/2] mei: avoid FW version request on Ibex Peak and earlier
Quoted 20 lines · Paul Menzel
Dear Sasha,
Quoted 2 lines · Sasha Levin
This commit has been processed because it contains a -stable tag. The stable tag indicates that it's relevant for the following trees: 4.18+
I’ll still need to test it.
Quoted 10 lines
The bot has tested the following trees: v5.3.1, v5.2.17, v4.19.75.
v5.3.1: Build OK!
v5.2.17: Build OK!
v4.19.75: Failed to apply! Possible dependencies:
ce0925e8c2f8("mei: dma ring buffers allocation")NOTE: The patch will not be queued to stable trees until it is upstream.
Quoted 7 lines
Quoted 5 lines
How should we proceed with this patch?
--
Thanks,
SashaCould you please add a space after the two minuses:
--? That would make it a valid signature separator, and mail clients can strip it.
I thought there was a space there :( Now added... Thanks!
--
Thanks,
Sasha
Greg Kroah-Hartman
maintainerRe: [char-misc for v4.5-rc2 2/2] mei: avoid FW version request on Ibex Peak and earlier
In reply to Tomas WinklerQuoted 29 lines · Tomas Winkler
From: Alexander Usyskin <[email protected]>
The fixed MKHI client on PCH 6 gen platforms
does not support fw version retrieval.
The error is not fatal, but it fills up the kernel logs and slows down the driver start.
This patch disables requesting FW version on GEN6 and earlier platforms.Fixes warning:
[ 15.964298] mei mei::55213584-9a29-4916-badf-0fb7ed682aeb:01: Could not read FW version [ 15.964301] mei mei::55213584-9a29-4916-badf-0fb7ed682aeb:01: version command failed -5Cc <[email protected]> +v4.18Cc Paul Menzel <[email protected]>Signed-off-by Alexander Usyskin <[email protected]>Signed-off-by Tomas Winkler <[email protected]>--- drivers/misc/mei/bus-fixup.c | 16 +++++++++++++--- drivers/misc/mei/hw-me.c | 21 ++++++++++++++++++--- drivers/misc/mei/hw-me.h | 8 ++++++-- drivers/misc/mei/mei_dev.h | 4 ++++ drivers/misc/mei/pci-me.c | 10 +++++----- 5 files changed, 46 insertions(+), 13 deletions(-)drivers/misc/mei/bus-fixup.c +0
-0
drivers/misc/mei/bus-fixup.c static void mei_mkhi_fix(struct mei_cl_device *cldev) · line 221
Quoted 4 lines
drivers/misc/mei/bus-fixup.c +1
-0@@ -218,13 +218,23 @@ static void mei_mkhi_fix(struct mei_cl_device *cldev) {int ret; +dev_dbg (&cldev->dev,"running hook %s\n" , __func__);
That is what ftrace is for, don't sprinkle that all over the kernel for no reason :(
thanks,
greg k-h