Re: [git:v4l-dvb/for_v3.7] [media] mantis: Terratec Cinergy C PCI HD (CI)

Re: [git:v4l-dvb/for_v3.7] [media] mantis: Terratec Cinergy C PCI HD (CI)

[Manu Abraham]

Mauro,

Please revert this patch. Patch is incorrect. There is the VP-20300,
VP-20330, VP-2040, with differences in tuner types TDA10021, TDA10023,
MK-I, MK-II and MK-III. I have detailed this issue in an earlier mail.
Terratec Cinregy C is VP-2033 and not VP-2040.

Thanks!


On Sat, Aug 11, 2012 at 1:34 AM, Mauro Carvalho Chehab
<mchehab@redhat.com> wrote:
> This is an automatic generated email to let you know that the following patch were queued at the
> http://git.linuxtv.org/media_tree.git tree:
>
> Subject: [media] mantis: Terratec Cinergy C PCI HD (CI)
> Author:  Igor M. Liplianin <liplianin@me.by>
> Date:    Wed May 9 07:23:14 2012 -0300
>
> This patch seems for rectifying a typo. But actually the difference between
> mantis_vp2040.c and mantis_vp2033.c code is a card name only.
>
> Signed-off-by: Igor M. Liplianin <liplianin@me.by>
> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
>
>  drivers/media/dvb/mantis/mantis_cards.c |    2 +-
>  drivers/media/dvb/mantis/mantis_core.c  |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> ---
>
> http://git.linuxtv.org/media_tree.git?a=commitdiff;h=9fa4d6a102ebb06663a03554b57fb93ad618b72e
>
> diff --git a/drivers/media/dvb/mantis/mantis_cards.c b/drivers/media/dvb/mantis/mantis_cards.c
> index 095cf3a..0207d1f 100644
> --- a/drivers/media/dvb/mantis/mantis_cards.c
> +++ b/drivers/media/dvb/mantis/mantis_cards.c
> @@ -275,7 +275,7 @@ static struct pci_device_id mantis_pci_table[] = {
>         MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_2033_DVB_C, &vp2033_config),
>         MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_2040_DVB_C, &vp2040_config),
>         MAKE_ENTRY(TECHNISAT, CABLESTAR_HD2, &vp2040_config),
> -       MAKE_ENTRY(TERRATEC, CINERGY_C, &vp2033_config),
> +       MAKE_ENTRY(TERRATEC, CINERGY_C, &vp2040_config),
>         MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_3030_DVB_T, &vp3030_config),
>         { }
>  };
> diff --git a/drivers/media/dvb/mantis/mantis_core.c b/drivers/media/dvb/mantis/mantis_core.c
> index 22524a8..684d906 100644
> --- a/drivers/media/dvb/mantis/mantis_core.c
> +++ b/drivers/media/dvb/mantis/mantis_core.c
> @@ -121,7 +121,7 @@ static void mantis_load_config(struct mantis_pci *mantis)
>                 mantis->hwconfig = &vp2033_mantis_config;
>                 break;
>         case MANTIS_VP_2040_DVB_C:      /* VP-2040 */
> -       case TERRATEC_CINERGY_C_PCI:    /* VP-2040 clone */
> +       case CINERGY_C: /* VP-2040 clone */
>         case TECHNISAT_CABLESTAR_HD2:
>                 mantis->hwconfig = &vp2040_mantis_config;
>                 break;
>
> _______________________________________________
> linuxtv-commits mailing list
> linuxtv-commits@linuxtv.org
> http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Re: [git:v4l-dvb/for_v3.7] [media] mantis: Terratec Cinergy C PCI HD (CI)

[Mauro Carvalho Chehab]

Em 10-08-2012 20:55, Manu Abraham escreveu:
> Mauro,
> 
> Please revert this patch. Patch is incorrect. There is the VP-20300,
> VP-20330, VP-2040, with differences in tuner types TDA10021, TDA10023,
> MK-I, MK-II and MK-III. I have detailed this issue in an earlier mail.
> Terratec Cinregy C is VP-2033 and not VP-2040.

Well, as I don't have this board, you think that it is a VP-2033 while
Igor thinks it is a VP-2040, I can't tell who is right on that.

I need either you to change your mind or to get a third developer to
point who is right in order to address it.

