* [char-misc 1/4] mei: me: disable driver on the ign firmware
@ 2022-02-15 8:04 Tomas Winkler
2022-02-15 8:04 ` [char-misc-next 2/4] mei: me: avoid link reset on shutdown Tomas Winkler
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Tomas Winkler @ 2022-02-15 8:04 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Alexander Usyskin, Vitaly Lubart, linux-kernel, stable,
Tomas Winkler
From: Alexander Usyskin <alexander.usyskin@intel.com>
Add a quirk to disable MEI interface on Intel PCH Ignition (IGN)
as the IGN firmware doesn't support the protocol.
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 | 1 +
drivers/misc/mei/hw-me.c | 23 ++++++++++++-----------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
index 67bb6a25fd0a..888c27bc3f1a 100644
--- a/drivers/misc/mei/hw-me-regs.h
+++ b/drivers/misc/mei/hw-me-regs.h
@@ -120,6 +120,7 @@
#define PCI_CFG_HFS_2 0x48
#define PCI_CFG_HFS_3 0x60
# define PCI_CFG_HFS_3_FW_SKU_MSK 0x00000070
+# define PCI_CFG_HFS_3_FW_SKU_IGN 0x00000000
# define PCI_CFG_HFS_3_FW_SKU_SPS 0x00000060
#define PCI_CFG_HFS_4 0x64
#define PCI_CFG_HFS_5 0x68
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
index d3a6c0728645..fbc4c9581864 100644
--- a/drivers/misc/mei/hw-me.c
+++ b/drivers/misc/mei/hw-me.c
@@ -1405,16 +1405,16 @@ static bool mei_me_fw_type_sps_4(const struct pci_dev *pdev)
.quirk_probe = mei_me_fw_type_sps_4
/**
- * mei_me_fw_type_sps() - check for sps sku
+ * mei_me_fw_type_sps_ign() - check for sps or ign sku
*
- * Read ME FW Status register to check for SPS Firmware.
- * The SPS FW is only signaled in pci function 0
+ * Read ME FW Status register to check for SPS or IGN Firmware.
+ * The SPS/IGN FW is only signaled in pci function 0
*
* @pdev: pci device
*
- * Return: true in case of SPS firmware
+ * Return: true in case of SPS/IGN firmware
*/
-static bool mei_me_fw_type_sps(const struct pci_dev *pdev)
+static bool mei_me_fw_type_sps_ign(const struct pci_dev *pdev)
{
u32 reg;
u32 fw_type;
@@ -1427,14 +1427,15 @@ static bool mei_me_fw_type_sps(const struct pci_dev *pdev)
dev_dbg(&pdev->dev, "fw type is %d\n", fw_type);
- return fw_type == PCI_CFG_HFS_3_FW_SKU_SPS;
+ return fw_type == PCI_CFG_HFS_3_FW_SKU_IGN ||
+ fw_type == PCI_CFG_HFS_3_FW_SKU_SPS;
}
#define MEI_CFG_KIND_ITOUCH \
.kind = "itouch"
-#define MEI_CFG_FW_SPS \
- .quirk_probe = mei_me_fw_type_sps
+#define MEI_CFG_FW_SPS_IGN \
+ .quirk_probe = mei_me_fw_type_sps_ign
#define MEI_CFG_FW_VER_SUPP \
.fw_ver_supported = 1
@@ -1535,7 +1536,7 @@ static const struct mei_cfg mei_me_pch12_sps_cfg = {
MEI_CFG_PCH8_HFS,
MEI_CFG_FW_VER_SUPP,
MEI_CFG_DMA_128,
- MEI_CFG_FW_SPS,
+ MEI_CFG_FW_SPS_IGN,
};
/* Cannon Lake itouch with quirk for SPS 5.0 and newer Firmware exclusion
@@ -1545,7 +1546,7 @@ static const struct mei_cfg mei_me_pch12_itouch_sps_cfg = {
MEI_CFG_KIND_ITOUCH,
MEI_CFG_PCH8_HFS,
MEI_CFG_FW_VER_SUPP,
- MEI_CFG_FW_SPS,
+ MEI_CFG_FW_SPS_IGN,
};
/* Tiger Lake and newer devices */
@@ -1562,7 +1563,7 @@ static const struct mei_cfg mei_me_pch15_sps_cfg = {
MEI_CFG_FW_VER_SUPP,
MEI_CFG_DMA_128,
MEI_CFG_TRC,
- MEI_CFG_FW_SPS,
+ MEI_CFG_FW_SPS_IGN,
};
/*
--
2.34.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [char-misc-next 2/4] mei: me: avoid link reset on shutdown
2022-02-15 8:04 [char-misc 1/4] mei: me: disable driver on the ign firmware Tomas Winkler
@ 2022-02-15 8:04 ` Tomas Winkler
2022-02-15 8:04 ` [char-misc-next 3/4] mei: me: fix reset policy on read error in interrupt Tomas Winkler
` (2 subsequent siblings)
3 siblings, 0 replies; 7+ messages in thread
From: Tomas Winkler @ 2022-02-15 8:04 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Alexander Usyskin, Vitaly Lubart, linux-kernel, Tomas Winkler
From: Alexander Usyskin <alexander.usyskin@intel.com>
Avoid lingering reset thread on driver shutdown.
If the firmware is down during a shutdown flow
do not initiate the link reset, simply disconnect
all clients and let shutdown flow finish
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
drivers/misc/mei/client.c | 1 +
drivers/misc/mei/hw-me.c | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/drivers/misc/mei/client.c b/drivers/misc/mei/client.c
index 06734670a732..31264ab2eb13 100644
--- a/drivers/misc/mei/client.c
+++ b/drivers/misc/mei/client.c
@@ -2148,6 +2148,7 @@ void mei_cl_all_disconnect(struct mei_device *dev)
list_for_each_entry(cl, &dev->file_list, link)
mei_cl_set_disconnected(cl);
}
+EXPORT_SYMBOL_GPL(mei_cl_all_disconnect);
static struct mei_cl *mei_cl_dma_map_find(struct mei_device *dev, u8 buffer_id)
{
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
index fbc4c9581864..3a86c087bc9d 100644
--- a/drivers/misc/mei/hw-me.c
+++ b/drivers/misc/mei/hw-me.c
@@ -1257,7 +1257,11 @@ irqreturn_t mei_me_irq_thread_handler(int irq, void *dev_id)
/* check if ME wants a reset */
if (!mei_hw_is_ready(dev) && dev->dev_state != MEI_DEV_RESETTING) {
dev_warn(dev->dev, "FW not ready: resetting.\n");
- schedule_work(&dev->reset_work);
+ if (dev->dev_state == MEI_DEV_POWERING_DOWN ||
+ dev->dev_state == MEI_DEV_POWER_DOWN)
+ mei_cl_all_disconnect(dev);
+ else if (dev->dev_state != MEI_DEV_DISABLED)
+ schedule_work(&dev->reset_work);
goto end;
}
--
2.34.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [char-misc-next 3/4] mei: me: fix reset policy on read error in interrupt
2022-02-15 8:04 [char-misc 1/4] mei: me: disable driver on the ign firmware Tomas Winkler
2022-02-15 8:04 ` [char-misc-next 2/4] mei: me: avoid link reset on shutdown Tomas Winkler
@ 2022-02-15 8:04 ` Tomas Winkler
2022-02-15 8:04 ` [char-misc-next 4/4] mei: do not overwrite state on hw start Tomas Winkler
2022-02-15 10:24 ` [char-misc 1/4] mei: me: disable driver on the ign firmware Greg Kroah-Hartman
3 siblings, 0 replies; 7+ messages in thread
From: Tomas Winkler @ 2022-02-15 8:04 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Alexander Usyskin, Vitaly Lubart, linux-kernel, Tomas Winkler
From: Alexander Usyskin <alexander.usyskin@intel.com>
Avoid link reset in DISABLED and POWERING_DOWN state
if read error is occurred - let shutdown flow finish.
In any state exit interrupt handler if read error occurred.
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
drivers/misc/mei/hw-me.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
index 3a86c087bc9d..719fee9af156 100644
--- a/drivers/misc/mei/hw-me.c
+++ b/drivers/misc/mei/hw-me.c
@@ -1293,12 +1293,14 @@ irqreturn_t mei_me_irq_thread_handler(int irq, void *dev_id)
if (rets == -ENODATA)
break;
- if (rets &&
- (dev->dev_state != MEI_DEV_RESETTING &&
- dev->dev_state != MEI_DEV_POWER_DOWN)) {
- dev_err(dev->dev, "mei_irq_read_handler ret = %d.\n",
- rets);
- schedule_work(&dev->reset_work);
+ if (rets) {
+ dev_err(dev->dev, "mei_irq_read_handler ret = %d, state = %d.\n",
+ rets, dev->dev_state);
+ if (dev->dev_state != MEI_DEV_RESETTING &&
+ dev->dev_state != MEI_DEV_DISABLED &&
+ dev->dev_state != MEI_DEV_POWERING_DOWN &&
+ dev->dev_state != MEI_DEV_POWER_DOWN)
+ schedule_work(&dev->reset_work);
goto end;
}
}
--
2.34.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [char-misc-next 4/4] mei: do not overwrite state on hw start
2022-02-15 8:04 [char-misc 1/4] mei: me: disable driver on the ign firmware Tomas Winkler
2022-02-15 8:04 ` [char-misc-next 2/4] mei: me: avoid link reset on shutdown Tomas Winkler
2022-02-15 8:04 ` [char-misc-next 3/4] mei: me: fix reset policy on read error in interrupt Tomas Winkler
@ 2022-02-15 8:04 ` Tomas Winkler
2022-02-15 10:24 ` [char-misc 1/4] mei: me: disable driver on the ign firmware Greg Kroah-Hartman
3 siblings, 0 replies; 7+ messages in thread
From: Tomas Winkler @ 2022-02-15 8:04 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Alexander Usyskin, Vitaly Lubart, linux-kernel, Tomas Winkler
From: Alexander Usyskin <alexander.usyskin@intel.com>
During the hardware start sequence, do not overwrite the driver state
and do not proceed with the initialization sequence if the state
was changed while the driver was waiting for the start interrupt.
This can happen if the driver's removal/stop procedure was triggered
from the parent level while the driver is waiting for the start
interrupt. This may lead to stray the reset work or the timer
after driver were removed.
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
drivers/misc/mei/init.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index f79076c67256..eb052005ca86 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -161,6 +161,11 @@ int mei_reset(struct mei_device *dev)
return ret;
}
+ if (dev->dev_state != MEI_DEV_RESETTING) {
+ dev_dbg(dev->dev, "wrong state = %d on link start\n", dev->dev_state);
+ return 0;
+ }
+
dev_dbg(dev->dev, "link is established start sending messages.\n");
mei_set_devstate(dev, MEI_DEV_INIT_CLIENTS);
--
2.34.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [char-misc 1/4] mei: me: disable driver on the ign firmware
2022-02-15 8:04 [char-misc 1/4] mei: me: disable driver on the ign firmware Tomas Winkler
` (2 preceding siblings ...)
2022-02-15 8:04 ` [char-misc-next 4/4] mei: do not overwrite state on hw start Tomas Winkler
@ 2022-02-15 10:24 ` Greg Kroah-Hartman
2022-02-15 13:56 ` Winkler, Tomas
3 siblings, 1 reply; 7+ messages in thread
From: Greg Kroah-Hartman @ 2022-02-15 10:24 UTC (permalink / raw)
To: Tomas Winkler; +Cc: Alexander Usyskin, Vitaly Lubart, linux-kernel, stable
On Tue, Feb 15, 2022 at 10:04:35AM +0200, Tomas Winkler wrote:
> From: Alexander Usyskin <alexander.usyskin@intel.com>
>
> Add a quirk to disable MEI interface on Intel PCH Ignition (IGN)
> as the IGN firmware doesn't support the protocol.
>
> 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 | 1 +
> drivers/misc/mei/hw-me.c | 23 ++++++++++++-----------
> 2 files changed, 13 insertions(+), 11 deletions(-)
I see 2 different copies of this patch/email:
https://lore.kernel.org/all/20220215075748.264195-1-tomas.winkler@intel.com/
https://lore.kernel.org/all/20220215080438.264876-1-tomas.winkler@intel.com/
which one is right?
confused,
greg k-h
^ permalink raw reply [flat|nested] 7+ messages in thread* RE: [char-misc 1/4] mei: me: disable driver on the ign firmware
2022-02-15 10:24 ` [char-misc 1/4] mei: me: disable driver on the ign firmware Greg Kroah-Hartman
@ 2022-02-15 13:56 ` Winkler, Tomas
0 siblings, 0 replies; 7+ messages in thread
From: Winkler, Tomas @ 2022-02-15 13:56 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Usyskin, Alexander, Lubart, Vitaly, linux-kernel@vger.kernel.org,
stable@vger.kernel.org
>
> On Tue, Feb 15, 2022 at 10:04:35AM +0200, Tomas Winkler wrote:
> > From: Alexander Usyskin <alexander.usyskin@intel.com>
> >
> > Add a quirk to disable MEI interface on Intel PCH Ignition (IGN) as
> > the IGN firmware doesn't support the protocol.
> >
> > 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 | 1 +
> > drivers/misc/mei/hw-me.c | 23 ++++++++++++-----------
> > 2 files changed, 13 insertions(+), 11 deletions(-)
>
> I see 2 different copies of this patch/email:
> https://lore.kernel.org/all/20220215075748.264195-1-
> tomas.winkler@intel.com/
> https://lore.kernel.org/all/20220215080438.264876-1-
> tomas.winkler@intel.com/
>
> which one is right?
>
> confused,
Sorry, they are the same, looks like a hiccup in a script, it was sent twice.
Thanks
Tomas
^ permalink raw reply [flat|nested] 7+ messages in thread
* [char-misc 1/4] mei: me: disable driver on the ign firmware
@ 2022-02-15 7:57 Tomas Winkler
0 siblings, 0 replies; 7+ messages in thread
From: Tomas Winkler @ 2022-02-15 7:57 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: Alexander Usyskin, Vitaly Lubart, linux-kernel, stable,
Tomas Winkler
From: Alexander Usyskin <alexander.usyskin@intel.com>
Add a quirk to disable MEI interface on Intel PCH Ignition (IGN)
as the IGN firmware doesn't support the protocol.
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 | 1 +
drivers/misc/mei/hw-me.c | 23 ++++++++++++-----------
2 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/drivers/misc/mei/hw-me-regs.h b/drivers/misc/mei/hw-me-regs.h
index 67bb6a25fd0a..888c27bc3f1a 100644
--- a/drivers/misc/mei/hw-me-regs.h
+++ b/drivers/misc/mei/hw-me-regs.h
@@ -120,6 +120,7 @@
#define PCI_CFG_HFS_2 0x48
#define PCI_CFG_HFS_3 0x60
# define PCI_CFG_HFS_3_FW_SKU_MSK 0x00000070
+# define PCI_CFG_HFS_3_FW_SKU_IGN 0x00000000
# define PCI_CFG_HFS_3_FW_SKU_SPS 0x00000060
#define PCI_CFG_HFS_4 0x64
#define PCI_CFG_HFS_5 0x68
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
index d3a6c0728645..fbc4c9581864 100644
--- a/drivers/misc/mei/hw-me.c
+++ b/drivers/misc/mei/hw-me.c
@@ -1405,16 +1405,16 @@ static bool mei_me_fw_type_sps_4(const struct pci_dev *pdev)
.quirk_probe = mei_me_fw_type_sps_4
/**
- * mei_me_fw_type_sps() - check for sps sku
+ * mei_me_fw_type_sps_ign() - check for sps or ign sku
*
- * Read ME FW Status register to check for SPS Firmware.
- * The SPS FW is only signaled in pci function 0
+ * Read ME FW Status register to check for SPS or IGN Firmware.
+ * The SPS/IGN FW is only signaled in pci function 0
*
* @pdev: pci device
*
- * Return: true in case of SPS firmware
+ * Return: true in case of SPS/IGN firmware
*/
-static bool mei_me_fw_type_sps(const struct pci_dev *pdev)
+static bool mei_me_fw_type_sps_ign(const struct pci_dev *pdev)
{
u32 reg;
u32 fw_type;
@@ -1427,14 +1427,15 @@ static bool mei_me_fw_type_sps(const struct pci_dev *pdev)
dev_dbg(&pdev->dev, "fw type is %d\n", fw_type);
- return fw_type == PCI_CFG_HFS_3_FW_SKU_SPS;
+ return fw_type == PCI_CFG_HFS_3_FW_SKU_IGN ||
+ fw_type == PCI_CFG_HFS_3_FW_SKU_SPS;
}
#define MEI_CFG_KIND_ITOUCH \
.kind = "itouch"
-#define MEI_CFG_FW_SPS \
- .quirk_probe = mei_me_fw_type_sps
+#define MEI_CFG_FW_SPS_IGN \
+ .quirk_probe = mei_me_fw_type_sps_ign
#define MEI_CFG_FW_VER_SUPP \
.fw_ver_supported = 1
@@ -1535,7 +1536,7 @@ static const struct mei_cfg mei_me_pch12_sps_cfg = {
MEI_CFG_PCH8_HFS,
MEI_CFG_FW_VER_SUPP,
MEI_CFG_DMA_128,
- MEI_CFG_FW_SPS,
+ MEI_CFG_FW_SPS_IGN,
};
/* Cannon Lake itouch with quirk for SPS 5.0 and newer Firmware exclusion
@@ -1545,7 +1546,7 @@ static const struct mei_cfg mei_me_pch12_itouch_sps_cfg = {
MEI_CFG_KIND_ITOUCH,
MEI_CFG_PCH8_HFS,
MEI_CFG_FW_VER_SUPP,
- MEI_CFG_FW_SPS,
+ MEI_CFG_FW_SPS_IGN,
};
/* Tiger Lake and newer devices */
@@ -1562,7 +1563,7 @@ static const struct mei_cfg mei_me_pch15_sps_cfg = {
MEI_CFG_FW_VER_SUPP,
MEI_CFG_DMA_128,
MEI_CFG_TRC,
- MEI_CFG_FW_SPS,
+ MEI_CFG_FW_SPS_IGN,
};
/*
--
2.34.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-02-15 13:56 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-15 8:04 [char-misc 1/4] mei: me: disable driver on the ign firmware Tomas Winkler
2022-02-15 8:04 ` [char-misc-next 2/4] mei: me: avoid link reset on shutdown Tomas Winkler
2022-02-15 8:04 ` [char-misc-next 3/4] mei: me: fix reset policy on read error in interrupt Tomas Winkler
2022-02-15 8:04 ` [char-misc-next 4/4] mei: do not overwrite state on hw start Tomas Winkler
2022-02-15 10:24 ` [char-misc 1/4] mei: me: disable driver on the ign firmware Greg Kroah-Hartman
2022-02-15 13:56 ` Winkler, Tomas
-- strict thread matches above, loose matches on Subject: below --
2022-02-15 7:57 Tomas Winkler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox