From d51a9db022f4c8645d33642c3187f5fac6afbfea Mon Sep 17 00:00:00 2001 From: Ralph Metzler Date: Tue, 21 Feb 2017 17:12:35 +0100 Subject: [PATCH] increase buffer for SDR more SDR card init in driver --- ddbridge/ddbridge-core.c | 19 ++++-- ddbridge/ddbridge-mod.c | 139 ++++++++++++++++++++++++++++++++++++++- ddbridge/ddbridge-regs.h | 13 ++-- ddbridge/ddbridge.c | 18 ++++- ddbridge/ddbridge.h | 8 ++- 5 files changed, 178 insertions(+), 19 deletions(-) diff --git a/ddbridge/ddbridge-core.c b/ddbridge/ddbridge-core.c index 50200da..29a5993 100644 --- a/ddbridge/ddbridge-core.c +++ b/ddbridge/ddbridge-core.c @@ -407,7 +407,7 @@ static void ddb_set_dma_table(struct ddb_io *io) ddbwritel(dev, mem & 0xffffffff, dma->bufregs + i * 8); ddbwritel(dev, mem >> 32, dma->bufregs + i * 8 + 4); } - dma->bufval = (dma->div << 16) | + dma->bufval = ((dma->div & 0x0f) << 16) | ((dma->num & 0x1f) << 11) | ((dma->size >> 7) & 0x7ff); } @@ -3330,7 +3330,7 @@ static void ddb_dma_init(struct ddb_io *io, int nr, int out) { struct ddb_dma *dma; struct ddb_regmap *rm = io_regmap(io, 0); - + dma = out ? &io->port->dev->odma[nr] : &io->port->dev->idma[nr]; io->dma = dma; dma->io = io; @@ -3339,9 +3339,16 @@ static void ddb_dma_init(struct ddb_io *io, int nr, int out) if (out) { dma->regs = rm->odma->base + rm->odma->size * nr; dma->bufregs = rm->odma_buf->base + rm->odma_buf->size * nr; - dma->num = OUTPUT_DMA_BUFS; - dma->size = OUTPUT_DMA_SIZE; - dma->div = OUTPUT_DMA_IRQ_DIV; + if (io->port->dev->link[0].info->type == DDB_MOD && + io->port->dev->link[0].info->version == 3) { + dma->num = OUTPUT_DMA_BUFS_SDR; + dma->size = OUTPUT_DMA_SIZE_SDR; + dma->div = OUTPUT_DMA_IRQ_DIV_SDR; + } else { + dma->num = OUTPUT_DMA_BUFS; + dma->size = OUTPUT_DMA_SIZE; + dma->div = OUTPUT_DMA_IRQ_DIV; + } } else { #ifdef DDB_USE_WORK INIT_WORK(&dma->work, input_work); @@ -4724,6 +4731,7 @@ static ssize_t redirect_store(struct device *device, return count; } +#if 0 /* A L P I AAAAAALLPPPPPPII */ /* AAAAAAAA LLLLLLLL PPPPPPII */ static ssize_t redirect2_show(struct device *device, @@ -4747,6 +4755,7 @@ static ssize_t redirect2_store(struct device *device, pr_info("DDBridge: redirect: %02x, %02x\n", i, p); return count; } +#endif static ssize_t gap_show(struct device *device, struct device_attribute *attr, char *buf) diff --git a/ddbridge/ddbridge-mod.c b/ddbridge/ddbridge-mod.c index b12c20f..1362c0d 100644 --- a/ddbridge/ddbridge-mod.c +++ b/ddbridge/ddbridge-mod.c @@ -271,7 +271,7 @@ static int mod_set_modulation(struct ddb_mod *mod, enum fe_modulation modulation return -EINVAL; mod->modulation = modulation; if (dev->link[0].info->version < 2) - ddbwritel(dev, qamtab[modulation], CHANNEL_SETTINGS(mod->nr)); + ddbwritel(dev, qamtab[modulation], CHANNEL_SETTINGS(mod->port->nr)); mod_calc_obitrate(mod); return 0; } @@ -1618,14 +1618,149 @@ static int mod_init_2(struct ddb *dev, u32 Frequency) return 0; } + +/****************************************************************************/ + +static u32 vsb13500[64] = { + 0x0000000E, 0x00010004, 0x00020003, 0x00030009, + 0x0004FFFA, 0x00050002, 0x0006FFF8, 0x0007FFF0, + 0x00080000, 0x0009FFEA, 0x000A0001, 0x000B0003, + 0x000CFFF9, 0x000D0025, 0x000E0004, 0x000F001F, + 0x00100023, 0x0011FFEE, 0x00120020, 0x0013FFD0, + 0x0014FFD5, 0x0015FFED, 0x0016FF8B, 0x0017000B, + 0x0018FFC8, 0x0019FFF1, 0x001A009E, 0x001BFFEF, + 0x001C013B, 0x001D00CB, 0x001E0031, 0x001F05F6, + + 0x0040FFFF, 0x00410004, 0x0042FFF8, 0x0043FFFE, + 0x0044FFFA, 0x0045FFF3, 0x00460003, 0x0047FFF4, + 0x00480005, 0x0049000D, 0x004A0000, 0x004B0022, + 0x004C0005, 0x004D000D, 0x004E0013, 0x004FFFDF, + 0x00500007, 0x0051FFD4, 0x0052FFD2, 0x0053FFFD, + 0x0054FFB7, 0x00550021, 0x00560009, 0x00570010, + 0x00580097, 0x00590003, 0x005A009D, 0x005B004F, + 0x005CFF89, 0x005D0097, 0x005EFD42, 0x005FFCBE +}; + +static u32 stage2[16] = { + 0x0080FFFF, 0x00810000, 0x00820005, 0x00830000, + 0x0084FFF0, 0x00850000, 0x00860029, 0x00870000, + 0x0088FFA2, 0x0089FFFF, 0x008A00C9, 0x008B000C, + 0x008CFE49, 0x008DFF9B, 0x008E04D4, 0x008F07FF +}; + +static void mod_set_sdr_table(struct ddb_mod *mod, u32 *tab, u32 len) +{ + struct ddb *dev = mod->port->dev; + u32 i; + + for (i = 0; i < len; i++) + ddbwritel(dev, tab[i], SDR_CHANNEL_SETFIR(mod->port->nr)); +} + + + +static int rfdac_init(struct ddb *dev) +{ + int i; + u32 tmp; + + ddbwritel(dev, RFDAC_CMD_POWERDOWN, RFDAC_CONTROL); + for (i = 0; i < 10; i++) { + msleep(10); + tmp = ddbreadl(dev, RFDAC_CONTROL); + if ((tmp & RFDAC_CMD_STATUS) == 0x00) + break; + } + if (tmp & 0x80) + return -1; + printk("sync %d:%08x\n", i, tmp); + ddbwritel(dev, RFDAC_CMD_RESET, RFDAC_CONTROL); + for (i = 0; i < 10; i++) { + msleep(10); + tmp = ddbreadl(dev, RFDAC_CONTROL); + if ((tmp & RFDAC_CMD_STATUS) == 0x00) + break; + } + if (tmp & 0x80) + return -1; + printk("sync %d:%08x\n", i, tmp); + ddbwritel(dev, RFDAC_CMD_SETUP, RFDAC_CONTROL); + for (i = 0; i < 10; i++) { + msleep(10); + tmp = ddbreadl(dev, RFDAC_CONTROL); + if ((tmp & RFDAC_CMD_STATUS) == 0x00) + break; + } + if (tmp & 0x80) + return -1; + printk("sync %d:%08x\n", i, tmp); + ddbwritel(dev, 0x01, JESD204B_BASE); + for (i = 0; i < 400; i++) { + msleep(10); + tmp = ddbreadl(dev, JESD204B_BASE); + if ((tmp & 0xc0000000) == 0xc0000000) + break; + } + printk("sync %d:%08x\n", i, tmp); + if ((tmp & 0xc0000000) != 0xc0000000) + return -1; + return 0; +} + +static void mod_set_cfcw(struct ddb_mod *mod, int i) +{ + struct ddb *dev = mod->port->dev; + s32 freq = 182250000 + 7000000 * i; + s32 dcf = 188000000; + s64 tmp, srdac = 245760000; + u32 cfcw; + + tmp = ((s64) (freq - dcf)) << 32; + tmp = div64_s64(tmp, srdac); + cfcw = (u32) tmp; + printk("cfcw = %08x nr = %u\n", cfcw, mod->port->nr); + ddbwritel(dev, cfcw, SDR_CHANNEL_CFCW(mod->port->nr)); +} + + static int mod_init_3(struct ddb *dev, u32 Frequency) { - int ret = 0; + int streams = dev->link[0].info->port_num; + int i, ret = 0; mod_set_vga(dev, 64); ret = mod_setup_max2871(dev, max2871_sdr); if (ret) pr_err("DDBridge: PLL setup failed\n"); + ret = rfdac_init(dev); + if (ret) + ret = rfdac_init(dev); + if (ret) + pr_err("DDBridge: RFDAC setup failed\n"); + //ddbwritel(dev, 0x01, JESD204B_BASE); + + for (i = 0; i < streams; i++) { + struct ddb_mod *mod = &dev->mod[i]; + mod->port = &dev->port[i]; + + mod_set_sdr_table(mod, vsb13500, 64); + mod_set_sdr_table(mod, stage2, 16); + } + ddbwritel(dev, 0x2000, 0x244); + ddbwritel(dev, 0x01, 0x240); + //msleep(500); + for (i = 0; i < streams; i++) { + struct ddb_mod *mod = &dev->mod[i]; + + ddbwritel(dev, 0x00, SDR_CHANNEL_CONTROL(i)); + ddbwritel(dev, 0x06, SDR_CHANNEL_CONFIG(i)); + ddbwritel(dev, 0x70800000, SDR_CHANNEL_ARICW(i)); + mod_set_cfcw(mod, i); + + ddbwritel(dev, 0x00011f80, SDR_CHANNEL_RGAIN(i)); + ddbwritel(dev, 0x00001000, SDR_CHANNEL_FM1GAIN(i)); + ddbwritel(dev, 0x00000800, SDR_CHANNEL_FM2GAIN(i)); + } return ret; } diff --git a/ddbridge/ddbridge-regs.h b/ddbridge/ddbridge-regs.h index 8840af1..71430d1 100644 --- a/ddbridge/ddbridge-regs.h +++ b/ddbridge/ddbridge-regs.h @@ -620,11 +620,10 @@ #define SDR_VSB_LENGTH_MASK (0x01000000) #define SDR_SET_FIR(select,tap,coeff,vsblen) \ - (\ -(((select)<<22)&SDR_FIR_SELECT_MASK)| \ -(((tap)<<16)&SDR_FIR_TAP_MASK)| \ -((coeff)&SDR_FIR_COEFF_MASK)| \ -(((vsblen)<<24)&SDR_VSB_LENGTH_MASK)| \ -0 \ -) + ((((select)<<22)&SDR_FIR_SELECT_MASK)| \ + (((tap)<<16)&SDR_FIR_TAP_MASK)| \ + ((coeff)&SDR_FIR_COEFF_MASK)| \ + (((vsblen)<<24)&SDR_VSB_LENGTH_MASK)| \ + 0 \ + ) diff --git a/ddbridge/ddbridge.c b/ddbridge/ddbridge.c index 033b389..741b3d2 100644 --- a/ddbridge/ddbridge.c +++ b/ddbridge/ddbridge.c @@ -113,7 +113,7 @@ static void __devexit ddb_remove(struct pci_dev *pdev) static int __devinit ddb_irq_msi(struct ddb *dev, int nr) { - int stat; + int stat = 0; #ifdef CONFIG_PCI_MSI if (msi && pci_msi_enabled()) { @@ -267,7 +267,11 @@ static int __devinit ddb_probe(struct pci_dev *pdev, dev->link[0].ids.subdevice = id->subdevice; dev->link[0].dev = dev; +#ifdef NUM_IDS + dev->link[0].info = ddb_infos[id->driver_data]; +#else dev->link[0].info = (struct ddb_info *) id->driver_data; +#endif pr_info("DDBridge: device name: %s\n", dev->link[0].info->name); dev->regs_len = pci_resource_len(dev->pdev, 0); @@ -311,7 +315,7 @@ static int __devinit ddb_probe(struct pci_dev *pdev, if (ddb_init(dev) == 0) return 0; - ddb_irq_disable(dev); + ddb_irq_exit(dev); fail0: pr_err("DDBridge: fail0\n"); if (dev->msi) @@ -524,7 +528,7 @@ static struct ddb_info ddb_sdr = { .name = "Digital Devices SDR", .version = 3, .regmap = &octopus_sdr_map, - .port_num = 10, + .port_num = 20, .temp_num = 1, .tempmon_irq = 8, }; @@ -558,6 +562,14 @@ static struct ddb_info ddb_octopro = { .subvendor = _subvend, .subdevice = _subdev, \ .driver_data = (unsigned long)&_driverdata } +#define DDB_DEVICE(_device, _subdevice, _driver_data) { \ + PCI_DEVICE_SUB(0xdd01, _device, 0xdd01, _subdevice), \ + .driver_data = (kernel_ulong_t) &_driver_data } + +#define DDB_DEVICE_ANY(_device, _subdevice) { \ + PCI_DEVICE_SUB(0xdd01, _device, PCI_ANY_ID, _subdevice), \ + .driver_data = (kernel_ulong_t) ddb_none } + static const struct pci_device_id ddb_id_tbl[] __devinitconst = { DDB_ID(DDVID, 0x0002, DDVID, 0x0001, ddb_octopus), DDB_ID(DDVID, 0x0003, DDVID, 0x0001, ddb_octopus), diff --git a/ddbridge/ddbridge.h b/ddbridge/ddbridge.h index 757f052..0c324d5 100644 --- a/ddbridge/ddbridge.h +++ b/ddbridge/ddbridge.h @@ -199,6 +199,10 @@ struct ddb_info { #define OUTPUT_DMA_SIZE (128*47*21) #define OUTPUT_DMA_IRQ_DIV 1 #endif +#define OUTPUT_DMA_BUFS_SDR 8 +#define OUTPUT_DMA_SIZE_SDR (256*1024) +#define OUTPUT_DMA_IRQ_DIV_SDR 1 + struct ddb; struct ddb_port; @@ -345,8 +349,8 @@ struct mod_base { struct ddb_mod { struct ddb_port *port; - u32 nr; - u32 regs; + //u32 nr; + //u32 regs; u32 frequency; u32 modulation;