In any case, no harm is done, as both have exactly the same code.

That's why the better is to just drop one of the drivers, while
both are identical.

Regards,
Mauro

> 
> Thanks!
> 
> 
> On Sat, Aug 11, 2012 at 1:34 AM, Mauro Carvalho Chehab
> <mchehab@redhat.com> wrote:
>> This is an automatic generated email to let you know that the following patch were queued at the
>> http://git.linuxtv.org/media_tree.git tree:
>>
>> Subject: [media] mantis: Terratec Cinergy C PCI HD (CI)
>> Author:  Igor M. Liplianin <liplianin@me.by>
>> Date:    Wed May 9 07:23:14 2012 -0300
>>
>> This patch seems for rectifying a typo. But actually the difference between
>> mantis_vp2040.c and mantis_vp2033.c code is a card name only.
>>
>> Signed-off-by: Igor M. Liplianin <liplianin@me.by>
>> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
>>
>>  drivers/media/dvb/mantis/mantis_cards.c |    2 +-
>>  drivers/media/dvb/mantis/mantis_core.c  |    2 +-
>>  2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> ---
>>
>> http://git.linuxtv.org/media_tree.git?a=commitdiff;h=9fa4d6a102ebb06663a03554b57fb93ad618b72e
>>
>> diff --git a/drivers/media/dvb/mantis/mantis_cards.c b/drivers/media/dvb/mantis/mantis_cards.c
>> index 095cf3a..0207d1f 100644
>> --- a/drivers/media/dvb/mantis/mantis_cards.c
>> +++ b/drivers/media/dvb/mantis/mantis_cards.c
>> @@ -275,7 +275,7 @@ static struct pci_device_id mantis_pci_table[] = {
>>         MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_2033_DVB_C, &vp2033_config),
>>         MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_2040_DVB_C, &vp2040_config),
>>         MAKE_ENTRY(TECHNISAT, CABLESTAR_HD2, &vp2040_config),
>> -       MAKE_ENTRY(TERRATEC, CINERGY_C, &vp2033_config),
>> +       MAKE_ENTRY(TERRATEC, CINERGY_C, &vp2040_config),
>>         MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_3030_DVB_T, &vp3030_config),
>>         { }
>>  };
>> diff --git a/drivers/media/dvb/mantis/mantis_core.c b/drivers/media/dvb/mantis/mantis_core.c
>> index 22524a8..684d906 100644
>> --- a/drivers/media/dvb/mantis/mantis_core.c
>> +++ b/drivers/media/dvb/mantis/mantis_core.c
>> @@ -121,7 +121,7 @@ static void mantis_load_config(struct mantis_pci *mantis)
>>                 mantis->hwconfig = &vp2033_mantis_config;
>>                 break;
>>         case MANTIS_VP_2040_DVB_C:      /* VP-2040 */
>> -       case TERRATEC_CINERGY_C_PCI:    /* VP-2040 clone */
>> +       case CINERGY_C: /* VP-2040 clone */
>>         case TECHNISAT_CABLESTAR_HD2:
>>                 mantis->hwconfig = &vp2040_mantis_config;
>>                 break;
>>
>> _______________________________________________
>> linuxtv-commits mailing list
>> linuxtv-commits@linuxtv.org
>> http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
> --
> 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
> 

Re: [git:v4l-dvb/for_v3.7] [media] mantis: Terratec Cinergy C PCI HD (CI)

[Manu Abraham]

On Tue, Aug 14, 2012 at 12:55 AM, Mauro Carvalho Chehab
<mchehab@redhat.com> wrote:
> Em 10-08-2012 20:55, Manu Abraham escreveu:
>> Mauro,
>>
>> Please revert this patch. Patch is incorrect. There is the VP-20300,
>> VP-20330, VP-2040, with differences in tuner types TDA10021, TDA10023,
>> MK-I, MK-II and MK-III. I have detailed this issue in an earlier mail.
>> Terratec Cinregy C is VP-2033 and not VP-2040.
>
> Well, as I don't have this board, you think that it is a VP-2033 while
> Igor thinks it is a VP-2040, I can't tell who is right on that.

You don't need all the cards to apply changes, that's how the Linux
patchland works.

