5 files changed, 76 insertions, 38 deletions

diff --git a/drivers/media/dvb/ngene/ngene-cards.c b/drivers/media/dvb/ngene/ngene-cards.c
index 692c3e226e8..4692a41ad95 100644
--- a/drivers/media/dvb/ngene/ngene-cards.c
+++ b/drivers/media/dvb/ngene/ngene-cards.c
@@ -217,6 +217,19 @@ static struct ngene_info ngene_info_cineS2v5 = {
         .fw_version     = 15,
 };
 
+static struct ngene_info ngene_info_duoFlexS2 = {
+        .type           = NGENE_SIDEWINDER,
+        .name           = "Digital Devices DuoFlex S2 miniPCIe",
+        .io_type        = {NGENE_IO_TSIN, NGENE_IO_TSIN},
+        .demod_attach   = {demod_attach_stv0900, demod_attach_stv0900},
+        .tuner_attach   = {tuner_attach_stv6110, tuner_attach_stv6110},
+        .fe_config      = {&fe_cineS2, &fe_cineS2},
+        .tuner_config   = {&tuner_cineS2_0, &tuner_cineS2_1},
+        .lnb            = {0x0a, 0x08},
+        .tsf            = {3, 3},
+        .fw_version     = 15,
+};
+
 static struct ngene_info ngene_info_m780 = {
         .type           = NGENE_APP,
         .name           = "Aver M780 ATSC/QAM-B",
@@ -256,6 +269,8 @@ static const struct pci_device_id ngene_id_tbl[] __devinitdata = {
         NGENE_ID(0x18c3, 0xdb01, ngene_info_satixS2),
         NGENE_ID(0x18c3, 0xdb02, ngene_info_satixS2v2),
         NGENE_ID(0x18c3, 0xdd00, ngene_info_cineS2v5),
+        NGENE_ID(0x18c3, 0xdd10, ngene_info_duoFlexS2),
+        NGENE_ID(0x18c3, 0xdd20, ngene_info_duoFlexS2),
         NGENE_ID(0x1461, 0x062e, ngene_info_m780),
         {0}
 };
diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c
index c8b4dfa0ab5..4caeb163a66 100644
--- a/drivers/media/dvb/ngene/ngene-core.c
+++ b/drivers/media/dvb/ngene/ngene-core.c
@@ -53,8 +53,6 @@ MODULE_PARM_DESC(debug, "Print debugging information.");
 
 DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);
 
-#define COMMAND_TIMEOUT_WORKAROUND
-
 #define dprintk if (debug) printk
 
 #define ngwriteb(dat, adr)         writeb((dat), (char *)(dev->iomem + (adr)))
@@ -147,24 +145,24 @@ static void demux_tasklet(unsigned long data)
                 } else {
                         if (chan->HWState == HWSTATE_RUN) {
                                 u32 Flags = 0;
+                                IBufferExchange *exch1 = chan->pBufferExchange;
+                                IBufferExchange *exch2 = chan->pBufferExchange2;
                                 if (Cur->ngeneBuffer.SR.Flags & 0x01)
                                         Flags |= BEF_EVEN_FIELD;
                                 if (Cur->ngeneBuffer.SR.Flags & 0x20)
                                         Flags |= BEF_OVERFLOW;
-                                if (chan->pBufferExchange)
-                                        chan->pBufferExchange(chan,
-                                                              Cur->Buffer1,
-                                                              chan->
-                                                              Capture1Length,
-                                                              Cur->ngeneBuffer.
-                                                              SR.Clock, Flags);
-                                if (chan->pBufferExchange2)
-                                        chan->pBufferExchange2(chan,
-                                                               Cur->Buffer2,
-                                                               chan->
-                                                               Capture2Length,
-                                                               Cur->ngeneBuffer.
-                                                               SR.Clock, Flags);
+                                spin_unlock_irq(&chan->state_lock);
+                                if (exch1)
+                                        exch1(chan, Cur->Buffer1,
+                                                chan->Capture1Length,
+                                                Cur->ngeneBuffer.SR.Clock,
+                                                Flags);
+                                if (exch2)
+                                        exch2(chan, Cur->Buffer2,
+                                                chan->Capture2Length,
+                                                Cur->ngeneBuffer.SR.Clock,
+                                                Flags);
+                                spin_lock_irq(&chan->state_lock);
                         } else if (chan->HWState != HWSTATE_STOP)
                                 chan->HWState = HWSTATE_RUN;
                 }
