2009-02-24 15:35:15 +00:00
|
|
|
/**
|
|
|
|
|
* Driver for Zarlink zl10036 DVB-S silicon tuner
|
|
|
|
|
*
|
|
|
|
|
* Copyright (C) 2006 Tino Reichardt
|
|
|
|
|
* Copyright (C) 2007-2009 Matthias Schwarzott <zzam@gentoo.de>
|
|
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License Version 2, as
|
|
|
|
|
* published by the Free Software Foundation.
|
|
|
|
|
*
|
|
|
|
|
* 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.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
|
*
|
|
|
|
|
**
|
|
|
|
|
* The data sheet for this tuner can be found at:
|
|
|
|
|
* http://www.mcmilk.de/projects/dvb-card/datasheets/ZL10036.pdf
|
|
|
|
|
*
|
|
|
|
|
* This one is working: (at my Avermedia DVB-S Pro)
|
|
|
|
|
* - zl10036 (40pin, FTA)
|
|
|
|
|
*
|
|
|
|
|
* A driver for zl10038 should be very similar.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#include <linux/module.h>
|
|
|
|
|
#include <linux/dvb/frontend.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 08:04:11 +00:00
|
|
|
#include <linux/slab.h>
|
2009-07-02 19:17:28 +00:00
|
|
|
#include <linux/types.h>
|
2009-02-24 15:35:15 +00:00
|
|
|
|
|
|
|
|
#include "zl10036.h"
|
|
|
|
|
|
|
|
|
|
static int zl10036_debug;
|
|
|
|
|
#define dprintk(level, args...) \
|
|
|
|
|
do { if (zl10036_debug & level) printk(KERN_DEBUG "zl10036: " args); \
|
|
|
|
|
} while (0)
|
|
|
|
|
|
|
|
|
|
#define deb_info(args...) dprintk(0x01, args)
|
|
|
|
|
#define deb_i2c(args...) dprintk(0x02, args)
|
|
|
|
|
|
|
|
|
|
struct zl10036_state {
|
|
|
|
|
struct i2c_adapter *i2c;
|
|
|
|
|
const struct zl10036_config *config;
|
|
|
|
|
u32 frequency;
|
|
|
|
|
u8 br, bf;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/* This driver assumes the tuner is driven by a 10.111MHz Cristal */
|
|
|
|
|
#define _XTAL 10111
|
|
|
|
|
|
|
|
|
|
/* Some of the possible dividers:
|
|
|
|
|
* 64, (write 0x05 to reg), freq step size 158kHz
|
|
|
|
|
* 10, (write 0x0a to reg), freq step size 1.011kHz (used here)
|
|
|
|
|
* 5, (write 0x09 to reg), freq step size 2.022kHz
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
#define _RDIV 10
|
|
|
|
|
#define _RDIV_REG 0x0a
|
|
|
|
|
#define _FR (_XTAL/_RDIV)
|
|
|
|
|
|
|
|
|
|
#define STATUS_POR 0x80 /* Power on Reset */
|
|
|
|
|
#define STATUS_FL 0x40 /* Frequency & Phase Lock */
|
|
|
|
|
|
|
|
|
|
/* read/write for zl10036 and zl10038 */
|
|
|
|
|
|
|
|
|
|
static int zl10036_read_status_reg(struct zl10036_state *state)
|
|
|
|
|
{
|
|
|
|
|
u8 status;
|
|
|
|
|
struct i2c_msg msg[1] = {
|
|
|
|
|
{ .addr = state->config->tuner_address, .flags = I2C_M_RD,
|
|
|
|
|
.buf = &status, .len = sizeof(status) },
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if (i2c_transfer(state->i2c, msg, 1) != 1) {
|
|
|
|
|
printk(KERN_ERR "%s: i2c read failed at addr=%02x\n",
|
|
|
|
|
__func__, state->config->tuner_address);
|
|
|
|
|
return -EIO;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
deb_i2c("R(status): %02x [FL=%d]\n", status,
|
|
|
|
|
(status & STATUS_FL) ? 1 : 0);
|
|
|
|
|
if (status & STATUS_POR)
|
[media] dvb-frontends: don't break long lines
Due to the 80-cols restrictions, and latter due to checkpatch
warnings, several strings were broken into multiple lines. This
is not considered a good practice anymore, as it makes harder
to grep for strings at the source code.
As we're right now fixing other drivers due to KERN_CONT, we need
to be able to identify what printk strings don't end with a "\n".
It is a way easier to detect those if we don't break long lines.
So, join those continuation lines.
The patch was generated via the script below, and manually
adjusted if needed.
</script>
use Text::Tabs;
while (<>) {
if ($next ne "") {
$c=$_;
if ($c =~ /^\s+\"(.*)/) {
$c2=$1;
$next =~ s/\"\n$//;
$n = expand($next);
$funpos = index($n, '(');
$pos = index($c2, '",');
if ($funpos && $pos > 0) {
$s1 = substr $c2, 0, $pos + 2;
$s2 = ' ' x ($funpos + 1) . substr $c2, $pos + 2;
$s2 =~ s/^\s+//;
$s2 = ' ' x ($funpos + 1) . $s2 if ($s2 ne "");
print unexpand("$next$s1\n");
print unexpand("$s2\n") if ($s2 ne "");
} else {
print "$next$c2\n";
}
$next="";
next;
} else {
print $next;
}
$next="";
} else {
if (m/\"$/) {
if (!m/\\n\"$/) {
$next=$_;
next;
}
}
}
print $_;
}
</script>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
2016-10-18 19:44:22 +00:00
|
|
|
deb_info("%s: Power-On-Reset bit enabled - need to initialize the tuner\n",
|
|
|
|
|
__func__);
|
2009-02-24 15:35:15 +00:00
|
|
|
|
|
|
|
|
return status;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int zl10036_write(struct zl10036_state *state, u8 buf[], u8 count)
|
|
|
|
|
{
|
|
|
|
|
struct i2c_msg msg[1] = {
|
|
|
|
|
{ .addr = state->config->tuner_address, .flags = 0,
|
|
|
|
|
.buf = buf, .len = count },
|
|
|
|
|
};
|
|
|
|
|
u8 reg = 0;
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
if (zl10036_debug & 0x02) {
|
|
|
|
|
/* every 8bit-value satisifes this!
|
|
|
|
|
* so only check for debug log */
|
|
|
|
|
if ((buf[0] & 0x80) == 0x00)
|
|
|
|
|
reg = 2;
|
|
|
|
|
else if ((buf[0] & 0xc0) == 0x80)
|
|
|
|
|
reg = 4;
|
|
|
|
|
else if ((buf[0] & 0xf0) == 0xc0)
|
|
|
|
|
reg = 6;
|
|
|
|
|
else if ((buf[0] & 0xf0) == 0xd0)
|
|
|
|
|
reg = 8;
|
|
|
|
|
else if ((buf[0] & 0xf0) == 0xe0)
|
|
|
|
|
reg = 10;
|
|
|
|
|
else if ((buf[0] & 0xf0) == 0xf0)
|
|
|
|
|
reg = 12;
|
|
|
|
|
|
|
|
|
|
deb_i2c("W(%d):", reg);
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
for (i = 0; i < count; i++)
|
|
|
|
|
printk(KERN_CONT " %02x", buf[i]);
|
|
|
|
|
printk(KERN_CONT "\n");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = i2c_transfer(state->i2c, msg, 1);
|
|
|
|
|
if (ret != 1) {
|
|
|
|
|
printk(KERN_ERR "%s: i2c error, ret=%d\n", __func__, ret);
|
|
|
|
|
return -EIO;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int zl10036_sleep(struct dvb_frontend *fe)
|
|
|
|
|
{
|
|
|
|
|
struct zl10036_state *state = fe->tuner_priv;
|
|
|
|
|
u8 buf[] = { 0xf0, 0x80 }; /* regs 12/13 */
|
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
|
|
deb_info("%s\n", __func__);
|
|
|
|
|
|
|
|
|
|
if (fe->ops.i2c_gate_ctrl)
|
|
|
|
|
fe->ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */
|
|
|
|
|
|
|
|
|
|
ret = zl10036_write(state, buf, sizeof(buf));
|
|
|
|
|
|
|
|
|
|
if (fe->ops.i2c_gate_ctrl)
|
|
|
|
|
fe->ops.i2c_gate_ctrl(fe, 0); /* close i2c_gate */
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* register map of the ZL10036/ZL10038
|
|
|
|
|
*
|
|
|
|
|
* reg[default] content
|
|
|
|
|
* 2[0x00]: 0 | N14 | N13 | N12 | N11 | N10 | N9 | N8
|
|
|
|
|
* 3[0x00]: N7 | N6 | N5 | N4 | N3 | N2 | N1 | N0
|
|
|
|
|
* 4[0x80]: 1 | 0 | RFG | BA1 | BA0 | BG1 | BG0 | LEN
|
|
|
|
|
* 5[0x00]: P0 | C1 | C0 | R4 | R3 | R2 | R1 | R0
|
|
|
|
|
* 6[0xc0]: 1 | 1 | 0 | 0 | RSD | 0 | 0 | 0
|
|
|
|
|
* 7[0x20]: P1 | BF6 | BF5 | BF4 | BF3 | BF2 | BF1 | 0
|
|
|
|
|
* 8[0xdb]: 1 | 1 | 0 | 1 | 0 | CC | 1 | 1
|
|
|
|
|
* 9[0x30]: VSD | V2 | V1 | V0 | S3 | S2 | S1 | S0
|
|
|
|
|
* 10[0xe1]: 1 | 1 | 1 | 0 | 0 | LS2 | LS1 | LS0
|
|
|
|
|
* 11[0xf5]: WS | WH2 | WH1 | WH0 | WL2 | WL1 | WL0 | WRE
|
|
|
|
|
* 12[0xf0]: 1 | 1 | 1 | 1 | 0 | 0 | 0 | 0
|
|
|
|
|
* 13[0x28]: PD | BR4 | BR3 | BR2 | BR1 | BR0 | CLR | TL
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
static int zl10036_set_frequency(struct zl10036_state *state, u32 frequency)
|
|
|
|
|
{
|
|
|
|
|
u8 buf[2];
|
|
|
|
|
u32 div, foffset;
|
|
|
|
|
|
|
|
|
|
div = (frequency + _FR/2) / _FR;
|
|
|
|
|
state->frequency = div * _FR;
|
|
|
|
|
|
|
|
|
|
foffset = frequency - state->frequency;
|
|
|
|
|
|
|
|
|
|
buf[0] = (div >> 8) & 0x7f;
|
|
|
|
|
buf[1] = (div >> 0) & 0xff;
|
|
|
|
|
|
|
|
|
|
deb_info("%s: ftodo=%u fpriv=%u ferr=%d div=%u\n", __func__,
|
|
|
|
|
frequency, state->frequency, foffset, div);
|
|
|
|
|
|
|
|
|
|
return zl10036_write(state, buf, sizeof(buf));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int zl10036_set_bandwidth(struct zl10036_state *state, u32 fbw)
|
|
|
|
|
{
|
|
|
|
|
/* fbw is measured in kHz */
|
|
|
|
|
u8 br, bf;
|
|
|
|
|
int ret;
|
|
|
|
|
u8 buf_bf[] = {
|
|
|
|
|
0xc0, 0x00, /* 6/7: rsd=0 bf=0 */
|
|
|
|
|
};
|
|
|
|
|
u8 buf_br[] = {
|
|
|
|
|
0xf0, 0x00, /* 12/13: br=0xa clr=0 tl=0*/
|
|
|
|
|
};
|
|
|
|
|
u8 zl10036_rsd_off[] = { 0xc8 }; /* set RSD=1 */
|
|
|
|
|
|
|
|
|
|
/* ensure correct values */
|
|
|
|
|
if (fbw > 35000)
|
|
|
|
|
fbw = 35000;
|
|
|
|
|
if (fbw < 8000)
|
|
|
|
|
fbw = 8000;
|
|
|
|
|
|
|
|
|
|
#define _BR_MAXIMUM (_XTAL/575) /* _XTAL / 575kHz = 17 */
|
|
|
|
|
|
|
|
|
|
/* <= 28,82 MHz */
|
|
|
|
|
if (fbw <= 28820) {
|
|
|
|
|
br = _BR_MAXIMUM;
|
|
|
|
|
} else {
|
|
|
|
|
/**
|
|
|
|
|
* f(bw)=34,6MHz f(xtal)=10.111MHz
|
|
|
|
|
* br = (10111/34600) * 63 * 1/K = 14;
|
|
|
|
|
*/
|
|
|
|
|
br = ((_XTAL * 21 * 1000) / (fbw * 419));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* ensure correct values */
|
|
|
|
|
if (br < 4)
|
|
|
|
|
br = 4;
|
|
|
|
|
if (br > _BR_MAXIMUM)
|
|
|
|
|
br = _BR_MAXIMUM;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* k = 1.257
|
|
|
|
|
* bf = fbw/_XTAL * br * k - 1 */
|
|
|
|
|
|
|
|
|
|
bf = (fbw * br * 1257) / (_XTAL * 1000) - 1;
|
|
|
|
|
|
|
|
|
|
/* ensure correct values */
|
|
|
|
|
if (bf > 62)
|
|
|
|
|
bf = 62;
|
|
|
|
|
|
|
|
|
|
buf_bf[1] = (bf << 1) & 0x7e;
|
|
|
|
|
buf_br[1] = (br << 2) & 0x7c;
|
|
|
|
|
deb_info("%s: BW=%d br=%u bf=%u\n", __func__, fbw, br, bf);
|
|
|
|
|
|
|
|
|
|
if (br != state->br) {
|
|
|
|
|
ret = zl10036_write(state, buf_br, sizeof(buf_br));
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (bf != state->bf) {
|
|
|
|
|
ret = zl10036_write(state, buf_bf, sizeof(buf_bf));
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
/* time = br/(32* fxtal) */
|
|
|
|
|
/* minimal sleep time to be calculated
|
|
|
|
|
* maximum br is 63 -> max time = 2 /10 MHz = 2e-7 */
|
|
|
|
|
msleep(1);
|
|
|
|
|
|
|
|
|
|
ret = zl10036_write(state, zl10036_rsd_off,
|
|
|
|
|
sizeof(zl10036_rsd_off));
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
state->br = br;
|
|
|
|
|
state->bf = bf;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int zl10036_set_gain_params(struct zl10036_state *state,
|
|
|
|
|
int c)
|
|
|
|
|
{
|
|
|
|
|
u8 buf[2];
|
|
|
|
|
u8 rfg, ba, bg;
|
|
|
|
|
|
|
|
|
|
/* default values */
|
|
|
|
|
rfg = 0; /* enable when using an lna */
|
|
|
|
|
ba = 1;
|
|
|
|
|
bg = 1;
|
|
|
|
|
|
|
|
|
|
/* reg 4 */
|
|
|
|
|
buf[0] = 0x80 | ((rfg << 5) & 0x20)
|
|
|
|
|
| ((ba << 3) & 0x18) | ((bg << 1) & 0x06);
|
|
|
|
|
|
|
|
|
|
if (!state->config->rf_loop_enable)
|
|
|
|
|
buf[0] |= 0x01;
|
|
|
|
|
|
|
|
|
|
/* P0=0 */
|
|
|
|
|
buf[1] = _RDIV_REG | ((c << 5) & 0x60);
|
|
|
|
|
|
|
|
|
|
deb_info("%s: c=%u rfg=%u ba=%u bg=%u\n", __func__, c, rfg, ba, bg);
|
|
|
|
|
return zl10036_write(state, buf, sizeof(buf));
|
|
|
|
|
}
|
|
|
|
|
|
2011-12-24 15:24:33 +00:00
|
|
|
static int zl10036_set_params(struct dvb_frontend *fe)
|
2009-02-24 15:35:15 +00:00
|
|
|
{
|
2011-12-23 09:56:47 +00:00
|
|
|
struct dtv_frontend_properties *p = &fe->dtv_property_cache;
|
2009-02-24 15:35:15 +00:00
|
|
|
struct zl10036_state *state = fe->tuner_priv;
|
|
|
|
|
int ret = 0;
|
2011-12-23 09:56:47 +00:00
|
|
|
u32 frequency = p->frequency;
|
2009-02-24 15:35:15 +00:00
|
|
|
u32 fbw;
|
|
|
|
|
int i;
|
|
|
|
|
u8 c;
|
|
|
|
|
|
|
|
|
|
/* ensure correct values
|
|
|
|
|
* maybe redundant as core already checks this */
|
|
|
|
|
if ((frequency < fe->ops.info.frequency_min)
|
|
|
|
|
|| (frequency > fe->ops.info.frequency_max))
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* alpha = 1.35 for dvb-s
|
|
|
|
|
* fBW = (alpha*symbolrate)/(2*0.8)
|
|
|
|
|
* 1.35 / (2*0.8) = 27 / 32
|
|
|
|
|
*/
|
2011-12-23 09:56:47 +00:00
|
|
|
fbw = (27 * p->symbol_rate) / 32;
|
2009-02-24 15:35:15 +00:00
|
|
|
|
|
|
|
|
/* scale to kHz */
|
|
|
|
|
fbw /= 1000;
|
|
|
|
|
|
|
|
|
|
/* Add safe margin of 3MHz */
|
|
|
|
|
fbw += 3000;
|
|
|
|
|
|
|
|
|
|
/* setting the charge pump - guessed values */
|
|
|
|
|
if (frequency < 950000)
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
else if (frequency < 1250000)
|
|
|
|
|
c = 0;
|
|
|
|
|
else if (frequency < 1750000)
|
|
|
|
|
c = 1;
|
|
|
|
|
else if (frequency < 2175000)
|
|
|
|
|
c = 2;
|
|
|
|
|
else
|
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
|
|
if (fe->ops.i2c_gate_ctrl)
|
|
|
|
|
fe->ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */
|
|
|
|
|
|
|
|
|
|
ret = zl10036_set_gain_params(state, c);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
goto error;
|
|
|
|
|
|
2011-12-23 09:56:47 +00:00
|
|
|
ret = zl10036_set_frequency(state, p->frequency);
|
2009-02-24 15:35:15 +00:00
|
|
|
if (ret < 0)
|
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
|
|
ret = zl10036_set_bandwidth(state, fbw);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
|
|
/* wait for tuner lock - no idea if this is really needed */
|
|
|
|
|
for (i = 0; i < 20; i++) {
|
|
|
|
|
ret = zl10036_read_status_reg(state);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
|
|
/* check Frequency & Phase Lock Bit */
|
|
|
|
|
if (ret & STATUS_FL)
|
|
|
|
|
break;
|
|
|
|
|
|
|
|
|
|
msleep(10);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
error:
|
|
|
|
|
if (fe->ops.i2c_gate_ctrl)
|
|
|
|
|
fe->ops.i2c_gate_ctrl(fe, 0); /* close i2c_gate */
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int zl10036_get_frequency(struct dvb_frontend *fe, u32 *frequency)
|
|
|
|
|
{
|
|
|
|
|
struct zl10036_state *state = fe->tuner_priv;
|
|
|
|
|
|
|
|
|
|
*frequency = state->frequency;
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int zl10036_init_regs(struct zl10036_state *state)
|
|
|
|
|
{
|
|
|
|
|
int ret;
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
/* could also be one block from reg 2 to 13 and additional 10/11 */
|
|
|
|
|
u8 zl10036_init_tab[][2] = {
|
|
|
|
|
{ 0x04, 0x00 }, /* 2/3: div=0x400 - arbitrary value */
|
|
|
|
|
{ 0x8b, _RDIV_REG }, /* 4/5: rfg=0 ba=1 bg=1 len=? */
|
|
|
|
|
/* p0=0 c=0 r=_RDIV_REG */
|
|
|
|
|
{ 0xc0, 0x20 }, /* 6/7: rsd=0 bf=0x10 */
|
|
|
|
|
{ 0xd3, 0x40 }, /* 8/9: from datasheet */
|
|
|
|
|
{ 0xe3, 0x5b }, /* 10/11: lock window level */
|
|
|
|
|
{ 0xf0, 0x28 }, /* 12/13: br=0xa clr=0 tl=0*/
|
|
|
|
|
{ 0xe3, 0xf9 }, /* 10/11: unlock window level */
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
/* invalid values to trigger writing */
|
|
|
|
|
state->br = 0xff;
|
|
|
|
|
state->bf = 0xff;
|
|
|
|
|
|
|
|
|
|
if (!state->config->rf_loop_enable)
|
2009-12-28 17:48:49 +00:00
|
|
|
zl10036_init_tab[1][0] |= 0x01;
|
2009-02-24 15:35:15 +00:00
|
|
|
|
|
|
|
|
deb_info("%s\n", __func__);
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < ARRAY_SIZE(zl10036_init_tab); i++) {
|
|
|
|
|
ret = zl10036_write(state, zl10036_init_tab[i], 2);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int zl10036_init(struct dvb_frontend *fe)
|
|
|
|
|
{
|
|
|
|
|
struct zl10036_state *state = fe->tuner_priv;
|
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
|
|
if (fe->ops.i2c_gate_ctrl)
|
|
|
|
|
fe->ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */
|
|
|
|
|
|
|
|
|
|
ret = zl10036_read_status_reg(state);
|
|
|
|
|
if (ret < 0)
|
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
|
|
/* Only init if Power-on-Reset bit is set? */
|
|
|
|
|
ret = zl10036_init_regs(state);
|
|
|
|
|
|
|
|
|
|
if (fe->ops.i2c_gate_ctrl)
|
|
|
|
|
fe->ops.i2c_gate_ctrl(fe, 0); /* close i2c_gate */
|
|
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2016-09-11 14:44:12 +00:00
|
|
|
static const struct dvb_tuner_ops zl10036_tuner_ops = {
|
2009-02-24 15:35:15 +00:00
|
|
|
.info = {
|
|
|
|
|
.name = "Zarlink ZL10036",
|
|
|
|
|
.frequency_min = 950000,
|
|
|
|
|
.frequency_max = 2175000
|
|
|
|
|
},
|
|
|
|
|
.init = zl10036_init,
|
2016-08-09 21:32:26 +00:00
|
|
|
.release = dvb_tuner_simple_release,
|
2009-02-24 15:35:15 +00:00
|
|
|
.sleep = zl10036_sleep,
|
|
|
|
|
.set_params = zl10036_set_params,
|
|
|
|
|
.get_frequency = zl10036_get_frequency,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
struct dvb_frontend *zl10036_attach(struct dvb_frontend *fe,
|
|
|
|
|
const struct zl10036_config *config,
|
|
|
|
|
struct i2c_adapter *i2c)
|
|
|
|
|
{
|
[media] Zarlink zl10036 DVB-S: Fix mem leak in zl10036_attach
On Thu, 17 Feb 2011, Matthias Schwarzott wrote:
> On Sunday 06 February 2011, Jesper Juhl wrote:
> > If the memory allocation to 'state' succeeds but we jump to the 'error'
> > label before 'state' is assigned to fe->tuner_priv, then the call to
> > 'zl10036_release(fe)' at the 'error:' label will not free 'state', but
> > only what was previously assigned to 'tuner_priv', thus leaking the memory
> > allocated to 'state'.
> > There are may ways to fix this, including assigning the allocated memory
> > directly to 'fe->tuner_priv', but I did not go for that since the
> > additional pointer derefs are more expensive than the local variable, so I
> > just added a 'kfree(state)' call. I guess the call to 'zl10036_release'
> > might not even be needed in this case, but I wasn't sure, so I left it in.
> >
> Yeah, that call to zl10036_release can be completely eleminated.
> Another thing is: jumping to the error label only makes sense when memory was
> already allocated. So the jump in line 471 can be replaced by "return NULL",
> as the other error handling before allocation:
> if (NULL == config) {
> printk(KERN_ERR "%s: no config specified", __func__);
> goto error;
> }
>
> I suggest to improve the patch to clean the code up when changing that.
>
> But I am fine with commiting this patch also if you do not want to change it.
>
Thank you for your feedback. It makes a lot of sense.
Changing it is not a problem :)
How about the updated patch below?
If the memory allocation to 'state' succeeds but we jump to the 'error'
label before 'state' is assigned to fe->tuner_priv, then the call to
'zl10036_release(fe)' at the 'error:' label will not free 'state', but
only what was previously assigned to 'tuner_priv', thus leaking the memory
allocated to 'state'.
This patch fixes the leak and also does not jump to 'error:' before mem
has been allocated but instead just returns. Also some small style
cleanups.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-02-17 20:33:56 +00:00
|
|
|
struct zl10036_state *state;
|
2009-02-24 15:35:15 +00:00
|
|
|
int ret;
|
|
|
|
|
|
[media] Zarlink zl10036 DVB-S: Fix mem leak in zl10036_attach
On Thu, 17 Feb 2011, Matthias Schwarzott wrote:
> On Sunday 06 February 2011, Jesper Juhl wrote:
> > If the memory allocation to 'state' succeeds but we jump to the 'error'
> > label before 'state' is assigned to fe->tuner_priv, then the call to
> > 'zl10036_release(fe)' at the 'error:' label will not free 'state', but
> > only what was previously assigned to 'tuner_priv', thus leaking the memory
> > allocated to 'state'.
> > There are may ways to fix this, including assigning the allocated memory
> > directly to 'fe->tuner_priv', but I did not go for that since the
> > additional pointer derefs are more expensive than the local variable, so I
> > just added a 'kfree(state)' call. I guess the call to 'zl10036_release'
> > might not even be needed in this case, but I wasn't sure, so I left it in.
> >
> Yeah, that call to zl10036_release can be completely eleminated.
> Another thing is: jumping to the error label only makes sense when memory was
> already allocated. So the jump in line 471 can be replaced by "return NULL",
> as the other error handling before allocation:
> if (NULL == config) {
> printk(KERN_ERR "%s: no config specified", __func__);
> goto error;
> }
>
> I suggest to improve the patch to clean the code up when changing that.
>
> But I am fine with commiting this patch also if you do not want to change it.
>
Thank you for your feedback. It makes a lot of sense.
Changing it is not a problem :)
How about the updated patch below?
If the memory allocation to 'state' succeeds but we jump to the 'error'
label before 'state' is assigned to fe->tuner_priv, then the call to
'zl10036_release(fe)' at the 'error:' label will not free 'state', but
only what was previously assigned to 'tuner_priv', thus leaking the memory
allocated to 'state'.
This patch fixes the leak and also does not jump to 'error:' before mem
has been allocated but instead just returns. Also some small style
cleanups.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-02-17 20:33:56 +00:00
|
|
|
if (!config) {
|
2009-02-24 15:35:15 +00:00
|
|
|
printk(KERN_ERR "%s: no config specified", __func__);
|
[media] Zarlink zl10036 DVB-S: Fix mem leak in zl10036_attach
On Thu, 17 Feb 2011, Matthias Schwarzott wrote:
> On Sunday 06 February 2011, Jesper Juhl wrote:
> > If the memory allocation to 'state' succeeds but we jump to the 'error'
> > label before 'state' is assigned to fe->tuner_priv, then the call to
> > 'zl10036_release(fe)' at the 'error:' label will not free 'state', but
> > only what was previously assigned to 'tuner_priv', thus leaking the memory
> > allocated to 'state'.
> > There are may ways to fix this, including assigning the allocated memory
> > directly to 'fe->tuner_priv', but I did not go for that since the
> > additional pointer derefs are more expensive than the local variable, so I
> > just added a 'kfree(state)' call. I guess the call to 'zl10036_release'
> > might not even be needed in this case, but I wasn't sure, so I left it in.
> >
> Yeah, that call to zl10036_release can be completely eleminated.
> Another thing is: jumping to the error label only makes sense when memory was
> already allocated. So the jump in line 471 can be replaced by "return NULL",
> as the other error handling before allocation:
> if (NULL == config) {
> printk(KERN_ERR "%s: no config specified", __func__);
> goto error;
> }
>
> I suggest to improve the patch to clean the code up when changing that.
>
> But I am fine with commiting this patch also if you do not want to change it.
>
Thank you for your feedback. It makes a lot of sense.
Changing it is not a problem :)
How about the updated patch below?
If the memory allocation to 'state' succeeds but we jump to the 'error'
label before 'state' is assigned to fe->tuner_priv, then the call to
'zl10036_release(fe)' at the 'error:' label will not free 'state', but
only what was previously assigned to 'tuner_priv', thus leaking the memory
allocated to 'state'.
This patch fixes the leak and also does not jump to 'error:' before mem
has been allocated but instead just returns. Also some small style
cleanups.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-02-17 20:33:56 +00:00
|
|
|
return NULL;
|
2009-02-24 15:35:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
state = kzalloc(sizeof(struct zl10036_state), GFP_KERNEL);
|
[media] Zarlink zl10036 DVB-S: Fix mem leak in zl10036_attach
On Thu, 17 Feb 2011, Matthias Schwarzott wrote:
> On Sunday 06 February 2011, Jesper Juhl wrote:
> > If the memory allocation to 'state' succeeds but we jump to the 'error'
> > label before 'state' is assigned to fe->tuner_priv, then the call to
> > 'zl10036_release(fe)' at the 'error:' label will not free 'state', but
> > only what was previously assigned to 'tuner_priv', thus leaking the memory
> > allocated to 'state'.
> > There are may ways to fix this, including assigning the allocated memory
> > directly to 'fe->tuner_priv', but I did not go for that since the
> > additional pointer derefs are more expensive than the local variable, so I
> > just added a 'kfree(state)' call. I guess the call to 'zl10036_release'
> > might not even be needed in this case, but I wasn't sure, so I left it in.
> >
> Yeah, that call to zl10036_release can be completely eleminated.
> Another thing is: jumping to the error label only makes sense when memory was
> already allocated. So the jump in line 471 can be replaced by "return NULL",
> as the other error handling before allocation:
> if (NULL == config) {
> printk(KERN_ERR "%s: no config specified", __func__);
> goto error;
> }
>
> I suggest to improve the patch to clean the code up when changing that.
>
> But I am fine with commiting this patch also if you do not want to change it.
>
Thank you for your feedback. It makes a lot of sense.
Changing it is not a problem :)
How about the updated patch below?
If the memory allocation to 'state' succeeds but we jump to the 'error'
label before 'state' is assigned to fe->tuner_priv, then the call to
'zl10036_release(fe)' at the 'error:' label will not free 'state', but
only what was previously assigned to 'tuner_priv', thus leaking the memory
allocated to 'state'.
This patch fixes the leak and also does not jump to 'error:' before mem
has been allocated but instead just returns. Also some small style
cleanups.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-02-17 20:33:56 +00:00
|
|
|
if (!state)
|
2009-02-24 15:35:15 +00:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
state->config = config;
|
|
|
|
|
state->i2c = i2c;
|
|
|
|
|
|
|
|
|
|
if (fe->ops.i2c_gate_ctrl)
|
|
|
|
|
fe->ops.i2c_gate_ctrl(fe, 1); /* open i2c_gate */
|
|
|
|
|
|
|
|
|
|
ret = zl10036_read_status_reg(state);
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
printk(KERN_ERR "%s: No zl10036 found\n", __func__);
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ret = zl10036_init_regs(state);
|
|
|
|
|
if (ret < 0) {
|
|
|
|
|
printk(KERN_ERR "%s: tuner initialization failed\n",
|
|
|
|
|
__func__);
|
|
|
|
|
goto error;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (fe->ops.i2c_gate_ctrl)
|
|
|
|
|
fe->ops.i2c_gate_ctrl(fe, 0); /* close i2c_gate */
|
|
|
|
|
|
|
|
|
|
fe->tuner_priv = state;
|
|
|
|
|
|
|
|
|
|
memcpy(&fe->ops.tuner_ops, &zl10036_tuner_ops,
|
|
|
|
|
sizeof(struct dvb_tuner_ops));
|
|
|
|
|
printk(KERN_INFO "%s: tuner initialization (%s addr=0x%02x) ok\n",
|
|
|
|
|
__func__, fe->ops.tuner_ops.info.name, config->tuner_address);
|
|
|
|
|
|
|
|
|
|
return fe;
|
|
|
|
|
|
|
|
|
|
error:
|
[media] Zarlink zl10036 DVB-S: Fix mem leak in zl10036_attach
On Thu, 17 Feb 2011, Matthias Schwarzott wrote:
> On Sunday 06 February 2011, Jesper Juhl wrote:
> > If the memory allocation to 'state' succeeds but we jump to the 'error'
> > label before 'state' is assigned to fe->tuner_priv, then the call to
> > 'zl10036_release(fe)' at the 'error:' label will not free 'state', but
> > only what was previously assigned to 'tuner_priv', thus leaking the memory
> > allocated to 'state'.
> > There are may ways to fix this, including assigning the allocated memory
> > directly to 'fe->tuner_priv', but I did not go for that since the
> > additional pointer derefs are more expensive than the local variable, so I
> > just added a 'kfree(state)' call. I guess the call to 'zl10036_release'
> > might not even be needed in this case, but I wasn't sure, so I left it in.
> >
> Yeah, that call to zl10036_release can be completely eleminated.
> Another thing is: jumping to the error label only makes sense when memory was
> already allocated. So the jump in line 471 can be replaced by "return NULL",
> as the other error handling before allocation:
> if (NULL == config) {
> printk(KERN_ERR "%s: no config specified", __func__);
> goto error;
> }
>
> I suggest to improve the patch to clean the code up when changing that.
>
> But I am fine with commiting this patch also if you do not want to change it.
>
Thank you for your feedback. It makes a lot of sense.
Changing it is not a problem :)
How about the updated patch below?
If the memory allocation to 'state' succeeds but we jump to the 'error'
label before 'state' is assigned to fe->tuner_priv, then the call to
'zl10036_release(fe)' at the 'error:' label will not free 'state', but
only what was previously assigned to 'tuner_priv', thus leaking the memory
allocated to 'state'.
This patch fixes the leak and also does not jump to 'error:' before mem
has been allocated but instead just returns. Also some small style
cleanups.
Signed-off-by: Jesper Juhl <jj@chaosbits.net>
Signed-off-by: Matthias Schwarzott <zzam@gentoo.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2011-02-17 20:33:56 +00:00
|
|
|
kfree(state);
|
2009-02-24 15:35:15 +00:00
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
EXPORT_SYMBOL(zl10036_attach);
|
|
|
|
|
|
|
|
|
|
module_param_named(debug, zl10036_debug, int, 0644);
|
|
|
|
|
MODULE_PARM_DESC(debug, "Turn on/off frontend debugging (default:off).");
|
|
|
|
|
MODULE_DESCRIPTION("DVB ZL10036 driver");
|
|
|
|
|
MODULE_AUTHOR("Tino Reichardt");
|
|
|
|
|
MODULE_AUTHOR("Matthias Schwarzott");
|
|
|
|
|
MODULE_LICENSE("GPL");
|
