Commit 95953618 authored by Alexander Usyskin's avatar Alexander Usyskin Committed by Joonas Lahtinen
Browse files

mei: extend timeouts on slow devices 



Parametrize operational timeouts in order
to support slow firmware on some graphics devices.

Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Reviewed-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220907215113.1596567-9-tomas.winkler@intel.com


Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
parent 9b2e03e2

drivers/misc/mei/bus-fixup.c

+2 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2013-2020, Intel Corporation. All rights reserved.

 * Copyright (c) 2013-2022, Intel Corporation. All rights reserved.

 * Intel Management Engine Interface (Intel MEI) Linux driver

 */
@@ -164,7 +164,6 @@ static int mei_osver(struct mei_cl_device *cldev) 
			    sizeof(struct mkhi_fw_ver))

#define MKHI_FWVER_LEN(__num) (sizeof(struct mkhi_msg_hdr) + \

			       sizeof(struct mkhi_fw_ver_block) * (__num))

#define MKHI_RCV_TIMEOUT 500 /* receive timeout in msec */

static int mei_fwver(struct mei_cl_device *cldev)

{

	char buf[MKHI_FWVER_BUF_LEN];
@@ -187,7 +186,7 @@ static int mei_fwver(struct mei_cl_device *cldev) 


	ret = 0;

	bytes_recv = __mei_cl_recv(cldev->cl, buf, sizeof(buf), NULL, 0,

				   MKHI_RCV_TIMEOUT);

				   cldev->bus->timeouts.mkhi_recv);

	if (bytes_recv < 0 || (size_t)bytes_recv < MKHI_FWVER_LEN(1)) {

		/*

		 * Should be at least one version block,

drivers/misc/mei/client.c

+8 −8
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2003-2020, Intel Corporation. All rights reserved.

 * Copyright (c) 2003-2022, Intel Corporation. All rights reserved.

 * Intel Management Engine Interface (Intel MEI) Linux driver

 */
@@ -870,7 +870,7 @@ static int mei_cl_send_disconnect(struct mei_cl *cl, struct mei_cl_cb *cb) 
	}



	list_move_tail(&cb->list, &dev->ctrl_rd_list);

	cl->timer_count = MEI_CONNECT_TIMEOUT;

	cl->timer_count = dev->timeouts.connect;

	mei_schedule_stall_timer(dev);



	return 0;
@@ -945,7 +945,7 @@ static int __mei_cl_disconnect(struct mei_cl *cl) 
	wait_event_timeout(cl->wait,

			   cl->state == MEI_FILE_DISCONNECT_REPLY ||

			   cl->state == MEI_FILE_DISCONNECTED,

			   mei_secs_to_jiffies(MEI_CL_CONNECT_TIMEOUT));

			   dev->timeouts.cl_connect);

	mutex_lock(&dev->device_lock);



	rets = cl->status;
@@ -1065,7 +1065,7 @@ static int mei_cl_send_connect(struct mei_cl *cl, struct mei_cl_cb *cb) 
	}



	list_move_tail(&cb->list, &dev->ctrl_rd_list);

	cl->timer_count = MEI_CONNECT_TIMEOUT;

	cl->timer_count = dev->timeouts.connect;

	mei_schedule_stall_timer(dev);

	return 0;

}
@@ -1164,7 +1164,7 @@ int mei_cl_connect(struct mei_cl *cl, struct mei_me_client *me_cl, 
			 cl->state == MEI_FILE_DISCONNECTED ||

			 cl->state == MEI_FILE_DISCONNECT_REQUIRED ||

			 cl->state == MEI_FILE_DISCONNECT_REPLY),

			mei_secs_to_jiffies(MEI_CL_CONNECT_TIMEOUT));

			dev->timeouts.cl_connect);

	mutex_lock(&dev->device_lock);



	if (!mei_cl_is_connected(cl)) {
@@ -1562,7 +1562,7 @@ int mei_cl_notify_request(struct mei_cl *cl, 
			   cl->notify_en == request ||

			   cl->status ||

			   !mei_cl_is_connected(cl),

			   mei_secs_to_jiffies(MEI_CL_CONNECT_TIMEOUT));

			   dev->timeouts.cl_connect);

	mutex_lock(&dev->device_lock);



	if (cl->notify_en != request && !cl->status)
@@ -2336,7 +2336,7 @@ int mei_cl_dma_alloc_and_map(struct mei_cl *cl, const struct file *fp, 
	mutex_unlock(&dev->device_lock);

	wait_event_timeout(cl->wait,

			   cl->dma_mapped || cl->status,

			   mei_secs_to_jiffies(MEI_CL_CONNECT_TIMEOUT));

			   dev->timeouts.cl_connect);

	mutex_lock(&dev->device_lock);



	if (!cl->dma_mapped && !cl->status)
@@ -2415,7 +2415,7 @@ int mei_cl_dma_unmap(struct mei_cl *cl, const struct file *fp) 
	mutex_unlock(&dev->device_lock);

	wait_event_timeout(cl->wait,

			   !cl->dma_mapped || cl->status,

			   mei_secs_to_jiffies(MEI_CL_CONNECT_TIMEOUT));

			   dev->timeouts.cl_connect);

	mutex_lock(&dev->device_lock);



	if (cl->dma_mapped && !cl->status)

