dm1105: not demuxing from interrupt context

Message ID	200902190718.47890.liplianin@tut.by (mailing list archive)
State	RFC
Headers	show Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n1J5IrQw029935 for <patchwork-media@patchwork.kernel.org>; Thu, 19 Feb 2009 05:18:53 GMT From: "Igor M. Liplianin" <liplianin@tut.by> To: linux-media@vger.kernel.org Subject: dm1105: not demuxing from interrupt context Date: Thu, 19 Feb 2009 07:18:47 +0200 User-Agent: KMail/1.9.9 MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: base64 Content-Disposition: inline Message-Id: <200902190718.47890.liplianin@tut.by> Sender: linux-media-owner@vger.kernel.org Precedence: bulk

Message ID

200902190718.47890.liplianin@tut.by (mailing list archive)

State

RFC

Headers

From: "Igor M. Liplianin" <liplianin@tut.by>
To: linux-media@vger.kernel.org
Subject: dm1105: not demuxing from interrupt context
Date: Thu, 19 Feb 2009 07:18:47 +0200
User-Agent: KMail/1.9.9
MIME-Version: 1.0
Content-Type: text/plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: base64
Content-Disposition: inline
Message-Id: <200902190718.47890.liplianin@tut.by>
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk

Commit Message

Igor M. Liplianin Feb. 19, 2009, 5:18 a.m. UTC

I read in mailing list about design error in dm1105.
So I am designer.
DMA buffer in the driver itself organized like ringbuffer
and not difficult to bind it to tasklet or work queue.
I choose work queue, because it is like trend :)
The code tested by me on quite fast computer and it works as usual.
I think, on slow computer difference must be noticeable.
The patch is preliminary.
Anyone can criticize.

Â 
Â /* register with input layer */
@@ -717,7 +732,7 @@
Â 
Â Â Â Â Â Â Â Â dm1105dvb = kzalloc(sizeof(struct dm1105dvb), GFP_KERNEL);
Â Â Â Â Â Â Â Â if (!dm1105dvb)
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â goto out;
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â return -ENOMEM;
Â 
Â Â Â Â Â Â Â Â dm1105dvb->pdev = pdev;
Â Â Â Â Â Â Â Â dm1105dvb->buffer_size = 5 * DM1105_DMA_BYTES;
@@ -747,13 +762,9 @@
Â Â Â Â Â Â Â Â spin_lock_init(&dm1105dvb->lock);
Â Â Â Â Â Â Â Â pci_set_drvdata(pdev, dm1105dvb);
Â 
-Â Â Â Â Â Â Â ret = request_irq(pdev->irq, dm1105dvb_irq, IRQF_SHARED, DRIVER_NAME, dm1105dvb);
+Â Â Â Â Â Â Â ret = dm1105dvb_hw_init(dm1105dvb);
Â Â Â Â Â Â Â Â if (ret < 0)
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â goto err_pci_iounmap;
-
-Â Â Â Â Â Â Â ret = dm1105dvb_hw_init(dm1105dvb);
-Â Â Â Â Â Â Â if (ret < 0)
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â goto err_free_irq;
Â 
Â Â Â Â Â Â Â Â /* i2c */
Â Â Â Â Â Â Â Â i2c_set_adapdata(&dm1105dvb->i2c_adap, dm1105dvb);
@@ -820,8 +831,19 @@
Â 
Â Â Â Â Â Â Â Â dvb_net_init(dvb_adapter, &dm1105dvb->dvbnet, dmx);
Â Â Â Â Â Â Â Â dm1105_ir_init(dm1105dvb);
-out:
-Â Â Â Â Â Â Â return ret;
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
+Â Â Â Â Â Â Â INIT_WORK(&dm1105dvb->work, dm1105_dmx_buffer, dm1105dvb);
+#else
+Â Â Â Â Â Â Â INIT_WORK(&dm1105dvb->work, dm1105_dmx_buffer);
+#endif
+
+Â Â Â Â Â Â Â ret = request_irq(pdev->irq, dm1105dvb_irq, IRQF_SHARED,
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â DRIVER_NAME, dm1105dvb);
+Â Â Â Â Â Â Â if (ret < 0)
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â goto err_free_irq;
+
+Â Â Â Â Â Â Â return 0;
Â 
Â err_disconnect_frontend:
Â Â Â Â Â Â Â Â dmx->disconnect_frontend(dmx);
@@ -850,7 +872,7 @@
Â err_kfree:
Â Â Â Â Â Â Â Â pci_set_drvdata(pdev, NULL);
Â Â Â Â Â Â Â Â kfree(dm1105dvb);
-Â Â Â Â Â Â Â goto out;
+Â Â Â Â Â Â Â return ret;
Â }
Â 
Â static void __devexit dm1105_remove(struct pci_dev *pdev)

