OrgACRN
/
clear-pkgs-linux-iot-lts2018
mirror of https://github.com/clearlinux-pkgs/linux-iot-lts2018.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
clear-pkgs-linux-iot-lts2018/1079-ASoC-Intel-Skl-Virt-Ha...

223 lines
6.6 KiB
Diff
Raw Permalink Blame History

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Pawel Furtak <pawel.furtak@intel.com>
Date: Mon, 25 Mar 2019 14:30:36 +0100
Subject: [PATCH] ASoC: Intel: Skl: Virt: Handle VQ callback in thread context
Moving handling of VQ callback to thread context allows
to give up IRQ disabling for VQ related locks.
Change-Id: I435e32e4c14e6670d014f81b91e53ed634eda32b
Tracked-On: OAM-77677
Signed-off-by: Pawel Furtak <pawel.furtak@intel.com>
---
.../soc/intel/skylake/virtio/skl-virtio-fe.c | 103 ++++++++++--------
.../soc/intel/skylake/virtio/skl-virtio-fe.h | 6 +-
2 files changed, 60 insertions(+), 49 deletions(-)
diff --git a/sound/soc/intel/skylake/virtio/skl-virtio-fe.c b/sound/soc/intel/skylake/virtio/skl-virtio-fe.c
index e4b43b835289..5cbfc1cac333 100644
--- a/sound/soc/intel/skylake/virtio/skl-virtio-fe.c
+++ b/sound/soc/intel/skylake/virtio/skl-virtio-fe.c
@@ -87,29 +87,26 @@ inline int vfe_is_valid_fe_substream(struct snd_pcm_substream *substream)
static void vfe_vq_kick(struct snd_skl_vfe *vfe, struct virtqueue *vq)
{
- unsigned long irq_flags;
-
- spin_lock_irqsave(&vfe->ipc_vq_lock, irq_flags);
+ mutex_lock(&vfe->vq_lock);
virtqueue_kick(vq);
- spin_unlock_irqrestore(&vfe->ipc_vq_lock, irq_flags);
+ mutex_unlock(&vfe->vq_lock);
}
static int vfe_send_virtio_msg(struct snd_skl_vfe *vfe,
struct virtqueue *vq, struct scatterlist *sgs, int sg_count,
void *data, bool out)
{
- unsigned long irq_flags;
int ret;
if (!vq)
return -EINVAL;
- spin_lock_irqsave(&vfe->ipc_vq_lock, irq_flags);
+ mutex_lock(&vfe->vq_lock);
if (out)
ret = virtqueue_add_outbuf(vq, sgs, sg_count, data, GFP_KERNEL);
else
ret = virtqueue_add_inbuf(vq, sgs, sg_count, data, GFP_KERNEL);
- spin_unlock_irqrestore(&vfe->ipc_vq_lock, irq_flags);
+ mutex_unlock(&vfe->vq_lock);
if (ret < 0) {
dev_err(&vfe->vdev->dev,
@@ -361,40 +358,10 @@ static void vfe_not_tx_timeout_handler(struct work_struct *work)
static void vfe_not_tx_done(struct virtqueue *vq)
{
- struct snd_skl_vfe *vfe = vq->vdev->priv;
- enum vfe_ipc_msg_status msg_status;
- unsigned long irq_flags;
- struct vfe_ipc_msg *msg;
- unsigned int buflen = 0;
-
-
- while (true) {
- spin_lock_irqsave(&vfe->ipc_vq_lock, irq_flags);
- msg = virtqueue_get_buf(vfe->ipc_not_tx_vq, &buflen);
- spin_unlock_irqrestore(&vfe->ipc_vq_lock, irq_flags);
-
- if (msg == NULL)
- break;
-
- msg_status = atomic_read(&msg->status);
- if (msg_status == VFE_MSG_TIMED_OUT) {
- list_add_tail(&msg->list, &vfe->expired_msg_list);
- schedule_work(&vfe->msg_timeout_work);
- continue;
- }
-
- if (msg->rx_buf)
- memcpy(msg->rx_data, msg->rx_buf, msg->rx_size);
-
- if (msg->waitq && msg->completed) {
- *msg->completed = true;
- wake_up(msg->waitq);
- }
+ struct snd_skl_vfe *vfe;
- kfree(msg->tx_buf);
- kfree(msg->rx_buf);
- kfree(msg);
- }
+ vfe = vq->vdev->priv;
+ schedule_work(&vfe->tx_message_loop_work);
}
/*
@@ -406,7 +373,7 @@ static void vfe_not_handle_rx(struct virtqueue *vq)
struct snd_skl_vfe *vfe;
vfe = vq->vdev->priv;
- schedule_work(&vfe->message_loop_work);
+ schedule_work(&vfe->rx_message_loop_work);
}
static void vfe_handle_posn(struct work_struct *work)
@@ -451,7 +418,45 @@ static void vfe_handle_tplg(struct snd_skl_vfe *vfe,
mutex_unlock(&vfe->tplg.tplg_lock);
}
-static void vfe_message_loop(struct work_struct *work)
+static void vfe_tx_message_loop(struct work_struct *work)
+{
+ enum vfe_ipc_msg_status msg_status;
+ unsigned long irq_flags;
+ struct vfe_ipc_msg *msg;
+ struct snd_skl_vfe *vfe =
+ container_of(work, struct snd_skl_vfe, tx_message_loop_work);
+ unsigned int buflen = 0;
+
+ while (true) {
+ mutex_lock(&vfe->vq_lock);
+ msg = virtqueue_get_buf(vfe->ipc_not_tx_vq, &buflen);
+ mutex_unlock(&vfe->vq_lock);
+
+ if (msg == NULL)
+ break;
+
+ msg_status = atomic_read(&msg->status);
+ if (msg_status == VFE_MSG_TIMED_OUT) {
+ list_add_tail(&msg->list, &vfe->expired_msg_list);
+ schedule_work(&vfe->msg_timeout_work);
+ continue;
+ }
+
+ if (msg->rx_buf)
+ memcpy(msg->rx_data, msg->rx_buf, msg->rx_size);
+
+ if (msg->waitq && msg->completed) {
+ *msg->completed = true;
+ wake_up(msg->waitq);
+ }
+
+ kfree(msg->tx_buf);
+ kfree(msg->rx_buf);
+ kfree(msg);
+ }
+}
+
+static void vfe_rx_message_loop(struct work_struct *work)
{
struct vfe_inbox_header *header;
struct vfe_kctl_noti *kctln;
@@ -460,7 +465,7 @@ static void vfe_message_loop(struct work_struct *work)
struct vfe_kctl_result result;
struct snd_skl_vfe *vfe =
- container_of(work, struct snd_skl_vfe, message_loop_work);
+ container_of(work, struct snd_skl_vfe, rx_message_loop_work);
vq = vfe->ipc_not_rx_vq;
@@ -1209,11 +1214,13 @@ static int vfe_init(struct virtio_device *vdev)
INIT_LIST_HEAD(&vfe->kcontrols_list);
INIT_LIST_HEAD(&vfe->substr_info_list);
- spin_lock_init(&vfe->ipc_vq_lock);
INIT_LIST_HEAD(&vfe->expired_msg_list);
+ mutex_init(&vfe->vq_lock);
+
INIT_WORK(&vfe->msg_timeout_work, vfe_not_tx_timeout_handler);
- INIT_WORK(&vfe->message_loop_work, vfe_message_loop);
+ INIT_WORK(&vfe->rx_message_loop_work, vfe_rx_message_loop);
+ INIT_WORK(&vfe->tx_message_loop_work, vfe_tx_message_loop);
vfe->posn_update_queue = alloc_workqueue("%s",
WQ_HIGHPRI | WQ_UNBOUND, 0, "posn_update_queue");
@@ -1240,7 +1247,8 @@ static int vfe_init(struct virtio_device *vdev)
virtqueue_disable_cb(vfe->ipc_not_tx_vq);
virtqueue_disable_cb(vfe->ipc_not_rx_vq);
cancel_work_sync(&vfe->msg_timeout_work);
- cancel_work_sync(&vfe->message_loop_work);
+ cancel_work_sync(&vfe->rx_message_loop_work);
+ cancel_work_sync(&vfe->tx_message_loop_work);
vdev->config->reset(vdev);
vdev->config->del_vqs(vdev);
err:
@@ -1277,7 +1285,8 @@ static void vfe_remove(struct virtio_device *vdev)
if (!vfe)
return;
- cancel_work_sync(&vfe->message_loop_work);
+ cancel_work_sync(&vfe->rx_message_loop_work);
+ cancel_work_sync(&vfe->tx_message_loop_work);
vfe_machine_device_unregister(&vfe->sdev);
}
diff --git a/sound/soc/intel/skylake/virtio/skl-virtio-fe.h b/sound/soc/intel/skylake/virtio/skl-virtio-fe.h
index 3a9f9979bcad..afd042d04ddc 100644
--- a/sound/soc/intel/skylake/virtio/skl-virtio-fe.h
+++ b/sound/soc/intel/skylake/virtio/skl-virtio-fe.h
@@ -51,11 +51,13 @@ struct snd_skl_vfe {
struct work_struct init_work;
struct work_struct msg_timeout_work;
- struct work_struct message_loop_work;
+ struct work_struct rx_message_loop_work;
+ struct work_struct tx_message_loop_work;
struct workqueue_struct *posn_update_queue;
- spinlock_t ipc_vq_lock;
+ struct mutex vq_lock;
+
/* IPC cmd from frontend to backend */
struct virtqueue *ipc_cmd_tx_vq;
/* IPC cmd reply from backend to frontend */
--
https://clearlinux.org
Reference in New Issue View Git Blame Copy Permalink