leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gp8psk: Fix DVB frontend attach

Browse Source 
The DVB binding schema at the DVB core assumes that the frontend is a
separate driver.  Faling to do that causes OOPS when the module is
removed, as it tries to do a symbol_put_addr on an internal symbol,
causing craches like:

    WARNING: CPU: 1 PID: 28102 at kernel/module.c:1108 module_put+0x57/0x70
    Modules linked in: dvb_usb_gp8psk(-) dvb_usb dvb_core nvidia_drm(PO) nvidia_modeset(PO) snd_hda_codec_hdmi snd_hda_intel snd_hda_codec snd_hwdep snd_hda_core snd_pcm snd_timer snd soundcore nvidia(PO) [last unloaded: rc_core]
    CPU: 1 PID: 28102 Comm: rmmod Tainted: P        WC O 4.8.4-build.1 #1
    Hardware name: MSI MS-7309/MS-7309, BIOS V1.12 02/23/2009
    Call Trace:
       dump_stack+0x44/0x64
       __warn+0xfa/0x120
       module_put+0x57/0x70
       module_put+0x57/0x70
       warn_slowpath_null+0x23/0x30
       module_put+0x57/0x70
       gp8psk_fe_set_frontend+0x460/0x460 [dvb_usb_gp8psk]
       symbol_put_addr+0x27/0x50
       dvb_usb_adapter_frontend_exit+0x3a/0x70 [dvb_usb]

From Derek's tests:
    "Attach bug is fixed, tuning works, module unloads without
     crashing. Everything seems ok!"

Reported-by: Derek <user.vdr@gmail.com>
Tested-by: Derek <user.vdr@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Mauro Carvalho Chehab 2016-11-12 12:46:28 -02:00 committed by Linus Torvalds
parent 1596c387e9
commit 7a0786c19d
7 changed files with 244 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/dvb-frontends/Kconfig
View File

@ -513,6 +513,11 @@ config DVB_AS102_FE
depends on DVB_CORE depends on DVB_CORE
default DVB_AS102 default DVB_AS102
config DVB_GP8PSK_FE
tristate
depends on DVB_CORE
default DVB_USB_GP8PSK
comment "DVB-C (cable) frontends" comment "DVB-C (cable) frontends"
depends on DVB_CORE depends on DVB_CORE

1
drivers/media/dvb-frontends/Makefile
View File

@ -121,6 +121,7 @@ obj-$(CONFIG_DVB_RTL2832_SDR) += rtl2832_sdr.o
obj-$(CONFIG_DVB_M88RS2000) += m88rs2000.o obj-$(CONFIG_DVB_M88RS2000) += m88rs2000.o
obj-$(CONFIG_DVB_AF9033) += af9033.o obj-$(CONFIG_DVB_AF9033) += af9033.o
obj-$(CONFIG_DVB_AS102_FE) += as102_fe.o obj-$(CONFIG_DVB_AS102_FE) += as102_fe.o
obj-$(CONFIG_DVB_GP8PSK_FE) += gp8psk-fe.o
obj-$(CONFIG_DVB_TC90522) += tc90522.o obj-$(CONFIG_DVB_TC90522) += tc90522.o
obj-$(CONFIG_DVB_HORUS3A) += horus3a.o obj-$(CONFIG_DVB_HORUS3A) += horus3a.o
obj-$(CONFIG_DVB_ASCOT2E) += ascot2e.o obj-$(CONFIG_DVB_ASCOT2E) += ascot2e.o

131
drivers/media/usb/dvb-usb/gp8psk-fe.c → drivers/media/dvb-frontends/gp8psk-fe.c
View File

