Commit b4b6bdd7 authored by Benjamin Tissoires's avatar Benjamin Tissoires
Browse files

Merge branch 'for-6.18/intel-ish-ipc' into for-linus 

- Remove redundant ready check after timeout (Zhang Lixu)
parents 4965e2c7 8931f7b2

drivers/hid/intel-ish-hid/ipc/ipc.c

+9 −8
Original line number Diff line number Diff line
@@ -498,6 +498,7 @@ static int ish_fw_reset_handler(struct ishtp_device *dev) 
{

	uint32_t	reset_id;

	unsigned long	flags;

	int ret;



	/* Read reset ID */

	reset_id = ish_reg_read(dev, IPC_REG_ISH2HOST_MSG) & 0xFFFF;
@@ -510,12 +511,11 @@ static int ish_fw_reset_handler(struct ishtp_device *dev) 
	/* ISHTP notification in IPC_RESET */

	ishtp_reset_handler(dev);



	if (!ish_is_input_ready(dev))

		timed_wait_for_timeout(dev, WAIT_FOR_INPUT_RDY,

			TIME_SLICE_FOR_INPUT_RDY_MS, TIMEOUT_FOR_INPUT_RDY_MS);



	ret = timed_wait_for_timeout(dev, WAIT_FOR_INPUT_RDY,

				     TIME_SLICE_FOR_INPUT_RDY_MS,

				     TIMEOUT_FOR_INPUT_RDY_MS);

	/* ISH FW is dead */

	if (!ish_is_input_ready(dev))

	if (ret)

		return	-EPIPE;



	/* Send clock sync at once after reset */
@@ -531,9 +531,10 @@ static int ish_fw_reset_handler(struct ishtp_device *dev) 
			 sizeof(uint32_t));



	/* Wait for ISH FW'es ILUP and ISHTP_READY */

	timed_wait_for_timeout(dev, WAIT_FOR_FW_RDY,

			TIME_SLICE_FOR_FW_RDY_MS, TIMEOUT_FOR_FW_RDY_MS);

	if (!ishtp_fw_is_ready(dev)) {

	ret = timed_wait_for_timeout(dev, WAIT_FOR_FW_RDY,

				     TIME_SLICE_FOR_FW_RDY_MS,

				     TIMEOUT_FOR_FW_RDY_MS);

	if (ret) {

		/* ISH FW is dead */

		uint32_t	ish_status;