Comments

Mauro Carvalho Chehab Feb. 26, 2009, 2:12 p.m. UTC | #1

On Thu, 19 Feb 2009 07:18:47 +0200
"Igor M. Liplianin" <liplianin@tut.by> wrote:

> I read in mailing list about design error in dm1105.
> So I am designer.
> DMA buffer in the driver itself organized like ringbuffer
> and not difficult to bind it to tasklet or work queue.
> I choose work queue, because it is like trend :)
> The code tested by me on quite fast computer and it works as usual.
> I think, on slow computer difference must be noticeable.
> The patch is preliminary.
> Anyone can criticize.

The patch looks fine for me, but, as you said this i preliminary, I'm marking
it as RFC on patchwork. Please send me the final revision of it, after having a
final version.

Cheers,
Mauro.
> 
> diff -r 359d95e1d541 -r f22da8d6a83c linux/drivers/media/dvb/dm1105/dm1105.c
> --- a/linux/drivers/media/dvb/dm1105/dm1105.cÂ Â Â Wed Feb 18 09:49:37 2009 -0300
> +++ b/linux/drivers/media/dvb/dm1105/dm1105.cÂ Â Â Thu Feb 19 04:38:32 2009 +0200
> @@ -220,10 +220,14 @@
> Â Â Â Â Â Â Â Â /* i2c */
> Â Â Â Â Â Â Â Â struct i2c_adapter i2c_adap;
> Â 
> +Â Â Â Â Â Â Â /* irq */
> +Â Â Â Â Â Â Â struct work_struct work;
> +
> Â Â Â Â Â Â Â Â /* dma */
> Â Â Â Â Â Â Â Â dma_addr_t dma_addr;
> Â Â Â Â Â Â Â Â unsigned char *ts_buf;
> Â Â Â Â Â Â Â Â u32 wrp;
> +Â Â Â Â Â Â Â u32 nextwrp;
> Â Â Â Â Â Â Â Â u32 buffer_size;
> Â Â Â Â Â Â Â Â unsigned intÂ Â Â Â PacketErrorCount;
> Â Â Â Â Â Â Â Â unsigned int dmarst;
> @@ -418,6 +422,9 @@
> Â Â Â Â Â Â Â Â u8 data;
> Â Â Â Â Â Â Â Â u16 keycode;
> Â 
> +Â Â Â Â Â Â Â if (ir_debug)
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â printk(KERN_INFO "%s: received byte 0x%04x\n", __func__, ircom);
> +
> Â Â Â Â Â Â Â Â data = (ircom >> 8) & 0x7f;
> Â 
> Â Â Â Â Â Â Â Â input_event(ir->input_dev, EV_MSC, MSC_RAW, (0x0000f8 << 16) | data);
> @@ -434,6 +441,50 @@
> Â 
> Â }
> Â 
> +/* work handler */
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
> +static void dm1105_dmx_buffer(void *_dm1105dvb)
> +#else
> +static void dm1105_dmx_buffer(struct work_struct *work)
> +#endif
> +{
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
> +Â Â Â Â Â Â Â struct dm1105dvb *dm1105dvb = _dm1105dvb;
> +#else
> +Â Â Â Â Â Â Â struct dm1105dvb *dm1105dvb =
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â container_of(work, struct dm1105dvb, work);
> +#endif
> +Â Â Â Â Â Â Â unsigned int nbpackets;
> +Â Â Â Â Â Â Â u32 oldwrp = dm1105dvb->wrp;
> +Â Â Â Â Â Â Â u32 nextwrp = dm1105dvb->nextwrp;
> +
> +Â Â Â Â Â Â Â if (!((dm1105dvb->ts_buf[oldwrp] == 0x47) &&
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â (dm1105dvb->ts_buf[oldwrp + 188] == 0x47) &&
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â (dm1105dvb->ts_buf[oldwrp + 188 * 2] == 0x47))) {
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->PacketErrorCount++;
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â /* bad packet found */
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â if ((dm1105dvb->PacketErrorCount >= 2) &&
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â (dm1105dvb->dmarst == 0)) {
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â outb(1, dm_io_mem(DM1105_RST));
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->wrp = 0;
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->PacketErrorCount = 0;
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->dmarst = 0;
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â return;
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â }
> +Â Â Â Â Â Â Â }
> +
> +Â Â Â Â Â Â Â if (nextwrp < oldwrp) {
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â memcpy(dm1105dvb->ts_buf + dm1105dvb->buffer_size,
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->ts_buf, nextwrp);
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â nbpackets = ((dm1105dvb->buffer_size - oldwrp) + nextwrp) / 188;
> +Â Â Â Â Â Â Â } else
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â nbpackets = (nextwrp - oldwrp) / 188;
> +
> +Â Â Â Â Â Â Â dm1105dvb->wrp = nextwrp;
> +Â Â Â Â Â Â Â dvb_dmx_swfilter_packets(&dm1105dvb->demux,
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â &dm1105dvb->ts_buf[oldwrp], nbpackets);
> +}
> +
> Â #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
> Â static irqreturn_t dm1105dvb_irq(int irq, void *dev_id, struct pt_regs *regs)
> Â #else
> @@ -441,11 +492,6 @@
> Â #endif
> Â {
> Â Â Â Â Â Â Â Â struct dm1105dvb *dm1105dvb = dev_id;
> -Â Â Â Â Â Â Â unsigned int piece;
> -Â Â Â Â Â Â Â unsigned int nbpackets;
> -Â Â Â Â Â Â Â u32 command;
> -Â Â Â Â Â Â Â u32 nextwrp;
> -Â Â Â Â Â Â Â u32 oldwrp;
> Â 
> Â Â Â Â Â Â Â Â /* Read-Write INSTS Ack's Interrupt for DM1105 chip 16.03.2008 */
> Â Â Â Â Â Â Â Â unsigned int intsts = inb(dm_io_mem(DM1105_INTSTS));
> @@ -454,48 +500,17 @@
> Â Â Â Â Â Â Â Â switch (intsts) {
> Â Â Â Â Â Â Â Â case INTSTS_TSIRQ:
> Â Â Â Â Â Â Â Â case (INTSTS_TSIRQ | INTSTS_IR):
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â nextwrp = inl(dm_io_mem(DM1105_WRP)) -
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â inl(dm_io_mem(DM1105_STADR)) ;
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â oldwrp = dm1105dvb->wrp;
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â spin_lock(&dm1105dvb->lock);
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â if (!((dm1105dvb->ts_buf[oldwrp] == 0x47) &&
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â (dm1105dvb->ts_buf[oldwrp + 188] == 0x47) &&
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â (dm1105dvb->ts_buf[oldwrp + 188 * 2] == 0x47))) {
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->PacketErrorCount++;
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â /* bad packet found */
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â if ((dm1105dvb->PacketErrorCount >= 2) &&
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â (dm1105dvb->dmarst == 0)) {
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â outb(1, dm_io_mem(DM1105_RST));
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->wrp = 0;
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->PacketErrorCount = 0;
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->dmarst = 0;
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â spin_unlock(&dm1105dvb->lock);
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â return IRQ_HANDLED;
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â }
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â }
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â if (nextwrp < oldwrp) {
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â piece = dm1105dvb->buffer_size - oldwrp;
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â memcpy(dm1105dvb->ts_buf + dm1105dvb->buffer_size, dm1105dvb->ts_buf, 
> nextwrp);
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â nbpackets = (piece + nextwrp)/188;
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â } elseÂ Â {
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â nbpackets = (nextwrp - oldwrp)/188;
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â }
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dvb_dmx_swfilter_packets(&dm1105dvb->demux, &dm1105dvb->ts_buf[oldwrp], 
> nbpackets);
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->wrp = nextwrp;
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â spin_unlock(&dm1105dvb->lock);
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->nextwrp = inl(dm_io_mem(DM1105_WRP)) -
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â inl(dm_io_mem(DM1105_STADR));
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â schedule_work(&dm1105dvb->work);
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â break;
> Â Â Â Â Â Â Â Â case INTSTS_IR:
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â command = inl(dm_io_mem(DM1105_IRCODE));
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â if (ir_debug)
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â printk("dm1105: received byte 0x%04x\n", command);
> -
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->ir.ir_command = command;
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->ir.ir_command = inl(dm_io_mem(DM1105_IRCODE));
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â tasklet_schedule(&dm1105dvb->ir.ir_tasklet);
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â break;
> Â Â Â Â Â Â Â Â }
> +
> Â Â Â Â Â Â Â Â return IRQ_HANDLED;
> -
> -
> Â }
> Â 
> Â /* register with input layer */
> @@ -717,7 +732,7 @@
> Â 
> Â Â Â Â Â Â Â Â dm1105dvb = kzalloc(sizeof(struct dm1105dvb), GFP_KERNEL);
> Â Â Â Â Â Â Â Â if (!dm1105dvb)
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â goto out;
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â return -ENOMEM;
> Â 
> Â Â Â Â Â Â Â Â dm1105dvb->pdev = pdev;
> Â Â Â Â Â Â Â Â dm1105dvb->buffer_size = 5 * DM1105_DMA_BYTES;
> @@ -747,13 +762,9 @@
> Â Â Â Â Â Â Â Â spin_lock_init(&dm1105dvb->lock);
> Â Â Â Â Â Â Â Â pci_set_drvdata(pdev, dm1105dvb);
> Â 
> -Â Â Â Â Â Â Â ret = request_irq(pdev->irq, dm1105dvb_irq, IRQF_SHARED, DRIVER_NAME, dm1105dvb);
> +Â Â Â Â Â Â Â ret = dm1105dvb_hw_init(dm1105dvb);
> Â Â Â Â Â Â Â Â if (ret < 0)
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â goto err_pci_iounmap;
> -
> -Â Â Â Â Â Â Â ret = dm1105dvb_hw_init(dm1105dvb);
> -Â Â Â Â Â Â Â if (ret < 0)
> -Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â goto err_free_irq;
> Â 
> Â Â Â Â Â Â Â Â /* i2c */
> Â Â Â Â Â Â Â Â i2c_set_adapdata(&dm1105dvb->i2c_adap, dm1105dvb);
> @@ -820,8 +831,19 @@
> Â 
> Â Â Â Â Â Â Â Â dvb_net_init(dvb_adapter, &dm1105dvb->dvbnet, dmx);
> Â Â Â Â Â Â Â Â dm1105_ir_init(dm1105dvb);
> -out:
> -Â Â Â Â Â Â Â return ret;
> +
> +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
> +Â Â Â Â Â Â Â INIT_WORK(&dm1105dvb->work, dm1105_dmx_buffer, dm1105dvb);
> +#else
> +Â Â Â Â Â Â Â INIT_WORK(&dm1105dvb->work, dm1105_dmx_buffer);
> +#endif
> +
> +Â Â Â Â Â Â Â ret = request_irq(pdev->irq, dm1105dvb_irq, IRQF_SHARED,
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â DRIVER_NAME, dm1105dvb);
> +Â Â Â Â Â Â Â if (ret < 0)
> +Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â goto err_free_irq;
> +
> +Â Â Â Â Â Â Â return 0;
> Â 
> Â err_disconnect_frontend:
> Â Â Â Â Â Â Â Â dmx->disconnect_frontend(dmx);
> @@ -850,7 +872,7 @@
> Â err_kfree:
> Â Â Â Â Â Â Â Â pci_set_drvdata(pdev, NULL);
> Â Â Â Â Â Â Â Â kfree(dm1105dvb);
> -Â Â Â Â Â Â Â goto out;
> +Â Â Â Â Â Â Â return ret;
> Â }
> Â 
> Â static void __devexit dm1105_remove(struct pci_dev *pdev)
> [Erro ao decodificar BASE64]




