Merge "msm: npu: Use mutex to protect map/unmap to avoid race condition"

int32_t npu_host_map_buf(struct npu_client *client,

			struct msm_npu_map_buf_ioctl *map_ioctl)

{

	return npu_mem_map(client, map_ioctl->buf_ion_hdl, map_ioctl->size,

	struct npu_device *npu_dev = client->npu_dev;

	struct npu_host_ctx *host_ctx = &npu_dev->host_ctx;

	int ret;

	mutex_lock(&host_ctx->lock);

	ret = npu_mem_map(client, map_ioctl->buf_ion_hdl, map_ioctl->size,

		&map_ioctl->npu_phys_addr);

	mutex_unlock(&host_ctx->lock);

	return ret;

}

int32_t npu_host_unmap_buf(struct npu_client *client,

		&host_ctx->fw_deinit_done, NW_CMD_TIMEOUT))

		NPU_WARN("npu: wait for fw_deinit_done time out\n");

	mutex_lock(&host_ctx->lock);

	npu_mem_unmap(client, unmap_ioctl->buf_ion_hdl,

		unmap_ioctl->npu_phys_addr);

	mutex_unlock(&host_ctx->lock);

	return 0;

}