@ -14,11 +14,27 @@
* *
* see Documentation/dvb/README.dvb-usb for more information * see Documentation/dvb/README.dvb-usb for more information
*/ */
#include "gp8psk.h"
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include "gp8psk-fe.h"
#include "dvb_frontend.h"
static int debug;
module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off).");
#define dprintk(fmt, arg...) do { \
if (debug) \
printk(KERN_DEBUG pr_fmt("%s: " fmt), \
__func__, ##arg); \
} while (0)
struct gp8psk_fe_state { struct gp8psk_fe_state {
struct dvb_frontend fe; struct dvb_frontend fe;
struct dvb_usb_device *d; void *priv;
const struct gp8psk_fe_ops *ops;
bool is_rev1;
u8 lock; u8 lock;
u16 snr; u16 snr;
unsigned long next_status_check; unsigned long next_status_check;
@ -29,22 +45,24 @@ static int gp8psk_tuned_to_DCII(struct dvb_frontend *fe)
{ {
struct gp8psk_fe_state *st = fe->demodulator_priv; struct gp8psk_fe_state *st = fe->demodulator_priv;
u8 status; u8 status;
gp8psk_usb_in_op(st->d, GET_8PSK_CONFIG, 0, 0, &status, 1);
st->ops->in(st->priv, GET_8PSK_CONFIG, 0, 0, &status, 1);
return status & bmDCtuned; return status & bmDCtuned;
} }
static int gp8psk_set_tuner_mode(struct dvb_frontend *fe, int mode) static int gp8psk_set_tuner_mode(struct dvb_frontend *fe, int mode)
{ {
struct gp8psk_fe_state *state = fe->demodulator_priv; struct gp8psk_fe_state *st = fe->demodulator_priv;
return gp8psk_usb_out_op(state->d, SET_8PSK_CONFIG, mode, 0, NULL, 0);
return st->ops->out(st->priv, SET_8PSK_CONFIG, mode, 0, NULL, 0);
} }
static int gp8psk_fe_update_status(struct gp8psk_fe_state *st) static int gp8psk_fe_update_status(struct gp8psk_fe_state *st)
{ {
u8 buf[6]; u8 buf[6];
if (time_after(jiffies,st->next_status_check)) { if (time_after(jiffies,st->next_status_check)) {
gp8psk_usb_in_op(st->d, GET_SIGNAL_LOCK, 0,0,&st->lock,1); st->ops->in(st->priv, GET_SIGNAL_LOCK, 0, 0, &st->lock, 1);
gp8psk_usb_in_op(st->d, GET_SIGNAL_STRENGTH, 0,0,buf,6); st->ops->in(st->priv, GET_SIGNAL_STRENGTH, 0, 0, buf, 6);
st->snr = (buf[1]) << 8 | buf[0]; st->snr = (buf[1]) << 8 | buf[0];
st->next_status_check = jiffies + (st->status_check_interval*HZ)/1000; st->next_status_check = jiffies + (st->status_check_interval*HZ)/1000;
} }
@ -116,13 +134,12 @@ static int gp8psk_fe_get_tune_settings(struct dvb_frontend* fe, struct dvb_front
static int gp8psk_fe_set_frontend(struct dvb_frontend *fe) static int gp8psk_fe_set_frontend(struct dvb_frontend *fe)
{ {
struct gp8psk_fe_state *state = fe->demodulator_priv; struct gp8psk_fe_state *st = fe->demodulator_priv;
struct dtv_frontend_properties *c = &fe->dtv_property_cache; struct dtv_frontend_properties *c = &fe->dtv_property_cache;
u8 cmd[10]; u8 cmd[10];
u32 freq = c->frequency * 1000; u32 freq = c->frequency * 1000;
int gp_product_id = le16_to_cpu(state->d->udev->descriptor.idProduct);
deb_fe("%s()\n", __func__); dprintk("%s()\n", __func__);
cmd[4] = freq & 0xff; cmd[4] = freq & 0xff;
cmd[5] = (freq >> 8) & 0xff; cmd[5] = (freq >> 8) & 0xff;
@ -136,21 +153,21 @@ static int gp8psk_fe_set_frontend(struct dvb_frontend *fe)
switch (c->delivery_system) { switch (c->delivery_system) {
case SYS_DVBS: case SYS_DVBS:
if (c->modulation != QPSK) { if (c->modulation != QPSK) {
deb_fe("%s: unsupported modulation selected (%d)\n", dprintk("%s: unsupported modulation selected (%d)\n",
__func__, c->modulation); __func__, c->modulation);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
c->fec_inner = FEC_AUTO; c->fec_inner = FEC_AUTO;
break; break;
case SYS_DVBS2: /* kept for backwards compatibility */ case SYS_DVBS2: /* kept for backwards compatibility */
deb_fe("%s: DVB-S2 delivery system selected\n", __func__); dprintk("%s: DVB-S2 delivery system selected\n", __func__);
break; break;
case SYS_TURBO: case SYS_TURBO:
deb_fe("%s: Turbo-FEC delivery system selected\n", __func__); dprintk("%s: Turbo-FEC delivery system selected\n", __func__);
break; break;
default: default:
deb_fe("%s: unsupported delivery system selected (%d)\n", dprintk("%s: unsupported delivery system selected (%d)\n",
__func__, c->delivery_system); __func__, c->delivery_system);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
@ -161,9 +178,9 @@ static int gp8psk_fe_set_frontend(struct dvb_frontend *fe)
cmd[3] = (c->symbol_rate >> 24) & 0xff; cmd[3] = (c->symbol_rate >> 24) & 0xff;
switch (c->modulation) { switch (c->modulation) {
case QPSK: case QPSK:
if (gp_product_id == USB_PID_GENPIX_8PSK_REV_1_WARM) if (st->is_rev1)
if (gp8psk_tuned_to_DCII(fe)) if (gp8psk_tuned_to_DCII(fe))
gp8psk_bcm4500_reload(state->d); st->ops->reload(st->priv);
switch (c->fec_inner) { switch (c->fec_inner) {
case FEC_1_2: case FEC_1_2:
cmd[9] = 0; break; cmd[9] = 0; break;
@ -207,18 +224,18 @@ static int gp8psk_fe_set_frontend(struct dvb_frontend *fe)
cmd[9] = 0; cmd[9] = 0;
break; break;
default: /* Unknown modulation */ default: /* Unknown modulation */
deb_fe("%s: unsupported modulation selected (%d)\n", dprintk("%s: unsupported modulation selected (%d)\n",
__func__, c->modulation); __func__, c->modulation);
return -EOPNOTSUPP; return -EOPNOTSUPP;
} }
if (gp_product_id == USB_PID_GENPIX_8PSK_REV_1_WARM) if (st->is_rev1)
gp8psk_set_tuner_mode(fe, 0); gp8psk_set_tuner_mode(fe, 0);
gp8psk_usb_out_op(state->d, TUNE_8PSK, 0, 0, cmd, 10); st->ops->out(st->priv, TUNE_8PSK, 0, 0, cmd, 10);
state->lock = 0; st->lock = 0;
state->next_status_check = jiffies; st->next_status_check = jiffies;
state->status_check_interval = 200; st->status_check_interval = 200;
return 0; return 0;
} }
@ -228,9 +245,9 @@ static int gp8psk_fe_send_diseqc_msg (struct dvb_frontend* fe,
{ {
struct gp8psk_fe_state *st = fe->demodulator_priv; struct gp8psk_fe_state *st = fe->demodulator_priv;
deb_fe("%s\n",__func__); dprintk("%s\n", __func__);
if (gp8psk_usb_out_op(st->d,SEND_DISEQC_COMMAND, m->msg[0], 0, if (st->ops->out(st->priv, SEND_DISEQC_COMMAND, m->msg[0], 0,
m->msg, m->msg_len)) { m->msg, m->msg_len)) {
return -EINVAL; return -EINVAL;
} }
@ -243,12 +260,12 @@ static int gp8psk_fe_send_diseqc_burst(struct dvb_frontend *fe,
struct gp8psk_fe_state *st = fe->demodulator_priv; struct gp8psk_fe_state *st = fe->demodulator_priv;
u8 cmd; u8 cmd;
deb_fe("%s\n",__func__); dprintk("%s\n", __func__);
/* These commands are certainly wrong */ /* These commands are certainly wrong */
cmd = (burst == SEC_MINI_A) ? 0x00 : 0x01; cmd = (burst == SEC_MINI_A) ? 0x00 : 0x01;
if (gp8psk_usb_out_op(st->d,SEND_DISEQC_COMMAND, cmd, 0, if (st->ops->out(st->priv, SEND_DISEQC_COMMAND, cmd, 0,
&cmd, 0)) { &cmd, 0)) {
return -EINVAL; return -EINVAL;
} }
@ -258,9 +275,9 @@ static int gp8psk_fe_send_diseqc_burst(struct dvb_frontend *fe,
static int gp8psk_fe_set_tone(struct dvb_frontend *fe, static int gp8psk_fe_set_tone(struct dvb_frontend *fe,
enum fe_sec_tone_mode tone) enum fe_sec_tone_mode tone)
{ {
struct gp8psk_fe_state* state = fe->demodulator_priv; struct gp8psk_fe_state *st = fe->demodulator_priv;
if (gp8psk_usb_out_op(state->d,SET_22KHZ_TONE, if (st->ops->out(st->priv, SET_22KHZ_TONE,
(tone == SEC_TONE_ON), 0, NULL, 0)) { (tone == SEC_TONE_ON), 0, NULL, 0)) {
return -EINVAL; return -EINVAL;
} }
@ -270,9 +287,9 @@ static int gp8psk_fe_set_tone(struct dvb_frontend *fe,
static int gp8psk_fe_set_voltage(struct dvb_frontend *fe, static int gp8psk_fe_set_voltage(struct dvb_frontend *fe,
enum fe_sec_voltage voltage) enum fe_sec_voltage voltage)
{ {
struct gp8psk_fe_state* state = fe->demodulator_priv; struct gp8psk_fe_state *st = fe->demodulator_priv;
if (gp8psk_usb_out_op(state->d,SET_LNB_VOLTAGE, if (st->ops->out(st->priv, SET_LNB_VOLTAGE,
voltage == SEC_VOLTAGE_18, 0, NULL, 0)) { voltage == SEC_VOLTAGE_18, 0, NULL, 0)) {
return -EINVAL; return -EINVAL;
} }
@ -281,52 +298,60 @@ static int gp8psk_fe_set_voltage(struct dvb_frontend *fe,
static int gp8psk_fe_enable_high_lnb_voltage(struct dvb_frontend* fe, long onoff) static int gp8psk_fe_enable_high_lnb_voltage(struct dvb_frontend* fe, long onoff)
{ {
struct gp8psk_fe_state* state = fe->demodulator_priv; struct gp8psk_fe_state *st = fe->demodulator_priv;
return gp8psk_usb_out_op(state->d, USE_EXTRA_VOLT, onoff, 0,NULL,0);
return st->ops->out(st->priv, USE_EXTRA_VOLT, onoff, 0, NULL, 0);
} }
static int gp8psk_fe_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long sw_cmd) static int gp8psk_fe_send_legacy_dish_cmd (struct dvb_frontend* fe, unsigned long sw_cmd)
{ {
struct gp8psk_fe_state* state = fe->demodulator_priv; struct gp8psk_fe_state *st = fe->demodulator_priv;
u8 cmd = sw_cmd & 0x7f; u8 cmd = sw_cmd & 0x7f;
if (gp8psk_usb_out_op(state->d,SET_DN_SWITCH, cmd, 0, if (st->ops->out(st->priv, SET_DN_SWITCH, cmd, 0, NULL, 0))
NULL, 0)) {
return -EINVAL; return -EINVAL;
}
if (gp8psk_usb_out_op(state->d,SET_LNB_VOLTAGE, !!(sw_cmd & 0x80), if (st->ops->out(st->priv, SET_LNB_VOLTAGE, !!(sw_cmd & 0x80),
0, NULL, 0)) { 0, NULL, 0))
return -EINVAL; return -EINVAL;
}
return 0; return 0;
} }
static void gp8psk_fe_release(struct dvb_frontend* fe) static void gp8psk_fe_release(struct dvb_frontend* fe)
{ {
struct gp8psk_fe_state *state = fe->demodulator_priv; struct gp8psk_fe_state *st = fe->demodulator_priv;
kfree(state);
kfree(st);
} }
static struct dvb_frontend_ops gp8psk_fe_ops; static struct dvb_frontend_ops gp8psk_fe_ops;
struct dvb_frontend * gp8psk_fe_attach(struct dvb_usb_device *d) struct dvb_frontend *gp8psk_fe_attach(const struct gp8psk_fe_ops *ops,
void *priv, bool is_rev1)
{ {
struct gp8psk_fe_state *s = kzalloc(sizeof(struct gp8psk_fe_state), GFP_KERNEL); struct gp8psk_fe_state *st;
if (s == NULL)
goto error;
s->d = d; if (!ops || !ops->in || !ops->out || !ops->reload) {
memcpy(&s->fe.ops, &gp8psk_fe_ops, sizeof(struct dvb_frontend_ops)); pr_err("Error! gp8psk-fe ops not defined.\n");
s->fe.demodulator_priv = s;
goto success;
error:
return NULL; return NULL;
success:
return &s->fe;
} }
st = kzalloc(sizeof(struct gp8psk_fe_state), GFP_KERNEL);
if (!st)
return NULL;
memcpy(&st->fe.ops, &gp8psk_fe_ops, sizeof(struct dvb_frontend_ops));
st->fe.demodulator_priv = st;
st->ops = ops;
st->priv = priv;
st->is_rev1 = is_rev1;
pr_info("Frontend %sattached\n", is_rev1 ? "revision 1 " : "");
return &st->fe;
}
EXPORT_SYMBOL_GPL(gp8psk_fe_attach);
static struct dvb_frontend_ops gp8psk_fe_ops = { static struct dvb_frontend_ops gp8psk_fe_ops = {
.delsys = { SYS_DVBS }, .delsys = { SYS_DVBS },

82
drivers/media/dvb-frontends/gp8psk-fe.h Normal file
View File

@ -0,0 +1,82 @@
/*
* gp8psk_fe driver
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
#ifndef GP8PSK_FE_H
#define GP8PSK_FE_H
#include <linux/types.h>
/* gp8psk commands */
#define GET_8PSK_CONFIG 0x80 /* in */
#define SET_8PSK_CONFIG 0x81
#define I2C_WRITE 0x83
#define I2C_READ 0x84
#define ARM_TRANSFER 0x85
#define TUNE_8PSK 0x86
#define GET_SIGNAL_STRENGTH 0x87 /* in */
#define LOAD_BCM4500 0x88
#define BOOT_8PSK 0x89 /* in */
#define START_INTERSIL 0x8A /* in */
#define SET_LNB_VOLTAGE 0x8B
#define SET_22KHZ_TONE 0x8C
#define SEND_DISEQC_COMMAND 0x8D
#define SET_DVB_MODE 0x8E
#define SET_DN_SWITCH 0x8F
#define GET_SIGNAL_LOCK 0x90 /* in */
#define GET_FW_VERS 0x92
#define GET_SERIAL_NUMBER 0x93 /* in */
#define USE_EXTRA_VOLT 0x94
#define GET_FPGA_VERS 0x95
#define CW3K_INIT 0x9d
/* PSK_configuration bits */
#define bm8pskStarted 0x01
#define bm8pskFW_Loaded 0x02
#define bmIntersilOn 0x04
#define bmDVBmode 0x08
#define bm22kHz 0x10
#define bmSEL18V 0x20
#define bmDCtuned 0x40
#define bmArmed 0x80
/* Satellite modulation modes */
#define ADV_MOD_DVB_QPSK 0 /* DVB-S QPSK */
#define ADV_MOD_TURBO_QPSK 1 /* Turbo QPSK */
#define ADV_MOD_TURBO_8PSK 2 /* Turbo 8PSK (also used for Trellis 8PSK) */
#define ADV_MOD_TURBO_16QAM 3 /* Turbo 16QAM (also used for Trellis 8PSK) */
#define ADV_MOD_DCII_C_QPSK 4 /* Digicipher II Combo */
#define ADV_MOD_DCII_I_QPSK 5 /* Digicipher II I-stream */
#define ADV_MOD_DCII_Q_QPSK 6 /* Digicipher II Q-stream */
#define ADV_MOD_DCII_C_OQPSK 7 /* Digicipher II offset QPSK */
#define ADV_MOD_DSS_QPSK 8 /* DSS (DIRECTV) QPSK */
#define ADV_MOD_DVB_BPSK 9 /* DVB-S BPSK */
/* firmware revision id's */
#define GP8PSK_FW_REV1 0x020604
#define GP8PSK_FW_REV2 0x020704
#define GP8PSK_FW_VERS(_fw_vers) \
((_fw_vers)[2]<<0x10 | (_fw_vers)[1]<<0x08 | (_fw_vers)[0])
struct gp8psk_fe_ops {
int (*in)(void *priv, u8 req, u16 value, u16 index, u8 *b, int blen);
int (*out)(void *priv, u8 req, u16 value, u16 index, u8 *b, int blen);
int (*reload)(void *priv);
};
struct dvb_frontend *gp8psk_fe_attach(const struct gp8psk_fe_ops *ops,
void *priv, bool is_rev1);
#endif

2
drivers/media/usb/dvb-usb/Makefile
View File

@ -8,7 +8,7 @@ obj-$(CONFIG_DVB_USB_VP7045) += dvb-usb-vp7045.o
dvb-usb-vp702x-objs := vp702x.o vp702x-fe.o dvb-usb-vp702x-objs := vp702x.o vp702x-fe.o
obj-$(CONFIG_DVB_USB_VP702X) += dvb-usb-vp702x.o obj-$(CONFIG_DVB_USB_VP702X) += dvb-usb-vp702x.o
dvb-usb-gp8psk-objs := gp8psk.o gp8psk-fe.o dvb-usb-gp8psk-objs := gp8psk.o
obj-$(CONFIG_DVB_USB_GP8PSK) += dvb-usb-gp8psk.o obj-$(CONFIG_DVB_USB_GP8PSK) += dvb-usb-gp8psk.o
dvb-usb-dtt200u-objs := dtt200u.o dtt200u-fe.o dvb-usb-dtt200u-objs := dtt200u.o dtt200u-fe.o

106
drivers/media/usb/dvb-usb/gp8psk.c
View File

@ -15,6 +15,7 @@
* see Documentation/dvb/README.dvb-usb for more information * see Documentation/dvb/README.dvb-usb for more information
*/ */
#include "gp8psk.h" #include "gp8psk.h"
#include "gp8psk-fe.h"
/* debug */ /* debug */
static char bcm4500_firmware[] = "dvb-usb-gp8psk-02.fw"; static char bcm4500_firmware[] = "dvb-usb-gp8psk-02.fw";
@ -28,34 +29,8 @@ struct gp8psk_state {
unsigned char data[80]; unsigned char data[80];
}; };
static int gp8psk_get_fw_version(struct dvb_usb_device *d, u8 *fw_vers) static int gp8psk_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value,
{ u16 index, u8 *b, int blen)
return (gp8psk_usb_in_op(d, GET_FW_VERS, 0, 0, fw_vers, 6));
}
static int gp8psk_get_fpga_version(struct dvb_usb_device *d, u8 *fpga_vers)
{
return (gp8psk_usb_in_op(d, GET_FPGA_VERS, 0, 0, fpga_vers, 1));
}
static void gp8psk_info(struct dvb_usb_device *d)
{
u8 fpga_vers, fw_vers[6];
if (!gp8psk_get_fw_version(d, fw_vers))
info("FW Version = %i.%02i.%i (0x%x) Build %4i/%02i/%02i",
fw_vers[2], fw_vers[1], fw_vers[0], GP8PSK_FW_VERS(fw_vers),
2000 + fw_vers[5], fw_vers[4], fw_vers[3]);
else
info("failed to get FW version");
if (!gp8psk_get_fpga_version(d, &fpga_vers))
info("FPGA Version = %i", fpga_vers);
else
info("failed to get FPGA version");
}
int gp8psk_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8 *b, int blen)
{ {
struct gp8psk_state *st = d->priv; struct gp8psk_state *st = d->priv;
int ret = 0,try = 0; int ret = 0,try = 0;
@ -93,7 +68,7 @@ int gp8psk_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8
return ret; return ret;
} }
int gp8psk_usb_out_op(struct dvb_usb_device *d, u8 req, u16 value, static int gp8psk_usb_out_op(struct dvb_usb_device *d, u8 req, u16 value,
u16 index, u8 *b, int blen) u16 index, u8 *b, int blen)
{ {
struct gp8psk_state *st = d->priv; struct gp8psk_state *st = d->priv;
@ -124,6 +99,34 @@ int gp8psk_usb_out_op(struct dvb_usb_device *d, u8 req, u16 value,
return ret; return ret;
} }
static int gp8psk_get_fw_version(struct dvb_usb_device *d, u8 *fw_vers)
{
return gp8psk_usb_in_op(d, GET_FW_VERS, 0, 0, fw_vers, 6);
}
static int gp8psk_get_fpga_version(struct dvb_usb_device *d, u8 *fpga_vers)
{
return gp8psk_usb_in_op(d, GET_FPGA_VERS, 0, 0, fpga_vers, 1);
}
static void gp8psk_info(struct dvb_usb_device *d)
{
u8 fpga_vers, fw_vers[6];
if (!gp8psk_get_fw_version(d, fw_vers))
info("FW Version = %i.%02i.%i (0x%x) Build %4i/%02i/%02i",
fw_vers[2], fw_vers[1], fw_vers[0], GP8PSK_FW_VERS(fw_vers),
2000 + fw_vers[5], fw_vers[4], fw_vers[3]);
else
info("failed to get FW version");
if (!gp8psk_get_fpga_version(d, &fpga_vers))
info("FPGA Version = %i", fpga_vers);
else
info("failed to get FPGA version");
}
static int gp8psk_load_bcm4500fw(struct dvb_usb_device *d) static int gp8psk_load_bcm4500fw(struct dvb_usb_device *d)
{ {
int ret; int ret;
@ -226,10 +229,13 @@ static int gp8psk_power_ctrl(struct dvb_usb_device *d, int onoff)
return 0; return 0;
} }
int gp8psk_bcm4500_reload(struct dvb_usb_device *d) static int gp8psk_bcm4500_reload(struct dvb_usb_device *d)
{ {
u8 buf; u8 buf;
int gp_product_id = le16_to_cpu(d->udev->descriptor.idProduct); int gp_product_id = le16_to_cpu(d->udev->descriptor.idProduct);
deb_xfer("reloading firmware\n");
/* Turn off 8psk power */ /* Turn off 8psk power */
if (gp8psk_usb_in_op(d, BOOT_8PSK, 0, 0, &buf, 1)) if (gp8psk_usb_in_op(d, BOOT_8PSK, 0, 0, &buf, 1))
return -EINVAL; return -EINVAL;
@ -248,9 +254,47 @@ static int gp8psk_streaming_ctrl(struct dvb_usb_adapter *adap, int onoff)
return gp8psk_usb_out_op(adap->dev, ARM_TRANSFER, onoff, 0 , NULL, 0); return gp8psk_usb_out_op(adap->dev, ARM_TRANSFER, onoff, 0 , NULL, 0);
} }
/* Callbacks for gp8psk-fe.c */
static int gp8psk_fe_in(void *priv, u8 req, u16 value,
u16 index, u8 *b, int blen)
{
struct dvb_usb_device *d = priv;
return gp8psk_usb_in_op(d, req, value, index, b, blen);
}
static int gp8psk_fe_out(void *priv, u8 req, u16 value,
u16 index, u8 *b, int blen)
{
struct dvb_usb_device *d = priv;
return gp8psk_usb_out_op(d, req, value, index, b, blen);
}
static int gp8psk_fe_reload(void *priv)
{
struct dvb_usb_device *d = priv;
return gp8psk_bcm4500_reload(d);
}
const struct gp8psk_fe_ops gp8psk_fe_ops = {
.in = gp8psk_fe_in,
.out = gp8psk_fe_out,
.reload = gp8psk_fe_reload,
};
static int gp8psk_frontend_attach(struct dvb_usb_adapter *adap) static int gp8psk_frontend_attach(struct dvb_usb_adapter *adap)
{ {
adap->fe_adap[0].fe = gp8psk_fe_attach(adap->dev); struct dvb_usb_device *d = adap->dev;
int id = le16_to_cpu(d->udev->descriptor.idProduct);
int is_rev1;
is_rev1 = (id == USB_PID_GENPIX_8PSK_REV_1_WARM) ? true : false;
adap->fe_adap[0].fe = dvb_attach(gp8psk_fe_attach,
&gp8psk_fe_ops, d, is_rev1);
return 0; return 0;
} }

63
drivers/media/usb/dvb-usb/gp8psk.h
View File

@ -24,58 +24,6 @@ extern int dvb_usb_gp8psk_debug;
#define deb_info(args...) dprintk(dvb_usb_gp8psk_debug,0x01,args) #define deb_info(args...) dprintk(dvb_usb_gp8psk_debug,0x01,args)
#define deb_xfer(args...) dprintk(dvb_usb_gp8psk_debug,0x02,args) #define deb_xfer(args...) dprintk(dvb_usb_gp8psk_debug,0x02,args)
#define deb_rc(args...) dprintk(dvb_usb_gp8psk_debug,0x04,args) #define deb_rc(args...) dprintk(dvb_usb_gp8psk_debug,0x04,args)
#define deb_fe(args...) dprintk(dvb_usb_gp8psk_debug,0x08,args)
/* Twinhan Vendor requests */
#define TH_COMMAND_IN 0xC0
#define TH_COMMAND_OUT 0xC1
/* gp8psk commands */
#define GET_8PSK_CONFIG 0x80 /* in */
#define SET_8PSK_CONFIG 0x81
#define I2C_WRITE 0x83
#define I2C_READ 0x84
#define ARM_TRANSFER 0x85
#define TUNE_8PSK 0x86
#define GET_SIGNAL_STRENGTH 0x87 /* in */
#define LOAD_BCM4500 0x88
#define BOOT_8PSK 0x89 /* in */
#define START_INTERSIL 0x8A /* in */
#define SET_LNB_VOLTAGE 0x8B
#define SET_22KHZ_TONE 0x8C
#define SEND_DISEQC_COMMAND 0x8D
#define SET_DVB_MODE 0x8E
#define SET_DN_SWITCH 0x8F
#define GET_SIGNAL_LOCK 0x90 /* in */
#define GET_FW_VERS 0x92
#define GET_SERIAL_NUMBER 0x93 /* in */
#define USE_EXTRA_VOLT 0x94
#define GET_FPGA_VERS 0x95
#define CW3K_INIT 0x9d
/* PSK_configuration bits */
#define bm8pskStarted 0x01
#define bm8pskFW_Loaded 0x02
#define bmIntersilOn 0x04
#define bmDVBmode 0x08
#define bm22kHz 0x10
#define bmSEL18V 0x20
#define bmDCtuned 0x40
#define bmArmed 0x80
/* Satellite modulation modes */
#define ADV_MOD_DVB_QPSK 0 /* DVB-S QPSK */
#define ADV_MOD_TURBO_QPSK 1 /* Turbo QPSK */
#define ADV_MOD_TURBO_8PSK 2 /* Turbo 8PSK (also used for Trellis 8PSK) */
#define ADV_MOD_TURBO_16QAM 3 /* Turbo 16QAM (also used for Trellis 8PSK) */
#define ADV_MOD_DCII_C_QPSK 4 /* Digicipher II Combo */
#define ADV_MOD_DCII_I_QPSK 5 /* Digicipher II I-stream */
#define ADV_MOD_DCII_Q_QPSK 6 /* Digicipher II Q-stream */
#define ADV_MOD_DCII_C_OQPSK 7 /* Digicipher II offset QPSK */
#define ADV_MOD_DSS_QPSK 8 /* DSS (DIRECTV) QPSK */
#define ADV_MOD_DVB_BPSK 9 /* DVB-S BPSK */
#define GET_USB_SPEED 0x07 #define GET_USB_SPEED 0x07
@ -86,15 +34,4 @@ extern int dvb_usb_gp8psk_debug;
#define PRODUCT_STRING_READ 0x0D #define PRODUCT_STRING_READ 0x0D
#define FW_BCD_VERSION_READ 0x14 #define FW_BCD_VERSION_READ 0x14
/* firmware revision id's */
#define GP8PSK_FW_REV1 0x020604
#define GP8PSK_FW_REV2 0x020704
#define GP8PSK_FW_VERS(_fw_vers) ((_fw_vers)[2]<<0x10 | (_fw_vers)[1]<<0x08 | (_fw_vers)[0])
extern struct dvb_frontend * gp8psk_fe_attach(struct dvb_usb_device *d);
extern int gp8psk_usb_in_op(struct dvb_usb_device *d, u8 req, u16 value, u16 index, u8 *b, int blen);
extern int gp8psk_usb_out_op(struct dvb_usb_device *d, u8 req, u16 value,
u16 index, u8 *b, int blen);
extern int gp8psk_bcm4500_reload(struct dvb_usb_device *d);
#endif #endif