Commit 973ec557 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'rpmsg-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux 

Pull rpmsg updates from Bjorn Andersson:

 - Reduce code duplication related to channel removal, and invoke the
   removal in one case previously missing, both in the Glink driver

* tag 'rpmsg-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux:
  rpmsg: glink: remove duplicate code for rpmsg device remove
  rpmsg: glink: fix rpmsg device leak
parents e637b37a 112766cd

drivers/rpmsg/qcom_glink_native.c

+16 −19
Original line number Diff line number Diff line
@@ -1395,6 +1395,19 @@ static int qcom_glink_announce_create(struct rpmsg_device *rpdev) 
	return 0;

}



static void qcom_glink_remove_rpmsg_device(struct qcom_glink *glink, struct glink_channel *channel)

{

	struct rpmsg_channel_info chinfo;



	if (channel->rpdev) {

		strscpy_pad(chinfo.name, channel->name, sizeof(chinfo.name));

		chinfo.src = RPMSG_ADDR_ANY;

		chinfo.dst = RPMSG_ADDR_ANY;

		rpmsg_unregister_device(glink->dev, &chinfo);

	}

	channel->rpdev = NULL;

}



static void qcom_glink_destroy_ept(struct rpmsg_endpoint *ept)

{

	struct glink_channel *channel = to_glink_channel(ept);
@@ -1406,7 +1419,7 @@ static void qcom_glink_destroy_ept(struct rpmsg_endpoint *ept) 
	spin_unlock_irqrestore(&channel->recv_lock, flags);



	/* Decouple the potential rpdev from the channel */

	channel->rpdev = NULL;

	qcom_glink_remove_rpmsg_device(glink, channel);



	qcom_glink_send_close_req(glink, channel);

}
@@ -1697,7 +1710,6 @@ static int qcom_glink_rx_open(struct qcom_glink *glink, unsigned int rcid, 


static void qcom_glink_rx_close(struct qcom_glink *glink, unsigned int rcid)

{

	struct rpmsg_channel_info chinfo;

	struct glink_channel *channel;

	unsigned long flags;
@@ -1713,14 +1725,7 @@ static void qcom_glink_rx_close(struct qcom_glink *glink, unsigned int rcid) 
	/* cancel pending rx_done work */

	cancel_work_sync(&channel->intent_work);



	if (channel->rpdev) {

		strscpy_pad(chinfo.name, channel->name, sizeof(chinfo.name));

		chinfo.src = RPMSG_ADDR_ANY;

		chinfo.dst = RPMSG_ADDR_ANY;



		rpmsg_unregister_device(glink->dev, &chinfo);

	}

	channel->rpdev = NULL;

	qcom_glink_remove_rpmsg_device(glink, channel);



	qcom_glink_send_close_ack(glink, channel);
@@ -1734,7 +1739,6 @@ static void qcom_glink_rx_close(struct qcom_glink *glink, unsigned int rcid) 


static void qcom_glink_rx_close_ack(struct qcom_glink *glink, unsigned int lcid)

{

	struct rpmsg_channel_info chinfo;

	struct glink_channel *channel;

	unsigned long flags;
@@ -1756,14 +1760,7 @@ static void qcom_glink_rx_close_ack(struct qcom_glink *glink, unsigned int lcid) 
	spin_unlock_irqrestore(&glink->idr_lock, flags);



	/* Decouple the potential rpdev from the channel */

	if (channel->rpdev) {

		strscpy(chinfo.name, channel->name, sizeof(chinfo.name));

		chinfo.src = RPMSG_ADDR_ANY;

		chinfo.dst = RPMSG_ADDR_ANY;



		rpmsg_unregister_device(glink->dev, &chinfo);

	}

	channel->rpdev = NULL;

	qcom_glink_remove_rpmsg_device(glink, channel);



	kref_put(&channel->refcount, qcom_glink_channel_release);

}