I have "all" Mantis based devices here. So I can say with clarity that
Terratec Cinergy C is VP-2033. I authored the whole driver for the
chipset manufacturer and the card manufacturer and still in touch with
all of them and pretty sure what is what.

Any idiot can send any patch, that's why you need to ask the persons
who added particular changes in that area. Do you want me to add
myself to MAINTAINERS to make it a bit more clearer, if that's what
you prefer ?

Please revert this change.

Manu

Re: [git:v4l-dvb/for_v3.7] [media] mantis: Terratec Cinergy C PCI HD (CI)

[Mauro Carvalho Chehab]

Em 14-08-2012 04:45, Manu Abraham escreveu:
> On Tue, Aug 14, 2012 at 12:55 AM, Mauro Carvalho Chehab
> <mchehab@redhat.com> wrote:
>> Em 10-08-2012 20:55, Manu Abraham escreveu:
>>> Mauro,
>>>
>>> Please revert this patch. Patch is incorrect. There is the VP-20300,
>>> VP-20330, VP-2040, with differences in tuner types TDA10021, TDA10023,
>>> MK-I, MK-II and MK-III. I have detailed this issue in an earlier mail.
>>> Terratec Cinregy C is VP-2033 and not VP-2040.
>>
>> Well, as I don't have this board, you think that it is a VP-2033 while
>> Igor thinks it is a VP-2040, I can't tell who is right on that.
> 
> You don't need all the cards to apply changes, that's how the Linux
> patchland works.
> 
> I have "all" Mantis based devices here. So I can say with clarity that
> Terratec Cinergy C is VP-2033. I authored the whole driver for the
> chipset manufacturer and the card manufacturer and still in touch with
> all of them and pretty sure what is what.
>
> Any idiot can send any patch, that's why you need to ask the persons
> who added particular changes in that area.

Yes, you authored the driver, but that doesn't necessarily means that
you'll have all clones of VP-2033/VP-2040.

> Do you want me to add
> myself to MAINTAINERS to make it a bit more clearer, if that's what
> you prefer ?

If you're wiling to maintain it, not holding patches for more than the
few days required for their review, then YES!!! 

Please add yourself to the MAINTAINERS for the drivers you're willing
to maintain and submit me such patch for upstream merging.

> Please revert this change.

I'll do.

Regards,
Mauro

Re: [git:v4l-dvb/for_v3.7] [media] mantis: Terratec Cinergy C PCI HD (CI)

[Mauro Carvalho Chehab]

Em 14-08-2012 10:23, Mauro Carvalho Chehab escreveu:
> Em 14-08-2012 04:45, Manu Abraham escreveu:
>> On Tue, Aug 14, 2012 at 12:55 AM, Mauro Carvalho Chehab
>> <mchehab@redhat.com> wrote:
>>> Em 10-08-2012 20:55, Manu Abraham escreveu:
>>>> Mauro,
>>>>
>>>> Please revert this patch. Patch is incorrect. There is the VP-20300,
>>>> VP-20330, VP-2040, with differences in tuner types TDA10021, TDA10023,
>>>> MK-I, MK-II and MK-III. I have detailed this issue in an earlier mail.
>>>> Terratec Cinregy C is VP-2033 and not VP-2040.
>>>
>>> Well, as I don't have this board, you think that it is a VP-2033 while
>>> Igor thinks it is a VP-2040, I can't tell who is right on that.
>>
>> You don't need all the cards to apply changes, that's how the Linux
>> patchland works.
>>
>> I have "all" Mantis based devices here. So I can say with clarity that
>> Terratec Cinergy C is VP-2033. I authored the whole driver for the
>> chipset manufacturer and the card manufacturer and still in touch with
>> all of them and pretty sure what is what.
>>
>> Any idiot can send any patch, that's why you need to ask the persons
>> who added particular changes in that area.
> 
> Yes, you authored the driver, but that doesn't necessarily means that
> you'll have all clones of VP-2033/VP-2040.
> 
>> Do you want me to add
>> myself to MAINTAINERS to make it a bit more clearer, if that's what
>> you prefer ?
> 
> If you're wiling to maintain it, not holding patches for more than the
> few days required for their review, then YES!!! 
> 
> Please add yourself to the MAINTAINERS for the drivers you're willing
> to maintain and submit me such patch for upstream merging.
> 
>> Please revert this change.
> 
> I'll do.