@@ -572,11 +570,7 @@ static int ngene_command_stream_control(struct ngene *dev, u8 stream,
         u16 BsSPI = ((stream & 1) ? 0x9800 : 0x9700);
         u16 BsSDO = 0x9B00;
 
-        /* down(&dev->stream_mutex); */
-        while (down_trylock(&dev->stream_mutex)) {
-                printk(KERN_INFO DEVICE_NAME ": SC locked\n");
-                msleep(1);
-        }
+        down(&dev->stream_mutex);
         memset(&com, 0, sizeof(com));
         com.cmd.hdr.Opcode = CMD_CONTROL;
         com.cmd.hdr.Length = sizeof(struct FW_STREAM_CONTROL) - 2;
@@ -1252,14 +1246,17 @@ static int ngene_load_firm(struct ngene *dev)
                 version = 15;
                 size = 23466;
                 fw_name = "ngene_15.fw";
+                dev->cmd_timeout_workaround = true;
                 break;
         case 16:
                 size = 23498;
                 fw_name = "ngene_16.fw";
+                dev->cmd_timeout_workaround = true;
                 break;
         case 17:
                 size = 24446;
                 fw_name = "ngene_17.fw";
+                dev->cmd_timeout_workaround = true;
                 break;
         }
 
@@ -1299,11 +1296,16 @@ static void ngene_stop(struct ngene *dev)
         ngwritel(0, NGENE_EVENT);
         ngwritel(0, NGENE_EVENT_HI);
         free_irq(dev->pci_dev->irq, dev);
+#ifdef CONFIG_PCI_MSI
+        if (dev->msi_enabled)
+                pci_disable_msi(dev->pci_dev);
+#endif
 }
 
 static int ngene_start(struct ngene *dev)
 {
         int stat;
+        unsigned long flags;
         int i;
 
         pci_set_master(dev->pci_dev);
@@ -1333,6 +1335,28 @@ static int ngene_start(struct ngene *dev)
         if (stat < 0)
                 goto fail;
 
+#ifdef CONFIG_PCI_MSI
+        /* enable MSI if kernel and card support it */
+        if (pci_msi_enabled() && dev->card_info->msi_supported) {
+                ngwritel(0, NGENE_INT_ENABLE);
+                free_irq(dev->pci_dev->irq, dev);
+                stat = pci_enable_msi(dev->pci_dev);
+                if (stat) {
+                        printk(KERN_INFO DEVICE_NAME
+                                ": MSI not available\n");
+                        flags = IRQF_SHARED;
+                } else {
+                        flags = 0;
+                        dev->msi_enabled = true;
+                }
+                stat = request_irq(dev->pci_dev->irq, irq_handler,
+                                        flags, "nGene", dev);
+                if (stat < 0)
+                        goto fail2;
+                ngwritel(1, NGENE_INT_ENABLE);
+        }
+#endif
+
         stat = ngene_i2c_init(dev, 0);
         if (stat < 0)
                 goto fail;
@@ -1358,10 +1382,18 @@ static int ngene_start(struct ngene *dev)
                         bconf = BUFFER_CONFIG_3333;
                 stat = ngene_command_config_buf(dev, bconf);
         }
-        return stat;
+        if (!stat)
+                return stat;
+
+        /* otherwise error: fall through */
 fail:
         ngwritel(0, NGENE_INT_ENABLE);
         free_irq(dev->pci_dev->irq, dev);
+#ifdef CONFIG_PCI_MSI
+fail2:
+        if (dev->msi_enabled)
+                pci_disable_msi(dev->pci_dev);
+#endif
         return stat;
 }
 
