V4L/DVB (9516): cx18: Move DVB buffer transfer handling from irq handler to work_queue

cx18: Move DVB buffer transfer handling from irq handler to work_queue thread.
In order to properly lock the epu2cpu mailbox for driver to CX23418 commands,
the DVB/TS buffer handling needs to be moved from the IRQ handler and IRQ
context to a work queue.  This work_queue implmentation is strikingly similar
to the ivtv implementation - for better or worse.

Signed-off-by: Andy Walls <awalls@radix.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c
index 2befa3819cdb61d181a89386f8769e3308507329..7874d9790a519917c88da2d4a91e738a48c14ec0 100644 (file)
--- a/drivers/media/video/cx18/cx18-driver.c
+++ b/drivers/media/video/cx18/cx18-driver.c
@@ -449,6 +449,14 @@ static int __devinit cx18_init_struct1(struct cx18 *cx)
 
        spin_lock_init(&cx->lock);
 
+       cx->work_queue = create_singlethread_workqueue(cx->name);
+       if (cx->work_queue == NULL) {
+               CX18_ERR("Could not create work queue\n");
+               return -1;
+       }
+
+       INIT_WORK(&cx->work, cx18_work_handler);
+
        /* start counting open_id at 1 */
        cx->open_id = 1;
 
@@ -831,6 +839,7 @@ free_map:
 free_mem:
        release_mem_region(cx->base_addr, CX18_MEM_SIZE);
 free_workqueue:
+       destroy_workqueue(cx->work_queue);
 err:
        if (retval == 0)
                retval = -ENODEV;
@@ -931,6 +940,9 @@ static void cx18_remove(struct pci_dev *pci_dev)
 
        cx18_halt_firmware(cx);
 
+       flush_workqueue(cx->work_queue);
+       destroy_workqueue(cx->work_queue);
+
        cx18_streams_cleanup(cx, 1);
 
        exit_cx18_i2c(cx);

diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index e721c01d2178b6b7a0749ad33cf97e5e0b3fdea0..bbdd5f25041df9348e1c6a3ba264b30400141705 100644 (file)
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -199,12 +199,15 @@ struct cx18_options {
 #define CX18_F_S_APPL_IO        8      /* this stream is used read/written by an application */
 
 /* per-cx18, i_flags */
-#define CX18_F_I_LOADED_FW     0       /* Loaded the firmware the first time */
-#define CX18_F_I_EOS           4       /* End of encoder stream reached */
-#define CX18_F_I_RADIO_USER    5       /* The radio tuner is selected */
-#define CX18_F_I_ENC_PAUSED    13      /* the encoder is paused */
-#define CX18_F_I_INITED                21      /* set after first open */
-#define CX18_F_I_FAILED                22      /* set if first open failed */
+#define CX18_F_I_LOADED_FW             0       /* Loaded firmware 1st time */
+#define CX18_F_I_EOS                   4       /* End of encoder stream */
+#define CX18_F_I_RADIO_USER            5       /* radio tuner is selected */
+#define CX18_F_I_ENC_PAUSED            13      /* the encoder is paused */
+#define CX18_F_I_HAVE_WORK             15      /* there is work to be done */
+#define CX18_F_I_WORK_HANDLER_DVB      18      /* work to be done for DVB */
+#define CX18_F_I_INITED                        21      /* set after first open */
+#define CX18_F_I_FAILED                        22      /* set if first open failed */
+#define CX18_F_I_WORK_INITED           23      /* worker thread initialized */
 
 /* These are the VBI types as they appear in the embedded VBI private packets. */
 #define CX18_SLICED_TYPE_TELETEXT_B     (1)
@@ -431,6 +434,9 @@ struct cx18 {
        /* when the current DMA is finished this queue is woken up */
        wait_queue_head_t dma_waitq;
 
+       struct workqueue_struct *work_queue;
+       struct work_struct work;
+
        /* i2c */
        struct i2c_adapter i2c_adap[2];
        struct i2c_algo_bit_data i2c_algo[2];

diff --git a/drivers/media/video/cx18/cx18-dvb.c b/drivers/media/video/cx18/cx18-dvb.c
index afc694e7bdb297f672944c3ba66b828aae6b16ad..4542e2e5e3d76323668ee9b1f3b5132dfeaf090c 100644 (file)
--- a/drivers/media/video/cx18/cx18-dvb.c
+++ b/drivers/media/video/cx18/cx18-dvb.c
@@ -23,6 +23,8 @@
 #include "cx18-dvb.h"
 #include "cx18-io.h"
 #include "cx18-streams.h"
+#include "cx18-queue.h"
+#include "cx18-scb.h"
 #include "cx18-cards.h"
 #include "s5h1409.h"
 #include "mxl5005s.h"
@@ -300,3 +302,24 @@ static int dvb_register(struct cx18_stream *stream)
 
        return ret;
 }
+
+void cx18_dvb_work_handler(struct cx18 *cx)
+{
+       struct cx18_buffer *buf;
+       struct cx18_stream *s = &cx->streams[CX18_ENC_STREAM_TYPE_TS];
+
+       while ((buf = cx18_dequeue(s, &s->q_full)) != NULL) {
+               if (s->dvb.enabled)
+                       dvb_dmx_swfilter(&s->dvb.demux, buf->buf,
+                                        buf->bytesused);
+
+               cx18_enqueue(s, buf, &s->q_free);
+               cx18_buf_sync_for_device(s, buf);
+               if (s->handle == CX18_INVALID_TASK_HANDLE) /* FIXME: improve */
+                       continue;
+
+               cx18_vapi(cx, CX18_CPU_DE_SET_MDL, 5, s->handle,
+                      (void __iomem *)&cx->scb->cpu_mdl[buf->id] - cx->enc_mem,
+                      1, buf->id, s->buf_size);
+       }
+}

diff --git a/drivers/media/video/cx18/cx18-dvb.h b/drivers/media/video/cx18/cx18-dvb.h
index bf8d8f6f54558ab3264dd783ad13dc9246632b40..bbdcefc87f288c4fa92b70cf68e56d572df17b47 100644 (file)
--- a/drivers/media/video/cx18/cx18-dvb.h
+++ b/drivers/media/video/cx18/cx18-dvb.h
@@ -23,3 +23,4 @@
 
 int cx18_dvb_register(struct cx18_stream *stream);
 void cx18_dvb_unregister(struct cx18_stream *stream);
+void cx18_dvb_work_handler(struct cx18 *cx);

diff --git a/drivers/media/video/cx18/cx18-irq.c b/drivers/media/video/cx18/cx18-irq.c
index c306e142c1c3e0c443dee67e80c79ddd33d9403f..5fbfbd0f14935eff36a19d27c8d852d8df2af483 100644 (file)
--- a/drivers/media/video/cx18/cx18-irq.c
+++ b/drivers/media/video/cx18/cx18-irq.c
@@ -29,6 +29,20 @@
 #include "cx18-mailbox.h"
 #include "cx18-vbi.h"
 #include "cx18-scb.h"
+#include "cx18-dvb.h"
+
+void cx18_work_handler(struct work_struct *work)
+{
+       struct cx18 *cx = container_of(work, struct cx18, work);
+       if (test_and_clear_bit(CX18_F_I_WORK_INITED, &cx->i_flags)) {
+               struct sched_param param = { .sched_priority = MAX_RT_PRIO-1 };
+               /* This thread must use the FIFO scheduler as it
+                * is realtime sensitive. */
+               sched_setscheduler(current, SCHED_FIFO, &param);
+       }
+       if (test_and_clear_bit(CX18_F_I_WORK_HANDLER_DVB, &cx->i_flags))
+               cx18_dvb_work_handler(cx);
+}
 
 static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb)
 {
@@ -65,17 +79,11 @@ static void epu_dma_done(struct cx18 *cx, struct cx18_mailbox *mb)
        if (buf) {
                cx18_buf_sync_for_cpu(s, buf);
                if (s->type == CX18_ENC_STREAM_TYPE_TS && s->dvb.enabled) {
-                       /* process the buffer here */
-                       CX18_DEBUG_HI_DMA("TS recv and sent bytesused=%d\n",
+                       CX18_DEBUG_HI_DMA("TS recv bytesused = %d\n",
                                        buf->bytesused);
 
-                       dvb_dmx_swfilter(&s->dvb.demux, buf->buf,
-                                       buf->bytesused);
-
-                       cx18_buf_sync_for_device(s, buf);
-                       cx18_vapi(cx, CX18_CPU_DE_SET_MDL, 5, s->handle,
-                           (void __iomem *)&cx->scb->cpu_mdl[buf->id] - cx->enc_mem,
-                           1, buf->id, s->buf_size);
+                       set_bit(CX18_F_I_WORK_HANDLER_DVB, &cx->i_flags);
+                       set_bit(CX18_F_I_HAVE_WORK, &cx->i_flags);
                } else
                        set_bit(CX18_F_B_NEED_BUF_SWAP, &buf->b_flags);
        } else {
@@ -185,5 +193,8 @@ irqreturn_t cx18_irq_handler(int irq, void *dev_id)
        if (sw1)
                epu_cmd(cx, sw1);
 
+       if (test_and_clear_bit(CX18_F_I_HAVE_WORK, &cx->i_flags))
+               queue_work(cx->work_queue, &cx->work);
+
        return (sw1 || sw2 || hw2) ? IRQ_HANDLED : IRQ_NONE;
 }

diff --git a/drivers/media/video/cx18/cx18-irq.h b/drivers/media/video/cx18/cx18-irq.h
index 379f704f5cbaf319d443574d22cdb95ec1b372c1..6173ca3bc9e4b74e9d2e211c6dd4ef6ea83be558 100644 (file)
--- a/drivers/media/video/cx18/cx18-irq.h
+++ b/drivers/media/video/cx18/cx18-irq.h
@@ -32,6 +32,4 @@
 
 irqreturn_t cx18_irq_handler(int irq, void *dev_id);
 
-void cx18_irq_work_handler(struct work_struct *work);
-void cx18_dma_stream_dec_prepare(struct cx18_stream *s, u32 offset, int lock);
-void cx18_unfinished_dma(unsigned long arg);
+void cx18_work_handler(struct work_struct *work);

diff --git a/drivers/media/video/cx18/cx18-queue.c b/drivers/media/video/cx18/cx18-queue.c
index a33ba04a2686aa3ec73d0d705ddc1aa1bb3abad8..174682c2582f4ec1d3d48900f7ae15723d9e6234 100644 (file)
--- a/drivers/media/video/cx18/cx18-queue.c
+++ b/drivers/media/video/cx18/cx18-queue.c
@@ -88,15 +88,13 @@ struct cx18_buffer *cx18_queue_get_buf_irq(struct cx18_stream *s, u32 id,
 
                if (buf->id != id)
                        continue;
+
                buf->bytesused = bytesused;
-               /* the transport buffers are handled differently,
-                  they are not moved to the full queue */
-               if (s->type != CX18_ENC_STREAM_TYPE_TS) {
-                       atomic_dec(&s->q_free.buffers);
-                       atomic_inc(&s->q_full.buffers);
-                       s->q_full.bytesused += buf->bytesused;
-                       list_move_tail(&buf->list, &s->q_full.list);
-               }
+               atomic_dec(&s->q_free.buffers);
+               atomic_inc(&s->q_full.buffers);
+               s->q_full.bytesused += buf->bytesused;
+               list_move_tail(&buf->list, &s->q_full.list);
+
                spin_unlock(&s->qlock);
                return buf;
        }