Cheers,
Mauro
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Igor M. Liplianin Feb. 26, 2009, 4:13 p.m. UTC | #2

On 26 Ñ„ÐµÐ²Ñ€Ð°Ð»Ñ 2009, "Igor M. Liplianin" <liplianin@tut.by> wrote:
> On Thu, 19 Feb 2009 07:18:47 +0200
>
> "Igor M. Liplianin" <liplianin@tut.by> wrote:
> > I read in mailing list about design error in dm1105.
> > So I am designer.
> > DMA buffer in the driver itself organized like ringbuffer
> > and not difficult to bind it to tasklet or work queue.
> > I choose work queue, because it is like trend :)
> > The code tested by me on quite fast computer and it works as usual.
> > I think, on slow computer difference must be noticeable.
> > The patch is preliminary.
> > Anyone can criticize.
>
> The patch looks fine for me, but, as you said this i preliminary, I'm
> marking it as RFC on patchwork. Please send me the final revision of it,
> after having a final version.
>
> Cheers,
> Mauro.
>
> > diff -r 359d95e1d541 -r f22da8d6a83c
> > linux/drivers/media/dvb/dm1105/dm1105.c ---
> > a/linux/drivers/media/dvb/dm1105/dm1105.cÐ±â•Ð±â•Ð±â•Wed Feb 18 09:49:37 2009
> > -0300 +++ b/linux/drivers/media/dvb/dm1105/dm1105.cÐ±â•Ð±â•Ð±â•Thu Feb 19
> > 04:38:32 2009 +0200 @@ -220,10 +220,14 @@
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•/* i2c */
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•struct i2c_adapter i2c_adap;
> > Ð±â•
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•/* irq */
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•struct work_struct work;
> > +
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•/* dma */
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dma_addr_t dma_addr;
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•unsigned char *ts_buf;
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•u32 wrp;
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•u32 nextwrp;
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•u32 buffer_size;
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•unsigned intÐ±â•Ð±â•Ð±â•Ð±â•PacketErrorCount;
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•unsigned int dmarst;
> > @@ -418,6 +422,9 @@
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•u8 data;
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•u16 keycode;
> > Ð±â•
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•if (ir_debug)
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•printk(KERN_INFO "%s: received byte
> > 0x%04x\n", __func__, ircom); +
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•data = (ircom >> 8) & 0x7f;
> > Ð±â•
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•input_event(ir->input_dev, EV_MSC, MSC_RAW, (0x0000f8 <<
> > 16) | data); @@ -434,6 +441,50 @@
> > Ð±â•
> > Ð±â•}
> > Ð±â•
> > +/* work handler */
> > +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
> > +static void dm1105_dmx_buffer(void *_dm1105dvb)
> > +#else
> > +static void dm1105_dmx_buffer(struct work_struct *work)
> > +#endif
> > +{
> > +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•struct dm1105dvb *dm1105dvb = _dm1105dvb;
> > +#else
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•struct dm1105dvb *dm1105dvb =
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•container_
> >of(work, struct dm1105dvb, work); +#endif
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•unsigned int nbpackets;
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•u32 oldwrp = dm1105dvb->wrp;
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•u32 nextwrp = dm1105dvb->nextwrp;
> > +
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•if (!((dm1105dvb->ts_buf[oldwrp] == 0x47) &&
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•(dm1105dvb->ts_buf[oldwrp
> > + 188] == 0x47) &&
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•(dm1105dvb->ts_buf[oldwrp
> > + 188 * 2] == 0x47))) {
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dm1105dvb->PacketErrorCount++;
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•/* bad packet found */
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•if ((dm1105dvb->PacketErrorCount >= 2) &&
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•(dm1105dvb
> >->dmarst == 0)) { +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•outb(1,
> > dm_io_mem(DM1105_RST));
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dm1105dvb->wrp = 0;
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dm1105dvb->PacketErrorCoun
> >t = 0; +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dm1105dvb->dmarst =
> > 0; +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•return;
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•}
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•}
> > +
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•if (nextwrp < oldwrp) {
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•memcpy(dm1105dvb->ts_buf +
> > dm1105dvb->buffer_size,
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•
> >Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dm1105dvb->ts_buf, nextwrp);
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•nbpackets = ((dm1105dvb->buffer_size -
> > oldwrp) + nextwrp) / 188; +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•} else
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•nbpackets = (nextwrp - oldwrp) / 188;
> > +
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dm1105dvb->wrp = nextwrp;
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dvb_dmx_swfilter_packets(&dm1105dvb->demux,
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•
> >Ð±â•Ð±â•Ð±â•&dm1105dvb->ts_buf[oldwrp], nbpackets); +}
> > +
> > Ð±â•#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
> > Ð±â•static irqreturn_t dm1105dvb_irq(int irq, void *dev_id, struct pt_regs
> > *regs) Ð±â•#else
> > @@ -441,11 +492,6 @@
> > Ð±â•#endif
> > Ð±â•{
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•struct dm1105dvb *dm1105dvb = dev_id;
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•unsigned int piece;
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•unsigned int nbpackets;
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•u32 command;
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•u32 nextwrp;
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•u32 oldwrp;
> > Ð±â•
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•/* Read-Write INSTS Ack's Interrupt for DM1105 chip
> > 16.03.2008 */ Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•unsigned int intsts =
> > inb(dm_io_mem(DM1105_INTSTS)); @@ -454,48 +500,17 @@
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•switch (intsts) {
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•case INTSTS_TSIRQ:
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•case (INTSTS_TSIRQ | INTSTS_IR):
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•nextwrp = inl(dm_io_mem(DM1105_WRP)) -
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•inl(dm_io_mem(DM1105_STADR
> >)) ; -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•oldwrp = dm1105dvb->wrp;
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•spin_lock(&dm1105dvb->lock);
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•if (!((dm1105dvb->ts_buf[oldwrp] == 0x47)
> > &&
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•(dm1105dvb
> >->ts_buf[oldwrp + 188] == 0x47) &&
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•(dm1105dvb
> >->ts_buf[oldwrp + 188 * 2] == 0x47))) {
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dm1105dvb->PacketErrorCoun
> >t++; -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•/* bad packet found */
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•if
> > ((dm1105dvb->PacketErrorCount >= 2) &&
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•
> >Ð±â•Ð±â•Ð±â•(dm1105dvb->dmarst == 0)) {
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•outb(1,
> > dm_io_mem(DM1105_RST));
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dm1105dvb-
> >>wrp = 0;
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dm1105dvb-
> >>PacketErrorCount = 0;
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dm1105dvb-
> >>dmarst = 0;
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•spin_unloc
> >k(&dm1105dvb->lock);
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•return
> > IRQ_HANDLED; -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•}
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•}
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•if (nextwrp < oldwrp) {
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•piece =
> > dm1105dvb->buffer_size - oldwrp;
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•memcpy(dm1105dvb->ts_buf +
> > dm1105dvb->buffer_size, dm1105dvb->ts_buf, nextwrp);
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•nbpackets = (piece +
> > nextwrp)/188; -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•} elseÐ±â•Ð±â•{
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•nbpackets = (nextwrp -
> > oldwrp)/188; -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•}
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dvb_dmx_swfilter_packets(&dm1105dvb->demux
> >, &dm1105dvb->ts_buf[oldwrp], nbpackets);
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dm1105dvb->wrp = nextwrp;
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•spin_unlock(&dm1105dvb->lock);
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dm1105dvb->nextwrp =
> > inl(dm_io_mem(DM1105_WRP)) -
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•
> >Ð±â•Ð±â•Ð±â•inl(dm_io_mem(DM1105_STADR));
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•schedule_work(&dm1105dvb->work);
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•break;
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•case INTSTS_IR:
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•command = inl(dm_io_mem(DM1105_IRCODE));
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•if (ir_debug)
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•printk("dm1105: received
> > byte 0x%04x\n", command); -
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dm1105dvb->ir.ir_command = command;
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dm1105dvb->ir.ir_command =
> > inl(dm_io_mem(DM1105_IRCODE));
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•tasklet_schedule(&dm1105dvb->ir.ir_taskle
> >t); Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•break;
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•}
> > +
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•return IRQ_HANDLED;
> > -
> > -
> > Ð±â•}
> > Ð±â•
> > Ð±â•/* register with input layer */
> > @@ -717,7 +732,7 @@
> > Ð±â•
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dm1105dvb = kzalloc(sizeof(struct dm1105dvb),
> > GFP_KERNEL); Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•if (!dm1105dvb)
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•goto out;
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•return -ENOMEM;
> > Ð±â•
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dm1105dvb->pdev = pdev;
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dm1105dvb->buffer_size = 5 * DM1105_DMA_BYTES;
> > @@ -747,13 +762,9 @@
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•spin_lock_init(&dm1105dvb->lock);
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•pci_set_drvdata(pdev, dm1105dvb);
> > Ð±â•
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•ret = request_irq(pdev->irq, dm1105dvb_irq, IRQF_SHARED,
> > DRIVER_NAME, dm1105dvb); +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•ret =
> > dm1105dvb_hw_init(dm1105dvb);
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•if (ret < 0)
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•goto err_pci_iounmap;
> > -
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•ret = dm1105dvb_hw_init(dm1105dvb);
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•if (ret < 0)
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•goto err_free_irq;
> > Ð±â•
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•/* i2c */
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•i2c_set_adapdata(&dm1105dvb->i2c_adap, dm1105dvb);
> > @@ -820,8 +831,19 @@
> > Ð±â•
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dvb_net_init(dvb_adapter, &dm1105dvb->dvbnet, dmx);
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dm1105_ir_init(dm1105dvb);
> > -out:
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•return ret;
> > +
> > +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•INIT_WORK(&dm1105dvb->work, dm1105_dmx_buffer, dm1105dvb);
> > +#else
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•INIT_WORK(&dm1105dvb->work, dm1105_dmx_buffer);
> > +#endif
> > +
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•ret = request_irq(pdev->irq, dm1105dvb_irq, IRQF_SHARED,
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•
> >Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•DRIVER_NAME, dm1105dvb); +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•if (ret < 0)
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•goto err_free_irq;
> > +
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•return 0;
> > Ð±â•
> > Ð±â•err_disconnect_frontend:
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•dmx->disconnect_frontend(dmx);
> > @@ -850,7 +872,7 @@
> > Ð±â•err_kfree:
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•pci_set_drvdata(pdev, NULL);
> > Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•kfree(dm1105dvb);
> > -Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•goto out;
> > +Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•Ð±â•return ret;
> > Ð±â•}
> > Ð±â•
> > Ð±â•static void __devexit dm1105_remove(struct pci_dev *pdev)
> > [Erro ao decodificar BASE64]
>
> Cheers,
> Mauro
> --
> To unsubscribe from this list: send the line "unsubscribe linux-media" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
Today morning I sent pull request for that patch together with patch for infrared remote.
I am testing IR support for a few more cards. They will share IR codes, so that patch is needed.


