[char-misc] mei: me: disable mei interface on LBG servers.

[char-misc] mei: me: disable mei interface on LBG servers.

[Tomas Winkler]

Disable the MEI driver on LBG SPS (server) platforms, some corner
flows such as recovery mode does not work, and the driver
doesn't have working use cases.

Cc: <stable@vger.kernel.org>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
 drivers/misc/mei/hw-me.c  | 8 ++++++++
 drivers/misc/mei/hw-me.h  | 4 ++++
 drivers/misc/mei/pci-me.c | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
index 668418d7ea77..f620442addf5 100644
--- a/drivers/misc/mei/hw-me.c
+++ b/drivers/misc/mei/hw-me.c
@@ -1465,6 +1465,13 @@ static const struct mei_cfg mei_me_pch12_cfg = {
 	MEI_CFG_DMA_128,
 };
 
+/* LBG with quirk for SPS Firmware exclusion */
+static const struct mei_cfg mei_me_pch12_sps_cfg = {
+	MEI_CFG_PCH8_HFS,
+	MEI_CFG_FW_VER_SUPP,
+	MEI_CFG_FW_SPS,
+};
+
 /* Tiger Lake and newer devices */
 static const struct mei_cfg mei_me_pch15_cfg = {
 	MEI_CFG_PCH8_HFS,
@@ -1487,6 +1494,7 @@ static const struct mei_cfg *const mei_cfg_list[] = {
 	[MEI_ME_PCH8_CFG] = &mei_me_pch8_cfg,
 	[MEI_ME_PCH8_SPS_CFG] = &mei_me_pch8_sps_cfg,
 	[MEI_ME_PCH12_CFG] = &mei_me_pch12_cfg,
+	[MEI_ME_PCH12_SPS_CFG] = &mei_me_pch12_sps_cfg,
 	[MEI_ME_PCH15_CFG] = &mei_me_pch15_cfg,
 };
 
diff --git a/drivers/misc/mei/hw-me.h b/drivers/misc/mei/hw-me.h
index 4a8d4dcd5a91..b6b94e211464 100644
--- a/drivers/misc/mei/hw-me.h
+++ b/drivers/misc/mei/hw-me.h
@@ -80,6 +80,9 @@ struct mei_me_hw {
  *                         servers platforms with quirk for
  *                         SPS firmware exclusion.
  * @MEI_ME_PCH12_CFG:      Platform Controller Hub Gen12 and newer
+ * @MEI_ME_PCH12_SPS_CFG:  Platform Controller Hub Gen12 and newer
+ *                         servers platforms with quirk for
+ *                         SPS firmware exclusion.
  * @MEI_ME_PCH15_CFG:      Platform Controller Hub Gen15 and newer
  * @MEI_ME_NUM_CFG:        Upper Sentinel.
  */
@@ -93,6 +96,7 @@ enum mei_cfg_idx {
 	MEI_ME_PCH8_CFG,
 	MEI_ME_PCH8_SPS_CFG,
 	MEI_ME_PCH12_CFG,
+	MEI_ME_PCH12_SPS_CFG,
 	MEI_ME_PCH15_CFG,
 	MEI_ME_NUM_CFG,
 };
diff --git a/drivers/misc/mei/pci-me.c b/drivers/misc/mei/pci-me.c
index 3d21c38e2dbb..d4899a430e9d 100644
--- a/drivers/misc/mei/pci-me.c
+++ b/drivers/misc/mei/pci-me.c
@@ -70,7 +70,7 @@ static const struct pci_device_id mei_me_pci_tbl[] = {
 	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_2, MEI_ME_PCH8_CFG)},
 	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, MEI_ME_PCH8_SPS_CFG)},
 	{MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_2, MEI_ME_PCH8_SPS_CFG)},
-	{MEI_PCI_DEVICE(MEI_DEV_ID_LBG, MEI_ME_PCH12_CFG)},
+	{MEI_PCI_DEVICE(MEI_DEV_ID_LBG, MEI_ME_PCH12_SPS_CFG)},
 
 	{MEI_PCI_DEVICE(MEI_DEV_ID_BXT_M, MEI_ME_PCH8_CFG)},
 	{MEI_PCI_DEVICE(MEI_DEV_ID_APL_I, MEI_ME_PCH8_CFG)},
-- 
2.21.1