@@ -1379,10 +1411,8 @@ static void release_channel(struct ngene_channel *chan)
         struct ngene_info *ni = dev->card_info;
         int io = ni->io_type[chan->number];
 
-#ifdef COMMAND_TIMEOUT_WORKAROUND
-        if (chan->running)
+        if (chan->dev->cmd_timeout_workaround && chan->running)
                 set_transfer(chan, 0);
-#endif
 
         tasklet_kill(&chan->demux_tasklet);
 
diff --git a/drivers/media/dvb/ngene/ngene-dvb.c b/drivers/media/dvb/ngene/ngene-dvb.c
index 96013eb353c..48f980b21d6 100644
--- a/drivers/media/dvb/ngene/ngene-dvb.c
+++ b/drivers/media/dvb/ngene/ngene-dvb.c
@@ -37,15 +37,12 @@
 #include <linux/pci.h>
 #include <linux/smp_lock.h>
 #include <linux/timer.h>
-#include <linux/version.h>
 #include <linux/byteorder/generic.h>
 #include <linux/firmware.h>
 #include <linux/vmalloc.h>
 
 #include "ngene.h"
 
-#define COMMAND_TIMEOUT_WORKAROUND
-
 
 /****************************************************************************/
 /* COMMAND API interface ****************************************************/
@@ -69,9 +66,7 @@ void *tsin_exchange(void *priv, void *buf, u32 len, u32 clock, u32 flags)
         struct ngene_channel *chan = priv;
 
 
-#ifdef COMMAND_TIMEOUT_WORKAROUND
         if (chan->users > 0)
-#endif
                 dvb_dmx_swfilter(&chan->demux, buf, len);
         return NULL;
 }
@@ -106,11 +101,8 @@ int ngene_start_feed(struct dvb_demux_feed *dvbdmxfeed)
         struct ngene_channel *chan = dvbdmx->priv;
 
         if (chan->users == 0) {
-#ifdef COMMAND_TIMEOUT_WORKAROUND
-                if (!chan->running)
-#endif
+                if (!chan->dev->cmd_timeout_workaround || !chan->running)
                         set_transfer(chan, 1);
-                /* msleep(10); */
         }
 
         return ++chan->users;
@@ -124,9 +116,8 @@ int ngene_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
         if (--chan->users)
                 return chan->users;
 
-#ifndef COMMAND_TIMEOUT_WORKAROUND
-        set_transfer(chan, 0);
-#endif
+        if (!chan->dev->cmd_timeout_workaround)
+                set_transfer(chan, 0);
 
         return 0;
 }
diff --git a/drivers/media/dvb/ngene/ngene-i2c.c b/drivers/media/dvb/ngene/ngene-i2c.c
index 2ef54ca6bad..477fe0aade8 100644
--- a/drivers/media/dvb/ngene/ngene-i2c.c
+++ b/drivers/media/dvb/ngene/ngene-i2c.c
@@ -39,7 +39,6 @@
 #include <linux/pci_ids.h>
 #include <linux/smp_lock.h>
 #include <linux/timer.h>
-#include <linux/version.h>
 #include <linux/byteorder/generic.h>
 #include <linux/firmware.h>
 #include <linux/vmalloc.h>
diff --git a/drivers/media/dvb/ngene/ngene.h b/drivers/media/dvb/ngene/ngene.h
index 676fcbb7902..8fb4200f83f 100644
--- a/drivers/media/dvb/ngene/ngene.h
+++ b/drivers/media/dvb/ngene/ngene.h
@@ -725,6 +725,8 @@ struct ngene {
         u32                   device_version;
         u32                   fw_interface_version;
         u32                   icounts;
+        bool                  msi_enabled;
+        bool                  cmd_timeout_workaround;
 
         u8                   *CmdDoneByte;
         int                   BootFirmware;
@@ -797,6 +799,7 @@ struct ngene_info {
 #define NGENE_VBOX_V2    7
 
         int   fw_version;
+        bool  msi_supported;
         char *name;
 
         int   io_type[MAX_STREAM];