Best Regards
Igor
Nâ–€â•–â•¡Ð¤Ð›râ•¦âŒ¡yÐ—Ð¥Â ÑŒbâ•¡Xâ•›â•¤Ð³â•–vÑŒ^âˆš)Ñ‡â•¨{.nÐ³+â”´â•¥â•”â”¼{â• â‰¥Ð“bj)Ðœâ”˜Ð¤Ð¥w*jgâ•›â• â•—â•¤â”´Â â–Œâ”¼Ñ‰â•’j/â”‚Ð™Ð”zâ•§Ñ‡âˆšâ”¼Ð®2â”¼Ñ‡â‰¥â•—Ð¥â•œÐ·&â•’)ÑŠâ•‘â•šaâ•¤Ð·Ð§Ð¬â•Gâ•šÂ²Ð˜hâ•Ð¤j:+vâ”´â•—â”¼wÐ¥â”œÑ‹â•”

diff -r 359d95e1d541 -r f22da8d6a83c linux/drivers/media/dvb/dm1105/dm1105.c
--- a/linux/drivers/media/dvb/dm1105/dm1105.cÂ Â Â Wed Feb 18 09:49:37 2009 -0300
+++ b/linux/drivers/media/dvb/dm1105/dm1105.cÂ Â Â Thu Feb 19 04:38:32 2009 +0200
@@ -220,10 +220,14 @@ 
Â Â Â Â Â Â Â Â /* i2c */
Â Â Â Â Â Â Â Â struct i2c_adapter i2c_adap;
Â 
+Â Â Â Â Â Â Â /* irq */
+Â Â Â Â Â Â Â struct work_struct work;
+
Â Â Â Â Â Â Â Â /* dma */
Â Â Â Â Â Â Â Â dma_addr_t dma_addr;
Â Â Â Â Â Â Â Â unsigned char *ts_buf;
Â Â Â Â Â Â Â Â u32 wrp;
+Â Â Â Â Â Â Â u32 nextwrp;
Â Â Â Â Â Â Â Â u32 buffer_size;
Â Â Â Â Â Â Â Â unsigned intÂ Â Â Â PacketErrorCount;
Â Â Â Â Â Â Â Â unsigned int dmarst;
@@ -418,6 +422,9 @@ 
Â Â Â Â Â Â Â Â u8 data;
Â Â Â Â Â Â Â Â u16 keycode;
Â 
+Â Â Â Â Â Â Â if (ir_debug)
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â printk(KERN_INFO "%s: received byte 0x%04x\n", __func__, ircom);
+
Â Â Â Â Â Â Â Â data = (ircom >> 8) & 0x7f;
Â 
Â Â Â Â Â Â Â Â input_event(ir->input_dev, EV_MSC, MSC_RAW, (0x0000f8 << 16) | data);
@@ -434,6 +441,50 @@ 
Â 
Â }
Â 
+/* work handler */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
+static void dm1105_dmx_buffer(void *_dm1105dvb)
+#else
+static void dm1105_dmx_buffer(struct work_struct *work)
+#endif
+{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 20)
+Â Â Â Â Â Â Â struct dm1105dvb *dm1105dvb = _dm1105dvb;
+#else
+Â Â Â Â Â Â Â struct dm1105dvb *dm1105dvb =
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â container_of(work, struct dm1105dvb, work);
+#endif
+Â Â Â Â Â Â Â unsigned int nbpackets;
+Â Â Â Â Â Â Â u32 oldwrp = dm1105dvb->wrp;
+Â Â Â Â Â Â Â u32 nextwrp = dm1105dvb->nextwrp;
+
+Â Â Â Â Â Â Â if (!((dm1105dvb->ts_buf[oldwrp] == 0x47) &&
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â (dm1105dvb->ts_buf[oldwrp + 188] == 0x47) &&
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â (dm1105dvb->ts_buf[oldwrp + 188 * 2] == 0x47))) {
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->PacketErrorCount++;
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â /* bad packet found */
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â if ((dm1105dvb->PacketErrorCount >= 2) &&
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â (dm1105dvb->dmarst == 0)) {
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â outb(1, dm_io_mem(DM1105_RST));
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->wrp = 0;
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->PacketErrorCount = 0;
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->dmarst = 0;
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â return;
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â }
+Â Â Â Â Â Â Â }
+
+Â Â Â Â Â Â Â if (nextwrp < oldwrp) {
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â memcpy(dm1105dvb->ts_buf + dm1105dvb->buffer_size,
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->ts_buf, nextwrp);
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â nbpackets = ((dm1105dvb->buffer_size - oldwrp) + nextwrp) / 188;
+Â Â Â Â Â Â Â } else
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â nbpackets = (nextwrp - oldwrp) / 188;
+
+Â Â Â Â Â Â Â dm1105dvb->wrp = nextwrp;
+Â Â Â Â Â Â Â dvb_dmx_swfilter_packets(&dm1105dvb->demux,
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â &dm1105dvb->ts_buf[oldwrp], nbpackets);
+}
+
Â #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)
Â static irqreturn_t dm1105dvb_irq(int irq, void *dev_id, struct pt_regs *regs)
Â #else
@@ -441,11 +492,6 @@ 
Â #endif
Â {
Â Â Â Â Â Â Â Â struct dm1105dvb *dm1105dvb = dev_id;
-Â Â Â Â Â Â Â unsigned int piece;
-Â Â Â Â Â Â Â unsigned int nbpackets;
-Â Â Â Â Â Â Â u32 command;
-Â Â Â Â Â Â Â u32 nextwrp;
-Â Â Â Â Â Â Â u32 oldwrp;
Â 
Â Â Â Â Â Â Â Â /* Read-Write INSTS Ack's Interrupt for DM1105 chip 16.03.2008 */
Â Â Â Â Â Â Â Â unsigned int intsts = inb(dm_io_mem(DM1105_INTSTS));
@@ -454,48 +500,17 @@ 
Â Â Â Â Â Â Â Â switch (intsts) {
Â Â Â Â Â Â Â Â case INTSTS_TSIRQ:
Â Â Â Â Â Â Â Â case (INTSTS_TSIRQ | INTSTS_IR):
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â nextwrp = inl(dm_io_mem(DM1105_WRP)) -
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â inl(dm_io_mem(DM1105_STADR)) ;
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â oldwrp = dm1105dvb->wrp;
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â spin_lock(&dm1105dvb->lock);
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â if (!((dm1105dvb->ts_buf[oldwrp] == 0x47) &&
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â (dm1105dvb->ts_buf[oldwrp + 188] == 0x47) &&
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â (dm1105dvb->ts_buf[oldwrp + 188 * 2] == 0x47))) {
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->PacketErrorCount++;
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â /* bad packet found */
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â if ((dm1105dvb->PacketErrorCount >= 2) &&
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â (dm1105dvb->dmarst == 0)) {
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â outb(1, dm_io_mem(DM1105_RST));
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->wrp = 0;
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->PacketErrorCount = 0;
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->dmarst = 0;
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â spin_unlock(&dm1105dvb->lock);
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â return IRQ_HANDLED;
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â }
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â }
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â if (nextwrp < oldwrp) {
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â piece = dm1105dvb->buffer_size - oldwrp;
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â memcpy(dm1105dvb->ts_buf + dm1105dvb->buffer_size, dm1105dvb->ts_buf, 
nextwrp);
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â nbpackets = (piece + nextwrp)/188;
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â } elseÂ Â {
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â nbpackets = (nextwrp - oldwrp)/188;
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â }
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dvb_dmx_swfilter_packets(&dm1105dvb->demux, &dm1105dvb->ts_buf[oldwrp], 
nbpackets);
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->wrp = nextwrp;
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â spin_unlock(&dm1105dvb->lock);
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->nextwrp = inl(dm_io_mem(DM1105_WRP)) -
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â inl(dm_io_mem(DM1105_STADR));
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â schedule_work(&dm1105dvb->work);
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â break;
Â Â Â Â Â Â Â Â case INTSTS_IR:
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â command = inl(dm_io_mem(DM1105_IRCODE));
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â if (ir_debug)
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â printk("dm1105: received byte 0x%04x\n", command);
-
-Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->ir.ir_command = command;
+Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â dm1105dvb->ir.ir_command = inl(dm_io_mem(DM1105_IRCODE));
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â tasklet_schedule(&dm1105dvb->ir.ir_tasklet);
Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â break;
Â Â Â Â Â Â Â Â }
+
Â Â Â Â Â Â Â Â return IRQ_HANDLED;
-
-
Â }

dm1105: not demuxing from interrupt context

Commit Message

Comments

Patch