Re: [char-misc] mei: me: disable mei interface on LBG servers.

[Sasha Levin]

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.6.7, v5.4.35, v4.19.118, v4.14.177, v4.9.220, v4.4.220.

v5.6.7: Build OK!
v5.4.35: Failed to apply! Possible dependencies:
    52f6efdf8092 ("mei: add trc detection register to sysfs")

v4.19.118: Failed to apply! Possible dependencies:
    43b8a7ed4739 ("mei: expose device state in sysfs")
    52f6efdf8092 ("mei: add trc detection register to sysfs")
    ce0925e8c2f8 ("mei: dma ring buffers allocation")

v4.14.177: Failed to apply! Possible dependencies:
    173436ba800d ("mei: me: mark LBG devices as having dma support")
    1be8624a0cbe ("mei: me: add mule creek canyon (EHL) device ids")
    3cfaeb335305 ("mei: expose fw version to sysfs")
    43b8a7ed4739 ("mei: expose device state in sysfs")
    52f6efdf8092 ("mei: add trc detection register to sysfs")
    587f17407741 ("mei: me: add Tiger Lake point LP device ID")
    7026a5fd7f2c ("mei: define dma ring buffer sizes for PCH12 HW and newer")
    8d52af6795c0 ("mei: speed up the power down flow")
    af336cabe083 ("mei: limit the number of queued writes")
    ce0925e8c2f8 ("mei: dma ring buffers allocation")
    efe814e90b98 ("mei: me: add ice lake point device id.")
    f8204f0ddd62 ("mei: avoid FW version request on Ibex Peak and earlier")

v4.9.220: Failed to apply! Possible dependencies:
    17ba8a08b58a ("mei: consolidate repeating code in mei_cl_irq_read_msg")
    29fe7d59bdd8 ("mei: make mei_io_list_flush static")
    3cfaeb335305 ("mei: expose fw version to sysfs")
    43b8a7ed4739 ("mei: expose device state in sysfs")
    52f6efdf8092 ("mei: add trc detection register to sysfs")
    6537ae2f2041 ("mei: amthif: clean command queue upon disconnection")
    7026a5fd7f2c ("mei: define dma ring buffer sizes for PCH12 HW and newer")
    88d1bece891f ("mei: show the HBM protocol versions in the device attributes")
    962ff7bcec24 ("mei: replace callback structures used as list head by list_head")
    9ecdbc58f96b ("mei: amthif: allow the read completion after close")
    a2eb0fc07f4d ("mei: fix the back to back interrupt handling")
    af336cabe083 ("mei: limit the number of queued writes")
    e0cb6b2f878d ("mei: enable to set the internal flag for client write")
    f046192d98c9 ("mei: revamp io list cleanup function.")
    f5ac3c49ff0b ("mei: me: use an index instead of a pointer for private data")

v4.4.220: Failed to apply! Possible dependencies:
    32a1dc1d02eb ("mei: amthif: fix request cancel")
    3cfaeb335305 ("mei: expose fw version to sysfs")
    43b8a7ed4739 ("mei: expose device state in sysfs")
    4bddf56fc93c ("mei: amthif: use rx_wait queue also for amthif client")
    52f6efdf8092 ("mei: add trc detection register to sysfs")
    62e8e6ad6097 ("mei: rename variable names 'file_object' to fp")
    7026a5fd7f2c ("mei: define dma ring buffer sizes for PCH12 HW and newer")
    77537ad2917b ("mei: recover after errors in runtime pm flow")
    88d1bece891f ("mei: show the HBM protocol versions in the device attributes")
    8b2458f413c4 ("mei: always copy the read buffer if data is ready")
    9abd8b312924 ("mei: amthif: replace amthif_rd_complete_list with rd_completed")
    af336cabe083 ("mei: limit the number of queued writes")
    c85dba9e8737 ("mei: amthif: drop mei_clear_lists function")
    f046192d98c9 ("mei: revamp io list cleanup function.")
    f23e2cc4bb1d ("mei: constify struct file pointer")
    f5ac3c49ff0b ("mei: me: use an index instead of a pointer for private data")
    f862b6b24f0f ("mei: fix possible integer overflow issue")


NOTE: The patch will not be queued to stable trees until it is upstream.

How should we proceed with this patch?

-- 
Thanks
Sasha