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

Commit 37c0b35f authored by Konstantin Dorfman's avatar Konstantin Dorfman Committed by Gerrit - the friendly Code Review server
Browse files

soc:qcom:spcom: fix ion buffer unlock on rpmsg dev remove 



In case of SSR event all spss channels are disconnected. This causes each
rpmsg device remove. The channel context keep track of locked ion buffers
that were shared with SP. On SSR event only "sp_kernel" channel ion buffers
must be unlocked (because userspace will not do it by design).

This change instead of unlocking buffers for all channels, unlocks only
"sp_kernel" related ion buffers.

Change-Id: I2e677a6f301e09922a0c8238e5aaf3b65bf99176
Signed-off-by: default avatarKonstantin Dorfman <kdorfman@codeaurora.org>
parent 5beb31e7

drivers/soc/qcom/spcom.c

+13 −7
Original line number Diff line number Diff line
@@ -1965,15 +1965,21 @@ static void spcom_rpdev_remove(struct rpmsg_device *rpdev) 
		pr_err("channel %s not found\n", rpdev->id.name);

		return;

	}

	/* release all ion buffers locked by the channel */



	mutex_lock(&ch->lock);

	// unlock all ion buffers of sp_kernel channel

	if (strcmp(ch->name, "sp_kernel") == 0) {

		for (i = 0; i < ARRAY_SIZE(ch->dmabuf_handle_table); i++) {

		if (ch->dmabuf_handle_table[i]) {

			if (ch->dmabuf_handle_table[i] != NULL) {

				pr_debug("unlocked ion buf #%d fd [%d].\n",

					i, ch->dmabuf_fd_table[i]);

				dma_buf_put(ch->dmabuf_handle_table[i]);

				ch->dmabuf_handle_table[i] = NULL;

			dev_info(&rpdev->dev, "dma_buf_put(%d)\n", i);

				ch->dmabuf_fd_table[i] = -1;

			}

		}

	mutex_lock(&ch->lock);

	}



	ch->rpdev = NULL;

	ch->rpmsg_abort = true;

	complete_all(&ch->rx_done);