Skip to content

F
FMC DEL 1ns 4cha - Software
Commit a8d583ce authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

added moduleparameters, made order in printks

parent da567812
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 17 deletions
calibrate.c
View file @ a8d583ce
...@@ -109,10 +109,10 @@ static uint64_t output_delay_ps(struct spec_fd *fd, int ch, int fine, int n, ...@@ -109,10 +109,10 @@ static uint64_t output_delay_ps(struct spec_fd *fd, int ch, int fine, int n,
* Then, fr is around 0xc00, bin is 0x50.0000: use 3LL for 64b * Then, fr is around 0xc00, bin is 0x50.0000: use 3LL for 64b
*/ */
res = fr * 3LL * fd->bin; res = fr * 3LL * fd->bin;
if (0) if (fd->verbose > 3)
printk("%s: ch %i, fine %i, bin %x got %08x, " pr_info("%s: ch %i, fine %i, bin %x got %08x, "
"res 0x%016llx\n", __func__, ch, fine, "res 0x%016llx\n", __func__, ch, fine,
fd->bin, fr, res); fd->bin, fr, res);
results[i] = res; results[i] = res;
acc += res; acc += res;
} }
...@@ -128,8 +128,10 @@ static uint64_t output_delay_ps(struct spec_fd *fd, int ch, int fine, int n, ...@@ -128,8 +128,10 @@ static uint64_t output_delay_ps(struct spec_fd *fd, int ch, int fine, int n,
if (results[i] > stats->max) stats->max = results[i]; if (results[i] > stats->max) stats->max = results[i];
if (results[i] < stats->min) stats->min = results[i]; if (results[i] < stats->min) stats->min = results[i];
} }
printk("res %llx avg %llx min %llx max %llx\n", acc, if (fd->verbose > 2)
stats->avg, stats->min, stats->max); pr_info("%s: ch %i, taps %i, count %i, result %llx "
"(max-min %llx)\n", __func__, ch, fine, n,
stats->avg, stats->max - stats->min);
} }
kfree(results); kfree(results);
...@@ -157,12 +159,12 @@ static int fd_find_8ns_tap(struct spec_fd *fd, int ch) ...@@ -157,12 +159,12 @@ static int fd_find_8ns_tap(struct spec_fd *fd, int ch)
while( r - l > 1) { while( r - l > 1) {
mid = ( l + r) / 2; mid = ( l + r) / 2;
dly = output_delay_ps(fd, ch, mid, FD_CAL_STEPS, &stats) - bias; dly = output_delay_ps(fd, ch, mid, FD_CAL_STEPS, &stats) - bias;
if (1) { if (fd->verbose > 1) {
printk("%s: ch%i @ %-5i: ", __func__, ch, mid); printk("%s: ch%i @ %-5i: ", __func__, ch, mid);
__pr_fixed("bias ", bias, ", "); __pr_fixed("bias ", bias, ", ");
__pr_fixed("min ", stats.min, ", "); __pr_fixed("min ", stats.min - bias, ", ");
__pr_fixed("avg ", stats.avg, ", "); __pr_fixed("avg ", stats.avg - bias, ", ");
__pr_fixed("max ", stats.max, "\n"); __pr_fixed("max ", stats.max - bias, "\n");
} }
if(dly < 8000 << 16) if(dly < 8000 << 16)
......
fd-core.c
View file @ a8d583ce
...@@ -24,6 +24,13 @@ ...@@ -24,6 +24,13 @@
#include "fine-delay.h" #include "fine-delay.h"
#include "hw/fd_main_regs.h" #include "hw/fd_main_regs.h"
/* Module parameters */
static int fd_regs_offset = FD_REGS_OFFSET;
module_param_named(regs, fd_regs_offset, int, 0444);
static int fd_verbose = 0;
module_param_named(verbose, fd_verbose, int, 0444);
/* This is pre-set at load time (data by Tomasz) */ /* This is pre-set at load time (data by Tomasz) */
static struct fd_calib fd_default_calib = { static struct fd_calib fd_default_calib = {
.frr_poly = { .frr_poly = {
...@@ -137,9 +144,9 @@ int fd_probe(struct spec_dev *dev) ...@@ -137,9 +144,9 @@ int fd_probe(struct spec_dev *dev)
dev->sub_priv = fd; dev->sub_priv = fd;
fd->spec = dev; fd->spec = dev;
fd->base = dev->remap[0]; fd->base = dev->remap[0];
fd->regs = fd->base + FD_REGS_OFFSET; fd->regs = fd->base + fd_regs_offset;
fd->ow_regs = fd->regs + 0x500; fd->ow_regs = fd->regs + 0x500;
fd->verbose = fd_verbose;
fd->calib = fd_default_calib; fd->calib = fd_default_calib;
/* Check the binary is there */ /* Check the binary is there */
...@@ -167,7 +174,7 @@ int fd_probe(struct spec_dev *dev) ...@@ -167,7 +174,7 @@ int fd_probe(struct spec_dev *dev)
/* Finally, enable the input */ /* Finally, enable the input */
fd_writel(fd, FD_GCR_INPUT_EN, FD_REG_GCR); fd_writel(fd, FD_GCR_INPUT_EN, FD_REG_GCR);
if (1) { if (0) {
struct timespec ts1, ts2, ts3; struct timespec ts1, ts2, ts3;
/* Temporarily, test the time stuff */ /* Temporarily, test the time stuff */
fd_time_set(fd, NULL, NULL); fd_time_set(fd, NULL, NULL);
......
fine-delay.h
View file @ a8d583ce
...@@ -20,8 +20,8 @@ struct fd_calib { ...@@ -20,8 +20,8 @@ struct fd_calib {
#define FD_CH_INT(i) ((i) - 1) #define FD_CH_INT(i) ((i) - 1)
#define FD_CH_EXT(i) ((i) + 1) #define FD_CH_EXT(i) ((i) + 1)
#define FD_NUM_TAPS 1024 #define FD_NUM_TAPS 1024 /* This is an hardware feature of SY89295U */
#define FD_CAL_STEPS 16 //1024 #define FD_CAL_STEPS 1024 /* This is a parameter: must be power of 2 */
struct fd_ch { struct fd_ch {
/* Offset between FRR measured at known T at startup and poly-fitted */ /* Offset between FRR measured at known T at startup and poly-fitted */
...@@ -43,7 +43,8 @@ struct spec_fd { ...@@ -43,7 +43,8 @@ struct spec_fd {
int acam_addr; /* cache of currently active addr */ int acam_addr; /* cache of currently active addr */
uint8_t ds18_id[8]; uint8_t ds18_id[8];
unsigned long next_t; unsigned long next_t;
int temp; /* scaled by 4 bits */ int temp; /* temperature: scaled by 4 bits */
int verbose;
}; };
/* Internal time: the first three fields are just converted to zio time */ /* Internal time: the first three fields are just converted to zio time */
...@@ -85,7 +86,7 @@ static inline void fd_ch_writel(struct spec_fd *fd, int ch, ...@@ -85,7 +86,7 @@ static inline void fd_ch_writel(struct spec_fd *fd, int ch,
fd_writel(fd, v, 0x100 + ch * 0x100 + reg); fd_writel(fd, v, 0x100 + ch * 0x100 + reg);
} }
#define FD_REGS_OFFSET 0x84000 #define FD_REGS_OFFSET 0x84000 /* can be changed by "regs=" */
#define FD_MAGIC_FPGA 0xf19ede1a /* FD_REG_IDR content */ #define FD_MAGIC_FPGA 0xf19ede1a /* FD_REG_IDR content */
/* Values for the configuration of the acam PLL. Can be changed */ /* Values for the configuration of the acam PLL. Can be changed */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment