Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC ADC 100M 14b 4cha
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
FMC ADC 100M 14b 4cha
Commits
4c2b3167
Commit
4c2b3167
authored
Aug 13, 2020
by
Federico Vaga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
drv: fix range-set/calibration synchronization
Signed-off-by:
Federico Vaga
<
federico.vaga@cern.ch
>
parent
cc51948a
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
17 deletions
+33
-17
fa-calibration.c
kernel/fa-calibration.c
+22
-14
fa-core.c
kernel/fa-core.c
+2
-0
fa-zio-drv.c
kernel/fa-zio-drv.c
+9
-3
No files found.
kernel/fa-calibration.c
View file @
4c2b3167
...
...
@@ -130,19 +130,22 @@ static int fa_calib_dac_gain_fix(int range, uint32_t gain_c,
return
gain_c
-
error
;
}
/**
* Calibrate a ADC channel
* @fa ADC instance
* @chan channel number
* @temperature temperature
*
* You must hold &fa->zdev->cset->lock while calling this function
*/
void
fa_calib_adc_config_chan
(
struct
fa_dev
*
fa
,
unsigned
int
chan
,
int32_t
temperature
)
{
struct
fa_calib_stanza
*
cal
;
int
range
;
int
range
=
fa
->
range
[
chan
]
;
struct
fa_calib_stanza
*
cal
=
&
fa
->
calib
.
dac
[
range
]
;
int
gain
;
int
err
;
spin_lock
(
&
fa
->
zdev
->
cset
->
lock
);
range
=
fa
->
range
[
chan
];
spin_unlock
(
&
fa
->
zdev
->
cset
->
lock
);
cal
=
&
fa
->
calib
.
dac
[
range
];
if
(
temperature
==
0xFFFFFFFF
)
temperature
=
fa_temperature_read
(
fa
);
if
(
unlikely
((
fa
->
flags
&
FA_DEV_F_PATTERN_DATA
)))
...
...
@@ -219,21 +222,24 @@ static int fa_dac_offset_get(struct fa_dev *fa, unsigned int chan)
return
off_uv
;
}
/**
* Calibrate a DAC channel
* @fa ADC instance
* @chan channel number
* @temperature temperature
*
* You must hold &fa->zdev->cset->lock while calling this function
*/
int
fa_calib_dac_config_chan
(
struct
fa_dev
*
fa
,
unsigned
int
chan
,
int32_t
temperature
)
{
int32_t
off_uv
=
fa_dac_offset_get
(
fa
,
chan
);
int32_t
off_uv_raw
=
fa_dac_offset_raw_get
(
off_uv
);
struct
fa_calib_stanza
*
cal
;
int
range
;
int
range
=
fa
->
range
[
chan
]
;
struct
fa_calib_stanza
*
cal
=
&
fa
->
calib
.
dac
[
range
]
;
int
gain
;
int
hwval
;
spin_lock
(
&
fa
->
zdev
->
cset
->
lock
);
range
=
fa
->
range
[
chan
];
spin_unlock
(
&
fa
->
zdev
->
cset
->
lock
);
cal
=
&
fa
->
calib
.
dac
[
range
];
if
(
temperature
==
0xFFFFFFFF
)
temperature
=
fa_temperature_read
(
fa
);
...
...
@@ -258,10 +264,12 @@ void fa_calib_config(struct fa_dev *fa)
int
i
;
temperature
=
fa_temperature_read
(
fa
);
spin_lock
(
&
fa
->
zdev
->
cset
->
lock
);
for
(
i
=
0
;
i
<
FA100M14B4C_NCHAN
;
++
i
)
{
fa_calib_adc_config_chan
(
fa
,
i
,
temperature
);
fa_calib_dac_config_chan
(
fa
,
i
,
temperature
);
}
spin_unlock
(
&
fa
->
zdev
->
cset
->
lock
);
}
/**
* Periodically update gain calibration values
...
...
kernel/fa-core.c
View file @
4c2b3167
...
...
@@ -162,11 +162,13 @@ void zfad_reset_offset(struct fa_dev *fa)
{
int
i
;
spin_lock
(
&
fa
->
zdev
->
cset
->
lock
);
for
(
i
=
0
;
i
<
FA100M14B4C_NCHAN
;
++
i
)
{
fa
->
user_offset
[
i
]
=
0
;
fa
->
zero_offset
[
i
]
=
0
;
fa_calib_dac_config_chan
(
fa
,
i
,
~
0
);
}
spin_unlock
(
&
fa
->
zdev
->
cset
->
lock
);
}
/*
...
...
kernel/fa-zio-drv.c
View file @
4c2b3167
...
...
@@ -213,8 +213,8 @@ static int zfad_conf_set(struct device *dev, struct zio_attribute *zattr,
return
-
EINVAL
;
spin_lock
(
&
fa
->
zdev
->
cset
->
lock
);
fa
->
zero_offset
[
i
]
=
usr_val
;
spin_unlock
(
&
fa
->
zdev
->
cset
->
lock
);
fa_calib_dac_config_chan
(
fa
,
i
,
~
0
);
spin_unlock
(
&
fa
->
zdev
->
cset
->
lock
);
return
0
;
case
ZFA_CHx_SAT
:
/* TODO when TLV */
...
...
@@ -248,14 +248,16 @@ static int zfad_conf_set(struct device *dev, struct zio_attribute *zattr,
return
-
EINVAL
;
spin_lock
(
&
fa
->
zdev
->
cset
->
lock
);
fa
->
user_offset
[
chan
->
index
]
=
usr_val
;
err
=
fa_calib_dac_config_chan
(
fa
,
i
,
~
0
);
spin_unlock
(
&
fa
->
zdev
->
cset
->
lock
);
return
fa_calib_dac_config_chan
(
fa
,
i
,
~
0
)
;
return
err
;
case
ZFA_CHx_OFFSET
:
chan
=
to_zio_chan
(
dev
);
spin_lock
(
&
fa
->
zdev
->
cset
->
lock
);
fa
->
user_offset
[
chan
->
index
]
=
usr_val
;
err
=
fa_calib_dac_config_chan
(
fa
,
chan
->
index
,
~
0
);
spin_unlock
(
&
fa
->
zdev
->
cset
->
lock
);
return
fa_calib_dac_config_chan
(
fa
,
chan
->
index
,
~
0
)
;
return
err
;
case
ZFA_CTL_DAC_CLR_N
:
zfad_reset_offset
(
fa
);
return
0
;
...
...
@@ -295,8 +297,10 @@ static int zfad_conf_set(struct device *dev, struct zio_attribute *zattr,
err
=
fa_adc_range_set
(
fa
,
&
to_zio_cset
(
dev
)
->
chan
[
i
],
range
);
if
(
err
)
return
err
;
spin_lock
(
&
fa
->
zdev
->
cset
->
lock
);
fa_calib_adc_config_chan
(
fa
,
i
,
~
0
);
fa_calib_dac_config_chan
(
fa
,
i
,
~
0
);
spin_unlock
(
&
fa
->
zdev
->
cset
->
lock
);
return
0
;
case
ZFA_CHx_CTL_RANGE
:
...
...
@@ -306,8 +310,10 @@ static int zfad_conf_set(struct device *dev, struct zio_attribute *zattr,
err
=
fa_adc_range_set
(
fa
,
&
to_zio_cset
(
dev
)
->
chan
[
i
],
range
);
if
(
err
)
return
err
;
spin_lock
(
&
fa
->
zdev
->
cset
->
lock
);
fa_calib_adc_config_chan
(
fa
,
i
,
~
0
);
fa_calib_dac_config_chan
(
fa
,
i
,
~
0
);
spin_unlock
(
&
fa
->
zdev
->
cset
->
lock
);
return
0
;
case
ZFA_UTC_COARSE
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment