Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b3cb0b43 authored by Konstantin Dorfman's avatar Konstantin Dorfman
Browse files

soc: qcom: spcom: fix error code check to resend packet to the peer 



spcom driver implements RPMSG client, using glink as transport to
communicate with Secure Processor. SPU glink peer do not supports rx
intent requests, so spcom driver always uses rpmsg_trysend() api to send
packet.

This change fixes the value to repeat send attempt to be -EBUSY and
-EAGAIN.
Also, spcom_device_write() fixed to propagate error code to userspace.

Change-Id: Iaac9bb862a6126fe5b18a22b2c7ee50247f71438
Signed-off-by: default avatarKonstantin Dorfman <kdorfman@codeaurora.org>
parent b6072a3c

drivers/soc/qcom/spcom.c

+10 −3
Original line number Diff line number Diff line
@@ -649,7 +649,10 @@ static int spcom_handle_send_command(struct spcom_channel *ch, 
		mutex_unlock(&ch->lock);

		msleep(TX_RETRY_DELAY_MSEC);

		mutex_lock(&ch->lock);

	} while (ret == -EAGAIN && time_msec < timeout_msec);

	} while ((ret == -EBUSY || ret == -EAGAIN) && time_msec < timeout_msec);

	if (ret)

		pr_err("ch [%s] rpmsg_trysend() error (%d), timeout_msec=%d\n",

		       ch->name, ret, timeout_msec);

	mutex_unlock(&ch->lock);



	kfree(tx_buf);
@@ -853,7 +856,11 @@ static int spcom_handle_send_modified_command(struct spcom_channel *ch, 
		mutex_unlock(&ch->lock);

		msleep(TX_RETRY_DELAY_MSEC);

		mutex_lock(&ch->lock);

	} while (ret == -EAGAIN && time_msec < timeout_msec);

	} while ((ret == -EBUSY || ret == -EAGAIN) && time_msec < timeout_msec);

	if (ret)

		pr_err("ch [%s] rpmsg_trysend() error (%d), timeout_msec=%d\n",

		       ch->name, ret, timeout_msec);



	mutex_unlock(&ch->lock);

	memset(tx_buf, 0, tx_buf_size);

	kfree(tx_buf);
@@ -1425,7 +1432,7 @@ static ssize_t spcom_device_write(struct file *filp, 
	if (ret) {

		pr_err("handle command error [%d].\n", ret);

		kfree(buf);

		return -EFAULT;

		return ret;

	}



	kfree(buf);