Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 58 insertions, 31 deletions

diff --git a/drivers/media/dvb/firewire/firedtv-avc.c b/drivers/media/dvb/firewire/firedtv-avc.c
index 28294af752db..21c52e3b522e 100644
--- a/drivers/media/dvb/firewire/firedtv-avc.c
+++ b/drivers/media/dvb/firewire/firedtv-avc.c
@@ -24,6 +24,8 @@
 #include <linux/wait.h>
 #include <linux/workqueue.h>
 
+#include <dvb_frontend.h>
+
 #include "firedtv.h"
 
 #define FCP_COMMAND_REGISTER            0xfffff0000b00ULL
@@ -130,6 +132,20 @@ MODULE_PARM_DESC(debug, "Verbose logging (none = 0"
         ", FCP payloads = "             __stringify(AVC_DEBUG_FCP_PAYLOADS)
         ", or a combination, or all = -1)");
 
+/*
+ * This is a workaround since there is no vendor specific command to retrieve
+ * ca_info using AVC. If this parameter is not used, ca_system_id will be
+ * filled with application_manufacturer from ca_app_info.
+ * Digital Everywhere have said that adding ca_info is on their TODO list.
+ */
+static unsigned int num_fake_ca_system_ids;
+static int fake_ca_system_ids[4] = { -1, -1, -1, -1 };
+module_param_array(fake_ca_system_ids, int, &num_fake_ca_system_ids, 0644);
+MODULE_PARM_DESC(fake_ca_system_ids, "If your CAM application manufacturer "
+                 "does not have the same ca_system_id as your CAS, you can "
+                 "override what ca_system_ids are presented to the "
+                 "application by setting this field to an array of ids.");
+
 static const char *debug_fcp_ctype(unsigned int ctype)
 {
         static const char *ctypes[] = {
@@ -225,8 +241,8 @@ static int avc_write(struct firedtv *fdtv)
                 if (unlikely(avc_debug))
                         debug_fcp(fdtv->avc_data, fdtv->avc_data_length);
 
-                err = fdtv->backend->write(fdtv, FCP_COMMAND_REGISTER,
-                                fdtv->avc_data, fdtv->avc_data_length);
+                err = fdtv_write(fdtv, FCP_COMMAND_REGISTER,
+                                 fdtv->avc_data, fdtv->avc_data_length);
                 if (err) {
                         dev_err(fdtv->device, "FCP command write failed\n");
 
@@ -368,10 +384,30 @@ static int avc_tuner_tuneqpsk(struct firedtv *fdtv,
                 c->operand[12] = 0;
 
         if (fdtv->type == FIREDTV_DVB_S2) {
-                c->operand[13] = 0x1;
-                c->operand[14] = 0xff;
-                c->operand[15] = 0xff;
-
+                if (fdtv->fe.dtv_property_cache.delivery_system == SYS_DVBS2) {
+                        switch (fdtv->fe.dtv_property_cache.modulation) {
+                        case QAM_16:            c->operand[13] = 0x1; break;
+                        case QPSK:              c->operand[13] = 0x2; break;
+                        case PSK_8:             c->operand[13] = 0x3; break;
+                        default:                c->operand[13] = 0x2; break;
+                        }
+                        switch (fdtv->fe.dtv_property_cache.rolloff) {
+                        case ROLLOFF_AUTO:      c->operand[14] = 0x2; break;
+                        case ROLLOFF_35:        c->operand[14] = 0x2; break;
+                        case ROLLOFF_20:        c->operand[14] = 0x0; break;
+                        case ROLLOFF_25:        c->operand[14] = 0x1; break;
+                        /* case ROLLOFF_NONE:   c->operand[14] = 0xff; break; */
+                        }
+                        switch (fdtv->fe.dtv_property_cache.pilot) {
+                        case PILOT_AUTO:        c->operand[15] = 0x0; break;
+                        case PILOT_OFF:         c->operand[15] = 0x0; break;
+                        case PILOT_ON:          c->operand[15] = 0x1; break;
+                        }
+                } else {
+                        c->operand[13] = 0x1;  /* auto modulation */
+                        c->operand[14] = 0xff; /* disable rolloff */
+                        c->operand[15] = 0xff; /* disable pilot */
+                }
                 return 16;
         } else {
                 return 13;
@@ -977,7 +1013,7 @@ int avc_ca_info(struct firedtv *fdtv, char *app_info, unsigned int *len)
 {
         struct avc_command_frame *c = (void *)fdtv->avc_data;
         struct avc_response_frame *r = (void *)fdtv->avc_data;
-        int pos, ret;
+        int i, pos, ret;
 
         mutex_lock(&fdtv->avc_mutex);
 
@@ -1004,9 +1040,18 @@ int avc_ca_info(struct firedtv *fdtv, char *app_info, unsigned int *len)
         app_info[0] = (EN50221_TAG_CA_INFO >> 16) & 0xff;
         app_info[1] = (EN50221_TAG_CA_INFO >>  8) & 0xff;
         app_info[2] = (EN50221_TAG_CA_INFO >>  0) & 0xff;
-        app_info[3] = 2;
-        app_info[4] = r->operand[pos + 0];
-        app_info[5] = r->operand[pos + 1];
+        if (num_fake_ca_system_ids == 0) {
+                app_info[3] = 2;
+                app_info[4] = r->operand[pos + 0];
+                app_info[5] = r->operand[pos + 1];
+        } else {
+                app_info[3] = num_fake_ca_system_ids * 2;
+                for (i = 0; i < num_fake_ca_system_ids; i++) {
+                        app_info[4 + i * 2] =
+                                (fake_ca_system_ids[i] >> 8) & 0xff;
+                        app_info[5 + i * 2] = fake_ca_system_ids[i] & 0xff;
+                }
+        }
         *len = app_info[3] + 4;
 out:
         mutex_unlock(&fdtv->avc_mutex);
@@ -1275,14 +1320,10 @@ static int cmp_read(struct firedtv *fdtv, u64 addr, __be32 *data)
 {
         int ret;
 
-        mutex_lock(&fdtv->avc_mutex);
-
-        ret = fdtv->backend->read(fdtv, addr, data);
+        ret = fdtv_read(fdtv, addr, data);
         if (ret < 0)
                 dev_err(fdtv->device, "CMP: read I/O error\n");
 
-        mutex_unlock(&fdtv->avc_mutex);
-
         return ret;
 }
 
@@ -1290,18 +1331,9 @@ static int cmp_lock(struct firedtv *fdtv, u64 addr, __be32 data[])
 {
         int ret;
 
-        mutex_lock(&fdtv->avc_mutex);
-
-        /* data[] is stack-allocated and should not be DMA-mapped. */
-        memcpy(fdtv->avc_data, data, 8);
-
-        ret = fdtv->backend->lock(fdtv, addr, fdtv->avc_data);
+        ret = fdtv_lock(fdtv, addr, data);
         if (ret < 0)
                 dev_err(fdtv->device, "CMP: lock I/O error\n");
-        else
-                memcpy(data, fdtv->avc_data, 8);
-
-        mutex_unlock(&fdtv->avc_mutex);
 
         return ret;
 }
@@ -1360,10 +1392,7 @@ repeat:
                 /* FIXME: this is for the worst case - optimize */
                 set_opcr_overhead_id(opcr, 0);
 
-                /*
-                 * FIXME: allocate isochronous channel and bandwidth at IRM
-                 * fdtv->backend->alloc_resources(fdtv, channels_mask, bw);
-                 */
+                /* FIXME: allocate isochronous channel and bandwidth at IRM */
         }
 
         set_opcr_p2p_connections(opcr, get_opcr_p2p_connections(*opcr) + 1);
@@ -1379,8 +1408,6 @@ repeat:
                 /*
                  * FIXME: if old_opcr.P2P_Connections > 0,
                  * deallocate isochronous channel and bandwidth at IRM
-                 * if (...)
-                 *      fdtv->backend->dealloc_resources(fdtv, channel, bw);
                  */
 
                 if (++attempts < 6) /* arbitrary limit */