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

Commit 3b25a61c authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "rpmsg: glink: check channel state before serving intent"

parents 237a2bb4 4831a6ab

drivers/rpmsg/qcom_glink_native.c

+4 −1
Original line number Diff line number Diff line
@@ -211,6 +211,7 @@ struct glink_channel { 


	struct mutex intent_req_lock;

	bool intent_req_result;

	bool channel_ready;

	atomic_t intent_req_comp;

	wait_queue_head_t intent_req_event;
@@ -876,7 +877,7 @@ static void qcom_glink_handle_intent_req(struct qcom_glink *glink, 


	ept = &channel->ept;

	intent = qcom_glink_alloc_intent(glink, channel, size, false);

	if (intent && ept->cb)

	if (intent && channel->channel_ready)

		qcom_glink_advertise_intent(glink, channel, intent);



	qcom_glink_send_intent_req_ack(glink, channel, !!intent);
@@ -1401,6 +1402,8 @@ static int qcom_glink_announce_create(struct rpmsg_device *rpdev) 
	if (glink->intentless || !completion_done(&channel->open_ack))

		return 0;



	channel->channel_ready = true;



	/*Serve any pending intent request*/

	spin_lock_irqsave(&channel->intent_lock, flags);

	idr_for_each_entry(&channel->liids, tmp, iid) {