Fix MEI command timeout issue following warm reboot
Subsystems (3)
v2 cover Fix MEI command timeout issue following warm reboot
While enabling the IVSC on certain recent commercial products, the chipset may occasionally enter an unknown state following a warm reboot. This issue can cause the firmware to fail in responding to the MEI command from the host, despite the firmware being re-downloaded. To resolve this, the current patch set incorporates reset logic during system shutdown to ensure that the IVSC chipset remains in a valid state after a warm reboot.
Furthermore, after the firmware download is complete, the firmware requires some time to become operational. To enhance this, additional sleep time has been introduced before the initial read operation to prevent a confusing timeout error in vsc_tp_xfer().
Additionally, this patch set includes several enhancements as well:
1) utilizing the appropriate byte order swap function for data received from the ROM;
2) correcting a spelling error in a comment;
3) Constructing the SPI transfer command as per the specific request.
---
v1 -> v2:
- remove cc spelling fix to stable
- remove the reset toggling enhancement
Wentong Wu (5):
mei: vsc: Enhance IVSC chipset stability during warm reboot
mei: vsc: Enhance SPI transfer of IVSC rom
mei: vsc: Utilize the appropriate byte order swap function
mei: vsc: Prevent timeout error with added delay post-firmware
download
mei: vsc: Fix spelling error
drivers/misc/mei/platform-vsc.c | 4 ++-- drivers/misc/mei/vsc-fw-loader.c | 2 +- drivers/misc/mei/vsc-tp.c | 18 ++++++++++++++++-- 3 files changed, 19 insertions(+), 5 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 1/5 mei: vsc: Enhance IVSC chipset stability during warm reboot
During system shutdown, incorporate reset logic to ensure the IVSC chipset remains in a valid state. This adjustment guarantees that the IVSC chipset operates in a known state following a warm reboot.
--- drivers/misc/mei/vsc-tp.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/misc/mei/vsc-tp.c +14 -0
@@ -568,6 +568,19 @@ static void vsc_tp_remove(struct spi_device *spi)free_irq (spi->irq, tp); } +static void vsc_tp_shutdown (struct spi_device *spi) +{ +struct vsc_tp *tp =spi_get_drvdata (spi); + +platform_device_unregister (tp->pdev); + +mutex_destroy (&tp->mutex); + +vsc_tp_reset (tp); + +free_irq (spi->irq, tp); +} +static const struct acpi_device_id vsc_tp_acpi_ids[] = { {"INTC1009" },/* Raptor Lake */ {"INTC1058" },/* Tiger Lake */
@@ -580,6 +593,7 @@ MODULE_DEVICE_TABLE(acpi, vsc_tp_acpi_ids);static struct spi_driver vsc_tp_driver = { .probe = vsc_tp_probe, .remove = vsc_tp_remove, + .shutdown = vsc_tp_shutdown, .driver = { .name ="vsc-tp" , .acpi_match_table = vsc_tp_acpi_ids,
Signature · 1 line
2.34.1
PATCH v2 2/5 mei: vsc: Enhance SPI transfer of IVSC rom
In reply to Wentong WuConstructing the SPI transfer command as per the specific request.
--- drivers/misc/mei/vsc-tp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/mei/vsc-tp.c +1 -1
@@ -331,7 +331,7 @@ int vsc_tp_rom_xfer(struct vsc_tp *tp, const void *obuf, void *ibuf, size_t len)return ret; } - ret =vsc_tp_dev_xfer (tp, tp->tx_buf, tp->rx_buf, len); + ret =vsc_tp_dev_xfer (tp, tp->tx_buf, ibuf ? tp->rx_buf : ibuf, len);if (ret)return ret;
Signature · 1 line
2.34.1
Re: [PATCH v2 2/5] mei: vsc: Enhance SPI transfer of IVSC rom
Hi Wentong,
Quoted 15 lines · Wentong Wu
Constructing the SPI transfer command as per the specific request.
Fixes 566f5ca97680 ("mei: Add transport driver for IVSC device")Cc [email protected] # for 6.8+Signed-off-by Wentong Wu <[email protected]>Tested-by Jason Chen <[email protected]>--- drivers/misc/mei/vsc-tp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/misc/mei/vsc-tp.c +0
-0
drivers/misc/mei/vsc-tp.c int vsc_tp_rom_xfer(struct vsc_tp *tp, const void *obuf, void *ibuf, size_t len) · line 334
Quoted 5 lines
drivers/misc/mei/vsc-tp.c +1
-1@@ -331,7 +331,7 @@ int vsc_tp_rom_xfer(struct vsc_tp *tp, const void *obuf, void *ibuf, size_t len)return ret; } - ret =vsc_tp_dev_xfer (tp, tp->tx_buf, tp->rx_buf, len); + ret =vsc_tp_dev_xfer (tp, tp->tx_buf, ibuf ? tp->rx_buf : ibuf, len);
The latter ibuf should be NULL explicitly.
Quoted 3 lines
drivers/misc/mei/vsc-tp.c +0
-0if (ret)return ret;
Signature · 3 lines
Kind regards, Sakari Ailus
RE: [PATCH v2 2/5] mei: vsc: Enhance SPI transfer of IVSC rom
Quoted 21 lines
From: Sakari Ailus <[email protected]>
Hi Wentong,
drivers/misc/mei/vsc-tp.c int vsc_tp_rom_xfer(struct vsc_tp *tp, const void
Quoted 15 lines · Wentong Wu
Constructing the SPI transfer command as per the specific request.
Fixes 566f5ca97680 ("mei: Add transport driver for IVSC device")Cc [email protected] # for 6.8+Signed-off-by Wentong Wu <[email protected]>Tested-by Jason Chen <[email protected]>--- drivers/misc/mei/vsc-tp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/misc/mei/vsc-tp.c +0
-0@@ -331,7 +331,7 @@ int vsc_tp_rom_xfer(struct vsc_tp *tp, const void*obuf, void *ibuf,
size_tlen)
Quoted 8 lines
drivers/misc/mei/vsc-tp.c int vsc_tp_rom_xfer(struct vsc_tp *tp, const void *obuf, void *ibuf, size_t len)
Quoted 6 lines
drivers/misc/mei/vsc-tp.c +2
-1return ret; } - ret =vsc_tp_dev_xfer (tp, tp->tx_buf, tp->rx_buf, len); + ret =vsc_tp_dev_xfer (tp, tp->tx_buf, ibuf ? tp->rx_buf : ibuf, +len);The latter ibuf should be NULL explicitly.
Ack, thanks, that will be fixed in v3 patch set.
BR,
Wentong
Quoted 9 lines
drivers/misc/mei/vsc-tp.c int vsc_tp_rom_xfer(struct vsc_tp *tp, const void *obuf, void *ibuf, size_t len) · line 336
Quoted 4 lines
drivers/misc/mei/vsc-tp.c +0
-0if (ret)return ret;--
Kind regards,Sakari Ailus
PATCH v2 3/5 mei: vsc: Utilize the appropriate byte order swap function
In reply to Wentong WuSwitch from cpu_to_be32_array() to be32_to_cpu_array() for the received rom data.
--- drivers/misc/mei/vsc-tp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/mei/vsc-tp.c +1 -1
@@ -336,7 +336,7 @@ int vsc_tp_rom_xfer(struct vsc_tp *tp, const void *obuf, void *ibuf, size_t len)return ret;if (ibuf) -cpu_to_be32_array (ibuf, tp->rx_buf, words); +be32_to_cpu_array (ibuf, tp->rx_buf, words);return ret; }
Signature · 1 line
2.34.1
PATCH v2 4/5 mei: vsc: Prevent timeout error with added delay post-firmware download
In reply to Wentong WuAfter completing the firmware download, the firmware requires some time to become functional. This change introduces additional sleep time before the first read operation to prevent a confusing timeout error in vsc_tp_xfer().
--- drivers/misc/mei/platform-vsc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/misc/mei/platform-vsc.c +2 -2
@@ -28,8 +28,8 @@#define MEI_VSC_MAX_MSG_SIZE 512 -#define MEI_VSC_POLL_DELAY_US (50 * USEC_PER_MSEC) -#define MEI_VSC_POLL_TIMEOUT_US (200 * USEC_PER_MSEC) +#define MEI_VSC_POLL_DELAY_US (100 * USEC_PER_MSEC) +#define MEI_VSC_POLL_TIMEOUT_US (400 * USEC_PER_MSEC)#define mei_dev_to_vsc_hw (dev) ((struct mei_vsc_hw *)((dev)->hw))
Signature · 1 line
2.34.1
PATCH v2 5/5 mei: vsc: Fix spelling error
In reply to Wentong WuFix a spelling error in a comment.
--- drivers/misc/mei/vsc-fw-loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/mei/vsc-fw-loader.c +1 -1
@@ -204,7 +204,7 @@ struct vsc_img_frag {/** * struct vsc_fw_loader - represent vsc firmware loader -* @dev: device used to request fimware +* @dev: device used to request firmware * @tp: transport layer used with the firmware loader * @csi: CSI image * @ace: ACE image
Signature · 1 line
2.34.1