drivers/misc/mei/gsc-me.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static int mei_gsc_probe(struct auxiliary_device *aux_dev, 


	device = &aux_dev->dev;



	dev = mei_me_dev_init(device, cfg);

	dev = mei_me_dev_init(device, cfg, adev->slow_firmware);

	if (!dev) {

		ret = -ENOMEM;

		goto err;

drivers/misc/mei/hbm.c

+7 −7
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2003-2020, Intel Corporation. All rights reserved.

 * Copyright (c) 2003-2022, Intel Corporation. All rights reserved.

 * Intel Management Engine Interface (Intel MEI) Linux driver

 */

#include <linux/export.h>
@@ -232,7 +232,7 @@ int mei_hbm_start_wait(struct mei_device *dev) 
	mutex_unlock(&dev->device_lock);

	ret = wait_event_timeout(dev->wait_hbm_start,

			dev->hbm_state != MEI_HBM_STARTING,

			mei_secs_to_jiffies(MEI_HBM_TIMEOUT));

			dev->timeouts.hbm);

	mutex_lock(&dev->device_lock);



	if (ret == 0 && (dev->hbm_state <= MEI_HBM_STARTING)) {
@@ -275,7 +275,7 @@ int mei_hbm_start_req(struct mei_device *dev) 
	}



	dev->hbm_state = MEI_HBM_STARTING;

	dev->init_clients_timer = MEI_CLIENTS_INIT_TIMEOUT;

	dev->init_clients_timer = dev->timeouts.client_init;

	mei_schedule_stall_timer(dev);

	return 0;

}
@@ -316,7 +316,7 @@ static int mei_hbm_dma_setup_req(struct mei_device *dev) 
	}



	dev->hbm_state = MEI_HBM_DR_SETUP;

	dev->init_clients_timer = MEI_CLIENTS_INIT_TIMEOUT;

	dev->init_clients_timer = dev->timeouts.client_init;

	mei_schedule_stall_timer(dev);

	return 0;

}
@@ -351,7 +351,7 @@ static int mei_hbm_capabilities_req(struct mei_device *dev) 
	}



	dev->hbm_state = MEI_HBM_CAP_SETUP;

	dev->init_clients_timer = MEI_CLIENTS_INIT_TIMEOUT;

	dev->init_clients_timer = dev->timeouts.client_init;

	mei_schedule_stall_timer(dev);

	return 0;

}
@@ -385,7 +385,7 @@ static int mei_hbm_enum_clients_req(struct mei_device *dev) 
		return ret;

	}

	dev->hbm_state = MEI_HBM_ENUM_CLIENTS;

	dev->init_clients_timer = MEI_CLIENTS_INIT_TIMEOUT;

	dev->init_clients_timer = dev->timeouts.client_init;

	mei_schedule_stall_timer(dev);

	return 0;

}
@@ -751,7 +751,7 @@ static int mei_hbm_prop_req(struct mei_device *dev, unsigned long start_idx) 
		return ret;

	}



	dev->init_clients_timer = MEI_CLIENTS_INIT_TIMEOUT;

	dev->init_clients_timer = dev->timeouts.client_init;

	mei_schedule_stall_timer(dev);



	return 0;

drivers/misc/mei/hw-me.c

+16 −14
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ static int mei_me_hw_ready_wait(struct mei_device *dev) 
	mutex_unlock(&dev->device_lock);

	wait_event_timeout(dev->wait_hw_ready,

			dev->recvd_hw_ready,

			mei_secs_to_jiffies(MEI_HW_READY_TIMEOUT));

			dev->timeouts.hw_ready);

	mutex_lock(&dev->device_lock);

	if (!dev->recvd_hw_ready) {

		dev_err(dev->dev, "wait hw ready failed\n");
@@ -707,7 +707,6 @@ static void mei_me_pg_unset(struct mei_device *dev) 
static int mei_me_pg_legacy_enter_sync(struct mei_device *dev)

{

	struct mei_me_hw *hw = to_me_hw(dev);

	unsigned long timeout = mei_secs_to_jiffies(MEI_PGI_TIMEOUT);

	int ret;



	dev->pg_event = MEI_PG_EVENT_WAIT;
@@ -718,7 +717,8 @@ static int mei_me_pg_legacy_enter_sync(struct mei_device *dev) 


	mutex_unlock(&dev->device_lock);

	wait_event_timeout(dev->wait_pg,

		dev->pg_event == MEI_PG_EVENT_RECEIVED, timeout);

		dev->pg_event == MEI_PG_EVENT_RECEIVED,

		dev->timeouts.pgi);

	mutex_lock(&dev->device_lock);



	if (dev->pg_event == MEI_PG_EVENT_RECEIVED) {
@@ -744,7 +744,6 @@ static int mei_me_pg_legacy_enter_sync(struct mei_device *dev) 
static int mei_me_pg_legacy_exit_sync(struct mei_device *dev)

{

	struct mei_me_hw *hw = to_me_hw(dev);

	unsigned long timeout = mei_secs_to_jiffies(MEI_PGI_TIMEOUT);

	int ret;



	if (dev->pg_event == MEI_PG_EVENT_RECEIVED)
@@ -756,7 +755,8 @@ static int mei_me_pg_legacy_exit_sync(struct mei_device *dev) 


	mutex_unlock(&dev->device_lock);

	wait_event_timeout(dev->wait_pg,

		dev->pg_event == MEI_PG_EVENT_RECEIVED, timeout);

		dev->pg_event == MEI_PG_EVENT_RECEIVED,

		dev->timeouts.pgi);

	mutex_lock(&dev->device_lock);



reply:
@@ -772,7 +772,8 @@ static int mei_me_pg_legacy_exit_sync(struct mei_device *dev) 


	mutex_unlock(&dev->device_lock);

	wait_event_timeout(dev->wait_pg,

		dev->pg_event == MEI_PG_EVENT_INTR_RECEIVED, timeout);

		dev->pg_event == MEI_PG_EVENT_INTR_RECEIVED,

		dev->timeouts.pgi);

	mutex_lock(&dev->device_lock);



	if (dev->pg_event == MEI_PG_EVENT_INTR_RECEIVED)
@@ -887,8 +888,6 @@ static u32 mei_me_d0i3_unset(struct mei_device *dev) 
static int mei_me_d0i3_enter_sync(struct mei_device *dev)

{

	struct mei_me_hw *hw = to_me_hw(dev);

	unsigned long d0i3_timeout = mei_secs_to_jiffies(MEI_D0I3_TIMEOUT);

	unsigned long pgi_timeout = mei_secs_to_jiffies(MEI_PGI_TIMEOUT);

	int ret;

	u32 reg;
@@ -910,7 +909,8 @@ static int mei_me_d0i3_enter_sync(struct mei_device *dev) 


	mutex_unlock(&dev->device_lock);

	wait_event_timeout(dev->wait_pg,

		dev->pg_event == MEI_PG_EVENT_RECEIVED, pgi_timeout);

		dev->pg_event == MEI_PG_EVENT_RECEIVED,

		dev->timeouts.pgi);

	mutex_lock(&dev->device_lock);



	if (dev->pg_event != MEI_PG_EVENT_RECEIVED) {
@@ -930,7 +930,8 @@ static int mei_me_d0i3_enter_sync(struct mei_device *dev) 


	mutex_unlock(&dev->device_lock);

	wait_event_timeout(dev->wait_pg,

		dev->pg_event == MEI_PG_EVENT_INTR_RECEIVED, d0i3_timeout);

		dev->pg_event == MEI_PG_EVENT_INTR_RECEIVED,

		dev->timeouts.d0i3);

	mutex_lock(&dev->device_lock);



	if (dev->pg_event != MEI_PG_EVENT_INTR_RECEIVED) {
@@ -990,7 +991,6 @@ static int mei_me_d0i3_enter(struct mei_device *dev) 
static int mei_me_d0i3_exit_sync(struct mei_device *dev)

{

	struct mei_me_hw *hw = to_me_hw(dev);

	unsigned long timeout = mei_secs_to_jiffies(MEI_D0I3_TIMEOUT);

	int ret;

	u32 reg;
@@ -1013,7 +1013,8 @@ static int mei_me_d0i3_exit_sync(struct mei_device *dev) 


	mutex_unlock(&dev->device_lock);

	wait_event_timeout(dev->wait_pg,

		dev->pg_event == MEI_PG_EVENT_INTR_RECEIVED, timeout);

		dev->pg_event == MEI_PG_EVENT_INTR_RECEIVED,

		dev->timeouts.d0i3);

	mutex_lock(&dev->device_lock);



	if (dev->pg_event != MEI_PG_EVENT_INTR_RECEIVED) {
@@ -1704,11 +1705,12 @@ EXPORT_SYMBOL_GPL(mei_me_get_cfg); 
 *

 * @parent: device associated with physical device (pci/platform)

 * @cfg: per device generation config

 * @slow_fw: configure longer timeouts as FW is slow

 *

 * Return: The mei_device pointer on success, NULL on failure.

 */

struct mei_device *mei_me_dev_init(struct device *parent,

				   const struct mei_cfg *cfg)

				   const struct mei_cfg *cfg, bool slow_fw)

{

	struct mei_device *dev;

	struct mei_me_hw *hw;
@@ -1723,7 +1725,7 @@ struct mei_device *mei_me_dev_init(struct device *parent, 
	for (i = 0; i < DMA_DSCR_NUM; i++)

		dev->dr_dscr[i].size = cfg->dma_size[i];



	mei_device_init(dev, parent, &mei_me_hw_ops);

	mei_device_init(dev, parent, slow_fw, &mei_me_hw_ops);

	hw->cfg = cfg;



	dev->fw_f_fw_ver_supported = cfg->fw_ver_supported;