media: media/siano: Fix transmission parameters reporting for ISDB-T

The currently used functions for converting the transmission mode and guard
interval from the internal values to the DVBv5 API values do not return
correct values for ISDB broadcasts:

- The raw (debugfs) transmission mode is an integer whose values can be
1, 2 or 3, that corresponds to 2K, 4K and 8K FFT modes respectively.
However sms_to_mode() expects values 2, 4 or 8.
- Guard interval, as defined by smscoreapi.h returns "1 divided by value"
instead of 0, 1, 2, and 3 as defined in sms_to_guard_interval_table().

This commit implements ISDB-T specific methods for converting the internal
values for the aforementioned parameters to the DVBv5 API values. It also
adds support for reporting FEC and time interleaving values for each one
of the layers.

[mchehab: fix two coding style whitespace warnings]
Link: https://lore.kernel.org/linux-media/20201222030522.28774-1-nicolasstuardodiaz@gmail.com
Signed-off-by: Nicolas Stuardo Diaz <nicolasstuardodiaz@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/media/common/siano/smsdvb-main.c b/drivers/media/common/siano/smsdvb-main.c
index 00b5e678eae9991e0da4872629aa57c985540205..cd5bafe9a3acac029601abfa28ca0047aa0a252a 100644 (file)
--- a/drivers/media/common/siano/smsdvb-main.c
+++ b/drivers/media/common/siano/smsdvb-main.c
@@ -167,6 +167,34 @@ static inline int sms_to_mode(u32 mode)
        return TRANSMISSION_MODE_AUTO;
 }
 
+static inline int sms_to_isdbt_mode(u32 mode)
+{
+       switch (mode) {
+       case 1:
+               return TRANSMISSION_MODE_2K;
+       case 2:
+               return TRANSMISSION_MODE_4K;
+       case 3:
+               return TRANSMISSION_MODE_8K;
+       }
+       return TRANSMISSION_MODE_AUTO;
+}
+
+static inline int sms_to_isdbt_guard_interval(u32 interval)
+{
+       switch (interval) {
+       case 4:
+               return GUARD_INTERVAL_1_4;
+       case 8:
+               return GUARD_INTERVAL_1_8;
+       case 16:
+               return GUARD_INTERVAL_1_16;
+       case 32:
+               return GUARD_INTERVAL_1_32;
+       }
+       return GUARD_INTERVAL_AUTO;
+}
+
 static inline int sms_to_status(u32 is_demod_locked, u32 is_rf_locked)
 {
        if (is_demod_locked)
@@ -345,8 +373,8 @@ static void smsdvb_update_isdbt_stats(struct smsdvb_client_t *client,
        /* Update ISDB-T transmission parameters */
        c->frequency = p->frequency;
        c->bandwidth_hz = sms_to_bw(p->bandwidth);
-       c->transmission_mode = sms_to_mode(p->transmission_mode);
-       c->guard_interval = sms_to_guard_interval(p->guard_interval);
+       c->transmission_mode = sms_to_isdbt_mode(p->transmission_mode);
+       c->guard_interval = sms_to_isdbt_guard_interval(p->guard_interval);
        c->isdbt_partial_reception = p->partial_reception ? 1 : 0;
        n_layers = p->num_of_layers;
        if (n_layers < 1)
@@ -391,6 +419,10 @@ static void smsdvb_update_isdbt_stats(struct smsdvb_client_t *client,
                        continue;
                }
                c->layer[i].modulation = sms_to_modulation(lr->constellation);
+               c->layer[i].fec = sms_to_code_rate(lr->code_rate);
+
+               /* Time interleaving */
+               c->layer[i].interleaving = (u8)lr->ti_ldepth_i;
 
                /* TS PER */
                c->block_error.stat[i + 1].scale = FE_SCALE_COUNTER;
@@ -429,8 +461,8 @@ static void smsdvb_update_isdbt_stats_ex(struct smsdvb_client_t *client,
        c->frequency = p->frequency;
        client->fe_status = sms_to_status(p->is_demod_locked, 0);
        c->bandwidth_hz = sms_to_bw(p->bandwidth);
-       c->transmission_mode = sms_to_mode(p->transmission_mode);
-       c->guard_interval = sms_to_guard_interval(p->guard_interval);
+       c->transmission_mode = sms_to_isdbt_mode(p->transmission_mode);
+       c->guard_interval = sms_to_isdbt_guard_interval(p->guard_interval);
        c->isdbt_partial_reception = p->partial_reception ? 1 : 0;
        n_layers = p->num_of_layers;
        if (n_layers < 1)
@@ -479,6 +511,10 @@ static void smsdvb_update_isdbt_stats_ex(struct smsdvb_client_t *client,
                        continue;
                }
                c->layer[i].modulation = sms_to_modulation(lr->constellation);
+               c->layer[i].fec = sms_to_code_rate(lr->code_rate);
+
+               /* Time interleaving */
+               c->layer[i].interleaving = (u8)lr->ti_ldepth_i;
 
                /* TS PER */
                c->block_error.stat[i + 1].scale = FE_SCALE_COUNTER;