Hmm... there's something wrong: this would be the revert patch, as produced
by git revert:

diff --git a/drivers/media/pci/mantis/mantis_cards.c b/drivers/media/pci/mantis/mantis_cards.c
index 0207d1f..095cf3a 100644
--- a/drivers/media/pci/mantis/mantis_cards.c
+++ b/drivers/media/pci/mantis/mantis_cards.c
@@ -275,7 +275,7 @@ static struct pci_device_id mantis_pci_table[] = {
 	MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_2033_DVB_C, &vp2033_config),
 	MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_2040_DVB_C, &vp2040_config),
 	MAKE_ENTRY(TECHNISAT, CABLESTAR_HD2, &vp2040_config),
-	MAKE_ENTRY(TERRATEC, CINERGY_C, &vp2040_config),
+	MAKE_ENTRY(TERRATEC, CINERGY_C, &vp2033_config),
 	MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_3030_DVB_T, &vp3030_config),
 	{ }
 };
diff --git a/drivers/media/pci/mantis/mantis_core.c b/drivers/media/pci/mantis/mantis_core.c
index 684d906..22524a8 100644
--- a/drivers/media/pci/mantis/mantis_core.c
+++ b/drivers/media/pci/mantis/mantis_core.c
@@ -121,7 +121,7 @@ static void mantis_load_config(struct mantis_pci *mantis)
 		mantis->hwconfig = &vp2033_mantis_config;
 		break;
 	case MANTIS_VP_2040_DVB_C:	/* VP-2040 */
-	case CINERGY_C:	/* VP-2040 clone */
+	case TERRATEC_CINERGY_C_PCI:	/* VP-2040 clone */
 	case TECHNISAT_CABLESTAR_HD2:
 		mantis->hwconfig = &vp2040_mantis_config;
 		break;

There's something wrong there: the comments at "mantis_core", before this
patch, is saying that TERRATEC_CINERGY_C_PCI is a VP-2040 clone.

That doesn't look right: this card is either a VP-2033 clone (as stated on
mantis_cards), or a VP-2040 (as stated on mantis_core).

So, please write me a patch syncing both places with the correct information.

Thanks!
Mauro

Re: [git:v4l-dvb/for_v3.7] [media] mantis: Terratec Cinergy C PCI HD (CI)

[Bjørn Mork]

Mauro Carvalho Chehab <mchehab@redhat.com> writes:

> Hmm... there's something wrong: this would be the revert patch, as produced
> by git revert:
>
> diff --git a/drivers/media/pci/mantis/mantis_cards.c b/drivers/media/pci/mantis/mantis_cards.c
> index 0207d1f..095cf3a 100644
> --- a/drivers/media/pci/mantis/mantis_cards.c
> +++ b/drivers/media/pci/mantis/mantis_cards.c
> @@ -275,7 +275,7 @@ static struct pci_device_id mantis_pci_table[] = {
>  	MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_2033_DVB_C, &vp2033_config),
>  	MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_2040_DVB_C, &vp2040_config),
>  	MAKE_ENTRY(TECHNISAT, CABLESTAR_HD2, &vp2040_config),
> -	MAKE_ENTRY(TERRATEC, CINERGY_C, &vp2040_config),
> +	MAKE_ENTRY(TERRATEC, CINERGY_C, &vp2033_config),
>  	MAKE_ENTRY(TWINHAN_TECHNOLOGIES, MANTIS_VP_3030_DVB_T, &vp3030_config),
>  	{ }
>  };
> diff --git a/drivers/media/pci/mantis/mantis_core.c b/drivers/media/pci/mantis/mantis_core.c
> index 684d906..22524a8 100644
> --- a/drivers/media/pci/mantis/mantis_core.c
> +++ b/drivers/media/pci/mantis/mantis_core.c
> @@ -121,7 +121,7 @@ static void mantis_load_config(struct mantis_pci *mantis)
>  		mantis->hwconfig = &vp2033_mantis_config;
>  		break;
>  	case MANTIS_VP_2040_DVB_C:	/* VP-2040 */
> -	case CINERGY_C:	/* VP-2040 clone */
> +	case TERRATEC_CINERGY_C_PCI:	/* VP-2040 clone */
>  	case TECHNISAT_CABLESTAR_HD2:
>  		mantis->hwconfig = &vp2040_mantis_config;
>  		break;
>
> There's something wrong there: the comments at "mantis_core", before this
> patch, is saying that TERRATEC_CINERGY_C_PCI is a VP-2040 clone.
>
> That doesn't look right: this card is either a VP-2033 clone (as stated on
> mantis_cards), or a VP-2040 (as stated on mantis_core).


Just delete the whole mantis_core.c file.  It has never been built in
the in-kernel driver.  See, no reference to it at all:


bjorn@nemi:/usr/local/src/git/linux$ cat drivers/media/dvb/mantis/Makefile 
mantis_core-objs :=     mantis_ioc.o    \
                        mantis_uart.o   \
                        mantis_dma.o    \
                        mantis_pci.o    \
                        mantis_i2c.o    \
                        mantis_dvb.o    \
                        mantis_evm.o    \
                        mantis_hif.o    \
                        mantis_ca.o     \
                        mantis_pcmcia.o \
                        mantis_input.o

mantis-objs     :=      mantis_cards.o  \
                        mantis_vp1033.o \
                        mantis_vp1034.o \
                        mantis_vp1041.o \
                        mantis_vp2033.o \
                        mantis_vp2040.o \
                        mantis_vp3030.o

hopper-objs     :=      hopper_cards.o  \
                        hopper_vp3028.o

obj-$(CONFIG_MANTIS_CORE)       += mantis_core.o
obj-$(CONFIG_DVB_MANTIS)        += mantis.o
obj-$(CONFIG_DVB_HOPPER)        += hopper.o

ccflags-y += -Idrivers/media/dvb/dvb-core/ -Idrivers/media/dvb/frontends/




Bjørn

Re: [git:v4l-dvb/for_v3.7] [media] mantis: Terratec Cinergy C PCI HD (CI)

[Bjørn Mork]

Manu Abraham <abraham.manu@gmail.com> writes:

> Terratec Cinregy C is VP-2033 and not VP-2040.

Can you please enlighten me on how to tell this difference?  I have two
of these cards:

bjorn@canardo:~$ lspci -vvnns 05:00
05:00.0 Multimedia controller [0480]: Twinhan Technology Co. Ltd Mantis DTV PCI Bridge Controller [Ver 1.0] [1822:4e35] (rev 01)
        Subsystem: TERRATEC Electronic GmbH Device [153b:1178]
        Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx-
        Status: Cap- 66MHz- UDF- FastB2B- ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx-
        Latency: 64 (2000ns min, 63750ns max)
        Interrupt: pin A routed to IRQ 16
        Region 0: Memory at fdfff000 (32-bit, prefetchable) [size=4K]
        Kernel driver in use: Mantis
        Kernel modules: mantis

bjorn@canardo:~$ lspci -vvnns 05:01
05:01.0 Multimedia controller [0480]: Twinhan Technology Co. Ltd Mantis DTV PCI Bridge Controller [Ver 1.0] [1822:4e35] (rev 01)
        Subsystem: TERRATEC Electronic GmbH Device [153b:1178]
        Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx-
        Status: Cap- 66MHz- UDF- FastB2B- ParErr- DEVSEL=medium >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx-
        Latency: 64 (2000ns min, 63750ns max)
        Interrupt: pin A routed to IRQ 17
        Region 0: Memory at fdffe000 (32-bit, prefetchable) [size=4K]
        Kernel driver in use: Mantis
        Kernel modules: mantis


Both of them appear to have a TDA10023 tuner:

[   35.626204] Mantis 0000:05:00.0: PCI INT A -> GSI 16 (level, low) -> IRQ 16
[   35.847869] DVB: registering new adapter (Mantis DVB adapter)
[   37.358998] DVB: registering adapter 0 frontend 0 (Philips TDA10023 DVB-C)...
[   37.359079] Mantis 0000:05:01.0: PCI INT A -> GSI 17 (level, low) -> IRQ 17
[   37.607414] DVB: registering new adapter (Mantis DVB adapter)
[   38.486159] DVB: registering adapter 1 frontend 0 (Philips TDA10023 DVB-C)...


But as both the VP-2033 and VP-2040 code support both TDA10021 and
TDA10023 there is obviously some other difference between these.  Bridge
version maybe?   Or something else?



Bjørn