FGCOM/dahdi-linux
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wct4xxp: Add support for TE820 and VPMOCT256.

Browse Source 
TE820 is an 8-span PCI-express digital interface card. VPMOCT256 is a hardware
echo canceler that is able to provide echo cancelation on all 8-spans.

From: Matthew Fredrickson <creslin@digium.com>

Signed-off-by: Russ Meyerriecks <rmeyerriecks@digium.com>
Signed-off-by: Shaun Ruffell <sruffell@digium.com>

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10290 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Matthew Fredrickson 2011-11-01 15:27:21 +00:00 committed by Shaun Ruffell
parent 47beee98d7
commit 11d8140b23
7 changed files with 476 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README
View File

@ -17,6 +17,7 @@ Digital Cards
* Digium TE405P/TE407P/TE410P/TE412P: PCI quad-port T1/E1/J1 * Digium TE405P/TE407P/TE410P/TE412P: PCI quad-port T1/E1/J1
* Digium TE220: PCI-Express dual-port T1/E1/J1 * Digium TE220: PCI-Express dual-port T1/E1/J1
* Digium TE420: PCI-Express quad-port T1/E1/J1 * Digium TE420: PCI-Express quad-port T1/E1/J1
* Digium TE820: PCI-Express eight-port T1/E1/J1
- wcte12xp: - wcte12xp:
* Digium TE120P: PCI single-port T1/E1/J1 * Digium TE120P: PCI single-port T1/E1/J1
* Digium TE121: PCI-Express single-port T1/E1/J1 * Digium TE121: PCI-Express single-port T1/E1/J1

21
drivers/dahdi/firmware/Makefile
View File

@ -24,6 +24,7 @@
OCT6114_064_VERSION:=1.05.01 OCT6114_064_VERSION:=1.05.01
OCT6114_128_VERSION:=1.05.01 OCT6114_128_VERSION:=1.05.01
OCT6114_256_VERSION:=1.05.01
TC400M_VERSION:=MR6.12 TC400M_VERSION:=MR6.12
VPMADT032_VERSION:=1.25.0 VPMADT032_VERSION:=1.25.0
HX8_VERSION:=2.06 HX8_VERSION:=2.06
@ -31,7 +32,7 @@ VPMOCT032_VERSION:=1.11.0
FIRMWARE_URL:=http://downloads.digium.com/pub/telephony/firmware/releases FIRMWARE_URL:=http://downloads.digium.com/pub/telephony/firmware/releases
ALL_FIRMWARE=FIRMWARE-OCT6114-064 FIRMWARE-OCT6114-128 FIRMWARE-TC400M FIRMWARE-HX8 FIRMWARE-VPMOCT032 ALL_FIRMWARE=FIRMWARE-OCT6114-064 FIRMWARE-OCT6114-128 FIRMWARE-OCT6114-256 FIRMWARE-TC400M FIRMWARE-HX8 FIRMWARE-VPMOCT032
# Firmware files should use the naming convention: dahdi-fw-<base name>-<sub name>-<version> or dahdi-fw-<base name>-<version> # Firmware files should use the naming convention: dahdi-fw-<base name>-<sub name>-<version> or dahdi-fw-<base name>-<version>
# First example: dahdi-fw-oct6114-064-1.05.01 # First example: dahdi-fw-oct6114-064-1.05.01
@ -42,6 +43,7 @@ ALL_FIRMWARE=FIRMWARE-OCT6114-064 FIRMWARE-OCT6114-128 FIRMWARE-TC400M FIRMWARE-
# Build a list of firmware package filenames we need # Build a list of firmware package filenames we need
FIRMWARE:=$(ALL_FIRMWARE:FIRMWARE-OCT6114-064=dahdi-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz) FIRMWARE:=$(ALL_FIRMWARE:FIRMWARE-OCT6114-064=dahdi-fw-oct6114-064-$(OCT6114_064_VERSION).tar.gz)
FIRMWARE:=$(FIRMWARE:FIRMWARE-OCT6114-128=dahdi-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz) FIRMWARE:=$(FIRMWARE:FIRMWARE-OCT6114-128=dahdi-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz)
FIRMWARE:=$(FIRMWARE:FIRMWARE-OCT6114-256=dahdi-fw-oct6114-256-$(OCT6114_256_VERSION).tar.gz)
FIRMWARE:=$(FIRMWARE:FIRMWARE-TC400M=dahdi-fw-tc400m-$(TC400M_VERSION).tar.gz) FIRMWARE:=$(FIRMWARE:FIRMWARE-TC400M=dahdi-fw-tc400m-$(TC400M_VERSION).tar.gz)
FIRMWARE:=$(FIRMWARE:FIRMWARE-HX8=dahdi-fw-hx8-$(HX8_VERSION).tar.gz) FIRMWARE:=$(FIRMWARE:FIRMWARE-HX8=dahdi-fw-hx8-$(HX8_VERSION).tar.gz)
FIRMWARE:=$(FIRMWARE:FIRMWARE-VPMOCT032=dahdi-fw-vpmoct032-$(VPMOCT032_VERSION).tar.gz) FIRMWARE:=$(FIRMWARE:FIRMWARE-VPMOCT032=dahdi-fw-vpmoct032-$(VPMOCT032_VERSION).tar.gz)
@ -51,6 +53,7 @@ FWLOADERS:=dahdi-fwload-vpmadt032-$(VPMADT032_VERSION).tar.gz
# Build a list of object files if hotplug will not be used # Build a list of object files if hotplug will not be used
OBJECT_FILES:=$(ALL_FIRMWARE:FIRMWARE-OCT6114-064=dahdi-fw-oct6114-064.o) OBJECT_FILES:=$(ALL_FIRMWARE:FIRMWARE-OCT6114-064=dahdi-fw-oct6114-064.o)
OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-OCT6114-128=dahdi-fw-oct6114-128.o) OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-OCT6114-128=dahdi-fw-oct6114-128.o)
OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-OCT6114-256=dahdi-fw-oct6114-256.o)
OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-TC400M=dahdi-fw-tc400m.o) OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-TC400M=dahdi-fw-tc400m.o)
OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-HX8=dahdi-fw-hx8.o) OBJECT_FILES:=$(OBJECT_FILES:FIRMWARE-HX8=dahdi-fw-hx8.o)
@ -123,6 +126,17 @@ ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-12
else else
@echo "Firmware dahdi-fw-oct6114-128.bin is already installed with required version $(OCT6114_128_VERSION)" @echo "Firmware dahdi-fw-oct6114-128.bin is already installed with required version $(OCT6114_128_VERSION)"
endif endif
ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-256-$(OCT6114_256_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-256-$(OCT6114_256_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes)
@echo "Installing dahdi-fw-oct6114-256.bin to hotplug firmware directories"
@install -m 644 dahdi-fw-oct6114-256.bin $(DESTDIR)/usr/lib/hotplug/firmware
@rm -rf $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-256-*
@touch $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-oct6114-256-$(OCT6114_256_VERSION)
@install -m 644 dahdi-fw-oct6114-256.bin $(DESTDIR)/lib/firmware
@rm -rf $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-256-*
@touch $(DESTDIR)/lib/firmware/.dahdi-fw-oct6114-256-$(OCT6114_256_VERSION)
else
@echo "Firmware dahdi-fw-oct6114-256.bin is already installed with required version $(OCT6114_256_VERSION)"
endif
ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes) ifeq ($(shell if ( [ -f $(DESTDIR)/usr/lib/hotplug/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) ] ) && ( [ -f $(DESTDIR)/lib/firmware/.dahdi-fw-tc400m-$(TC400M_VERSION) ] ); then echo "no"; else echo "yes"; fi),yes)
@echo "Installing dahdi-fw-tc400m.bin to hotplug firmware directories" @echo "Installing dahdi-fw-tc400m.bin to hotplug firmware directories"
@install -m 644 dahdi-fw-tc400m.bin $(DESTDIR)/usr/lib/hotplug/firmware @install -m 644 dahdi-fw-tc400m.bin $(DESTDIR)/usr/lib/hotplug/firmware
@ -184,6 +198,11 @@ dahdi-fw-oct6114-128.o: dahdi-fw-oct6114-128-$(OCT6114_128_VERSION).tar.gz dahdi
@echo Making firmware object file for dahdi-fw-oct6114-128.bin @echo Making firmware object file for dahdi-fw-oct6114-128.bin
./make_firmware_object dahdi-fw-oct6114-128.bin $@ ./make_firmware_object dahdi-fw-oct6114-128.bin $@
# Build object file of an oct6114 256 firmware image for linking
dahdi-fw-oct6114-256.o: dahdi-fw-oct6114-256-$(OCT6114_256_VERSION).tar.gz dahdi-fw-oct6114-256.bin make_firmware_object
@echo Making firmware object file for dahdi-fw-oct6114-256.bin
./make_firmware_object dahdi-fw-oct6114-256.bin $@
# Build object file of a TC400M firmware image for linking # Build object file of a TC400M firmware image for linking
dahdi-fw-tc400m.o: dahdi-fw-tc400m-$(TC400M_VERSION).tar.gz dahdi-fw-tc400m.bin make_firmware_object dahdi-fw-tc400m.o: dahdi-fw-tc400m-$(TC400M_VERSION).tar.gz dahdi-fw-tc400m.bin make_firmware_object
@echo Making firmware object file for dahdi-fw-tc400m.bin @echo Making firmware object file for dahdi-fw-tc400m.bin

2
drivers/dahdi/oct612x/include/oct6100api/oct6100_defines.h
View File

@ -397,7 +397,7 @@ $Octasic_Revision: 171 $
/* Max defines.*/ /* Max defines.*/
#ifndef cOCT6100_MAX_ECHO_CHANNELS #ifndef cOCT6100_MAX_ECHO_CHANNELS
#define cOCT6100_MAX_ECHO_CHANNELS 128 #define cOCT6100_MAX_ECHO_CHANNELS 256
#endif #endif
#define cOCT6100_MAX_TSI_CNCTS 1530 #define cOCT6100_MAX_TSI_CNCTS 1530
#define cOCT6100_MAX_CALLER_ID_PLAYOUT_BUFFERS ( 3328 + 6 ) #define cOCT6100_MAX_CALLER_ID_PLAYOUT_BUFFERS ( 3328 + 6 )

5
drivers/dahdi/wct4xxp/Kbuild
View File

@ -17,7 +17,7 @@ endif
wct4xxp-objs := base.o vpm450m.o $(shell $(src)/../oct612x/octasic-helper objects ../oct612x) wct4xxp-objs := base.o vpm450m.o $(shell $(src)/../oct612x/octasic-helper objects ../oct612x)
ifneq ($(HOTPLUG_FIRMWARE),yes) ifneq ($(HOTPLUG_FIRMWARE),yes)
wct4xxp-objs += $(FIRM_DIR)/dahdi-fw-oct6114-064.o $(FIRM_DIR)/dahdi-fw-oct6114-128.o wct4xxp-objs += $(FIRM_DIR)/dahdi-fw-oct6114-064.o $(FIRM_DIR)/dahdi-fw-oct6114-128.o $(FIRM_DIR)/dahdi-fw-oct6114-256.o
endif endif
$(obj)/$(FIRM_DIR)/dahdi-fw-oct6114-064.o: $(obj)/base.o $(obj)/$(FIRM_DIR)/dahdi-fw-oct6114-064.o: $(obj)/base.o
@ -25,3 +25,6 @@ $(obj)/$(FIRM_DIR)/dahdi-fw-oct6114-064.o: $(obj)/base.o
$(obj)/$(FIRM_DIR)/dahdi-fw-oct6114-128.o: $(obj)/base.o $(obj)/$(FIRM_DIR)/dahdi-fw-oct6114-128.o: $(obj)/base.o
$(MAKE) -C $(obj)/$(FIRM_DIR) dahdi-fw-oct6114-128.o $(MAKE) -C $(obj)/$(FIRM_DIR) dahdi-fw-oct6114-128.o
$(obj)/$(FIRM_DIR)/dahdi-fw-oct6114-256.o: $(obj)/base.o
$(MAKE) -C $(obj)/$(FIRM_DIR) dahdi-fw-oct6114-256.o

385
drivers/dahdi/wct4xxp/base.c
View File

@ -77,8 +77,6 @@
/* Maximum latency to be used with Gen 5 */ /* Maximum latency to be used with Gen 5 */
#define GEN5_MAX_LATENCY 127 #define GEN5_MAX_LATENCY 127
#define T4_BASE_SIZE (DAHDI_MAX_CHUNKSIZE * 32 * 4)
#ifdef ENABLE_WORKQUEUES #ifdef ENABLE_WORKQUEUES
#include <linux/cpu.h> #include <linux/cpu.h>
@ -229,6 +227,7 @@ static int altab[] = {
#define FLAG_BURST (1 << 8) #define FLAG_BURST (1 << 8)
#define FLAG_EXPRESS (1 << 9) #define FLAG_EXPRESS (1 << 9)
#define FLAG_5THGEN (1 << 10) #define FLAG_5THGEN (1 << 10)
#define FLAG_8PORT (1 << 11)
#define CANARY 0xc0de #define CANARY 0xc0de
@ -237,15 +236,15 @@ static int altab[] = {
#define T4_VPM_PRESENT (1 << 28) #define T4_VPM_PRESENT (1 << 28)
static const char *vpmoct064_name = "VPMOCT064"; static const char *vpmoct064_name = "VPMOCT064";
static const char *vpmoct128_name = "VPMOCT128"; static const char *vpmoct128_name = "VPMOCT128";
static const char *vpmoct256_name = "VPMOCT256";
#endif #endif
#define PORTS_PER_FRAMER 4
struct devtype { struct devtype {
char *desc; char *desc;
unsigned int flags; unsigned int flags;
}; };
static struct devtype wct820p5 = { "Wildcard TE820 (5th Gen)", FLAG_8PORT | FLAG_5THGEN | FLAG_BURST | FLAG_2NDGEN | FLAG_3RDGEN | FLAG_EXPRESS };
static struct devtype wct420p5 = { "Wildcard TE420 (5th Gen)", FLAG_5THGEN | FLAG_BURST | FLAG_2NDGEN | FLAG_3RDGEN | FLAG_EXPRESS }; static struct devtype wct420p5 = { "Wildcard TE420 (5th Gen)", FLAG_5THGEN | FLAG_BURST | FLAG_2NDGEN | FLAG_3RDGEN | FLAG_EXPRESS };
static struct devtype wct410p5 = { "Wildcard TE410P (5th Gen)", FLAG_5THGEN | FLAG_BURST | FLAG_2NDGEN | FLAG_3RDGEN }; static struct devtype wct410p5 = { "Wildcard TE410P (5th Gen)", FLAG_5THGEN | FLAG_BURST | FLAG_2NDGEN | FLAG_3RDGEN };
static struct devtype wct405p5 = { "Wildcard TE405P (5th Gen)", FLAG_5THGEN | FLAG_BURST | FLAG_2NDGEN | FLAG_3RDGEN }; static struct devtype wct405p5 = { "Wildcard TE405P (5th Gen)", FLAG_5THGEN | FLAG_BURST | FLAG_2NDGEN | FLAG_3RDGEN };
@ -326,7 +325,7 @@ struct t4 {
int num; /* Which card we are */ int num; /* Which card we are */
int syncsrc; /* active sync source */ int syncsrc; /* active sync source */
struct dahdi_device *ddev; struct dahdi_device *ddev;
struct t4_span *tspans[4]; /* Individual spans */ struct t4_span *tspans[8]; /* Individual spans */
int numspans; /* Number of spans on the card */ int numspans; /* Number of spans on the card */
int blinktimer; int blinktimer;
#ifdef FANCY_ALARM #ifdef FANCY_ALARM
@ -336,8 +335,9 @@ struct t4 {
int order; /* Order */ int order; /* Order */
const struct devtype *devtype; const struct devtype *devtype;
unsigned int falc31:1; /* are we falc v3.1 (atomic not necessary) */ unsigned int falc31:1; /* are we falc v3.1 (atomic not necessary) */
unsigned int t1e1:4; /* T1 / E1 select pins */ unsigned int t1e1:8; /* T1 / E1 select pins */
int ledreg; /* LED Register */ int ledreg; /* LED Register */
int ledreg2; /* LED Register2 */
unsigned int gpio; unsigned int gpio;
unsigned int gpioctl; unsigned int gpioctl;
int e1recover; /* E1 recovery timer */ int e1recover; /* E1 recovery timer */
@ -377,6 +377,32 @@ static inline bool has_e1_span(const struct t4 *wc)
return (wc->t1e1) != 0; return (wc->t1e1) != 0;
} }
static inline bool is_octal(const struct t4 *wc)
{
return (wc->devtype->flags & FLAG_8PORT) > 0;
}
static inline int T4_BASE_SIZE(struct t4 *wc)
{
if (is_octal(wc))
return DAHDI_MAX_CHUNKSIZE * 32 * 8;
else
return DAHDI_MAX_CHUNKSIZE * 32 * 4;
}
/**
* ports_on_framer - The number of ports on the framers.
* @wc: Board to check.
*
* The framer ports could be different the the number of ports on the card
* since the dual spans have four ports internally but two ports extenally.
*
*/
static inline unsigned int ports_on_framer(const struct t4 *wc)
{
return (is_octal(wc)) ? 8 : 4;
}
#ifdef VPM_SUPPORT #ifdef VPM_SUPPORT
static void t4_vpm450_init(struct t4 *wc); static void t4_vpm450_init(struct t4 *wc);
@ -424,14 +450,21 @@ static void t4_check_sigbits(struct t4 *wc, int span);
#define WC_GPIO 9 #define WC_GPIO 9
#define WC_LADDR 10 #define WC_LADDR 10
#define WC_LDATA 11 #define WC_LDATA 11
#define WC_LEDS2 12
#define WC_SET_AUTH (1 << 20)
#define WC_GET_AUTH (1 << 12)
#define WC_LFRMR_CS (1 << 10) /* Framer's ChipSelect signal */
#define WC_LCS (1 << 11) #define WC_LCS (1 << 11)
#define WC_LCS2 (1 << 12) #define WC_LCS2 (1 << 12)
#define WC_LALE (1 << 13) #define WC_LALE (1 << 13)
#define WC_LFRMR_CS (1 << 10) /* Framer's ChipSelect signal */ #define WC_LFRMR_CS2 (1 << 14) /* Framer's ChipSelect signal 2 */
#define WC_ACTIVATE (1 << 12)
#define WC_LREAD (1 << 15) #define WC_LREAD (1 << 15)
#define WC_LWRITE (1 << 16) #define WC_LWRITE (1 << 16)
#define WC_ACTIVATE (1 << 12)
#define WC_OFF (0) #define WC_OFF (0)
#define WC_RED (1) #define WC_RED (1)
#define WC_GREEN (2) #define WC_GREEN (2)
@ -577,11 +610,22 @@ static inline void t4_pci_out(struct t4 *wc, const unsigned int addr, const unsi
static inline void __t4_set_led(struct t4 *wc, int span, int color) static inline void __t4_set_led(struct t4 *wc, int span, int color)
{ {
if (span <= 3) {
int oldreg = wc->ledreg; int oldreg = wc->ledreg;
wc->ledreg &= ~(0x3 << (span << 1)); wc->ledreg &= ~(0x3 << (span << 1));
wc->ledreg |= (color << (span << 1)); wc->ledreg |= (color << (span << 1));
if (oldreg != wc->ledreg) if (oldreg != wc->ledreg)
__t4_pci_out(wc, WC_LEDS, wc->ledreg); __t4_pci_out(wc, WC_LEDS, wc->ledreg);
} else {
int oldreg = wc->ledreg2;
span &= 3;
wc->ledreg2 &= ~(0x3 << (span << 1));
wc->ledreg2 |= (color << (span << 1));
if (oldreg != wc->ledreg2)
__t4_pci_out(wc, WC_LEDS2, wc->ledreg2);
}
} }
static inline void t4_activate(struct t4 *wc) static inline void t4_activate(struct t4 *wc)
@ -609,9 +653,10 @@ static unsigned int __t4_framer_in(const struct t4 *wc, int unit,
void __iomem *const wc_laddr = wc->membase + (WC_LADDR*sizeof(u32)); void __iomem *const wc_laddr = wc->membase + (WC_LADDR*sizeof(u32));
void __iomem *const wc_version = wc->membase + (WC_VERSION*sizeof(u32)); void __iomem *const wc_version = wc->membase + (WC_VERSION*sizeof(u32));
void __iomem *const wc_ldata = wc->membase + (WC_LDATA*sizeof(u32)); void __iomem *const wc_ldata = wc->membase + (WC_LDATA*sizeof(u32));
int haddr = (((unit & 4) ? 0 : WC_LFRMR_CS2));
unit &= 0x3; unit &= 0x3;
val = ((unit & 0x3) << 8) | (addr & 0xff); val = ((unit & 0x3) << 8) | (addr & 0xff) | haddr;
writel(val, wc_laddr); writel(val, wc_laddr);
/* readl(wc_version); */ /* readl(wc_version); */
writel(val | WC_LFRMR_CS | WC_LREAD, wc_laddr); writel(val | WC_LFRMR_CS | WC_LREAD, wc_laddr);
@ -639,8 +684,9 @@ static void __t4_framer_out(const struct t4 *wc, int unit, const u8 addr,
void __iomem *const wc_laddr = wc->membase + (WC_LADDR*sizeof(u32)); void __iomem *const wc_laddr = wc->membase + (WC_LADDR*sizeof(u32));
void __iomem *const wc_version = wc->membase + (WC_VERSION*sizeof(u32)); void __iomem *const wc_version = wc->membase + (WC_VERSION*sizeof(u32));
void __iomem *const wc_ldata = wc->membase + (WC_LDATA*sizeof(u32)); void __iomem *const wc_ldata = wc->membase + (WC_LDATA*sizeof(u32));
int haddr = (((unit & 4) ? 0 : WC_LFRMR_CS2));
val = ((unit & 0x3) << 8) | (addr & 0xff); val = ((unit & 0x3) << 8) | (addr & 0xff) | haddr;
writel(val, wc_laddr); writel(val, wc_laddr);
writel(value, wc_ldata); writel(value, wc_ldata);
readl(wc_version); readl(wc_version);
@ -1020,18 +1066,25 @@ unsigned int oct_get_reg(void *data, unsigned int reg)
return ret; return ret;
} }
static const char *t4_echocan_name(const struct dahdi_chan *chan) static const char *__t4_echocan_name(struct t4 *wc)
{ {
struct t4 *wc = chan->pvt;
if (wc->vpm450m) { if (wc->vpm450m) {
if (wc->numspans == 2) if (wc->numspans == 2)
return vpmoct064_name; return vpmoct064_name;
else if (wc->numspans == 4) else if (wc->numspans == 4)
return vpmoct128_name; return vpmoct128_name;
else if (wc->numspans == 8)
return vpmoct256_name;
} }
return NULL; return NULL;
} }
static const char *t4_echocan_name(const struct dahdi_chan *chan)
{
struct t4 *wc = chan->pvt;
return __t4_echocan_name(wc);
}
static int t4_echocan_create(struct dahdi_chan *chan, static int t4_echocan_create(struct dahdi_chan *chan,
struct dahdi_echocanparams *ecp, struct dahdi_echocanparams *ecp,
struct dahdi_echocanparam *p, struct dahdi_echocanparam *p,
@ -1063,6 +1116,9 @@ static int t4_echocan_create(struct dahdi_chan *chan,
channel = has_e1_span(wc) ? chan->chanpos : chan->chanpos + 4; channel = has_e1_span(wc) ? chan->chanpos : chan->chanpos + 4;
if (wc->vpm450m) { if (wc->vpm450m) {
if (is_octal(wc))
channel = channel << 3;
else
channel = channel << 2; channel = channel << 2;
channel |= chan->span->offset; channel |= chan->span->offset;
if (debug & DEBUG_ECHOCAN) if (debug & DEBUG_ECHOCAN)
@ -1085,6 +1141,9 @@ static void echocan_free(struct dahdi_chan *chan, struct dahdi_echocan_state *ec
channel = has_e1_span(wc) ? chan->chanpos : chan->chanpos + 4; channel = has_e1_span(wc) ? chan->chanpos : chan->chanpos + 4;
if (wc->vpm450m) { if (wc->vpm450m) {
if (is_octal(wc))
channel = channel << 3;
else
channel = channel << 2; channel = channel << 2;
channel |= chan->span->offset; channel |= chan->span->offset;
if (debug & DEBUG_ECHOCAN) if (debug & DEBUG_ECHOCAN)
@ -1100,6 +1159,7 @@ static void echocan_free(struct dahdi_chan *chan, struct dahdi_echocan_state *ec
static int t4_ioctl(struct dahdi_chan *chan, unsigned int cmd, unsigned long data) static int t4_ioctl(struct dahdi_chan *chan, unsigned int cmd, unsigned long data)
{ {
struct t4_regs regs; struct t4_regs regs;
struct t4_reg reg;
int x; int x;
struct t4 *wc = chan->pvt; struct t4 *wc = chan->pvt;
#ifdef VPM_SUPPORT #ifdef VPM_SUPPORT
@ -1109,12 +1169,28 @@ static int t4_ioctl(struct dahdi_chan *chan, unsigned int cmd, unsigned long dat
#endif #endif
switch(cmd) { switch(cmd) {
case WCT4_SET_REG:
if (copy_from_user(&reg, (struct t4_reg __user *)data,
sizeof(reg)))
return -EFAULT;
t4_pci_out(wc, reg.reg, reg.val);
break;
case WCT4_GET_REG:
if (copy_from_user(&reg, (struct t4_reg __user *)data,
sizeof(reg)))
return -EFAULT;
reg.val = t4_pci_in(wc, reg.reg);
if (copy_to_user((struct t4_reg __user *)data,
&reg, sizeof(reg)))
return -EFAULT;
break;
case WCT4_GET_REGS: case WCT4_GET_REGS:
for (x=0;x<NUM_PCI;x++) for (x=0;x<NUM_PCI;x++)
regs.pci[x] = t4_pci_in(wc, x); regs.pci[x] = t4_pci_in(wc, x);
for (x=0;x<NUM_REGS;x++) for (x=0;x<NUM_REGS;x++)
regs.regs[x] = t4_framer_in(wc, chan->span->offset, x); regs.regs[x] = t4_framer_in(wc, chan->span->offset, x);
if (copy_to_user((__user void *) data, &regs, sizeof(regs))) if (copy_to_user((void __user *) data,
&regs, sizeof(regs)))
return -EFAULT; return -EFAULT;
break; break;
#ifdef VPM_SUPPORT #ifdef VPM_SUPPORT
@ -1134,9 +1210,9 @@ static int t4_ioctl(struct dahdi_chan *chan, unsigned int cmd, unsigned long dat
else else
clear_bit(chan->chanpos - 1, &ts->dtmfmutemask); clear_bit(chan->chanpos - 1, &ts->dtmfmutemask);
channel = (chan->chanpos) << 2; channel = (chan->chanpos) << 3;
if (!has_e1_span(wc)) if (!has_e1_span(wc))
channel += (4 << 2); channel += (4 << 3);
channel |= chan->span->offset; channel |= chan->span->offset;
vpm450m_setdtmf(wc->vpm450m, channel, j & DAHDI_TONEDETECT_ON, vpm450m_setdtmf(wc->vpm450m, channel, j & DAHDI_TONEDETECT_ON,
j & DAHDI_TONEDETECT_MUTE); j & DAHDI_TONEDETECT_MUTE);
@ -1515,7 +1591,17 @@ static int t4_shutdown(struct dahdi_span *span)
span->flags &= ~DAHDI_FLAG_RUNNING; span->flags &= ~DAHDI_FLAG_RUNNING;
__t4_set_led(wc, span->offset, WC_OFF); __t4_set_led(wc, span->offset, WC_OFF);
if (((wc->numspans == 4) && if (((wc->numspans == 8) &&
(!(wc->tspans[0]->span.flags & DAHDI_FLAG_RUNNING)) &&
(!(wc->tspans[1]->span.flags & DAHDI_FLAG_RUNNING)) &&
(!(wc->tspans[2]->span.flags & DAHDI_FLAG_RUNNING)) &&
(!(wc->tspans[3]->span.flags & DAHDI_FLAG_RUNNING)) &&
(!(wc->tspans[4]->span.flags & DAHDI_FLAG_RUNNING)) &&
(!(wc->tspans[5]->span.flags & DAHDI_FLAG_RUNNING)) &&
(!(wc->tspans[6]->span.flags & DAHDI_FLAG_RUNNING)) &&
(!(wc->tspans[7]->span.flags & DAHDI_FLAG_RUNNING)))
||
((wc->numspans == 4) &&
(!(wc->tspans[0]->span.flags & DAHDI_FLAG_RUNNING)) && (!(wc->tspans[0]->span.flags & DAHDI_FLAG_RUNNING)) &&
(!(wc->tspans[1]->span.flags & DAHDI_FLAG_RUNNING)) && (!(wc->tspans[1]->span.flags & DAHDI_FLAG_RUNNING)) &&
(!(wc->tspans[2]->span.flags & DAHDI_FLAG_RUNNING)) && (!(wc->tspans[2]->span.flags & DAHDI_FLAG_RUNNING)) &&
@ -1597,7 +1683,7 @@ t4_spanconfig(struct file *file, struct dahdi_span *span,
if (lc->sync < 0) if (lc->sync < 0)
lc->sync = 0; lc->sync = 0;
if (lc->sync > 4) if (lc->sync > wc->numspans)
lc->sync = 0; lc->sync = 0;
/* remove this span number from the current sync sources, if there */ /* remove this span number from the current sync sources, if there */
@ -1703,14 +1789,10 @@ static int t4_close(struct dahdi_chan *chan)
static int set_span_devicetype(struct t4 *wc) static int set_span_devicetype(struct t4 *wc)
{ {
#ifdef VPM_SUPPORT #ifdef VPM_SUPPORT
const char *vpmstring; const char *vpmstring = __t4_echocan_name(wc);
if (wc->vpm450m) {
if (wc->numspans > 2)
vpmstring = "OCT128";
else
vpmstring = "OCT064";
wc->ddev->devicetype = kasprintf(GFP_KERNEL, "%s (VPM%s)", if (vpmstring) {
wc->ddev->devicetype = kasprintf(GFP_KERNEL, "%s (%s)",
wc->devtype->desc, vpmstring); wc->devtype->desc, vpmstring);
} else { } else {
wc->ddev->devicetype = kasprintf(GFP_KERNEL, wc->devtype->desc); wc->ddev->devicetype = kasprintf(GFP_KERNEL, wc->devtype->desc);
@ -1735,6 +1817,7 @@ static void setup_chunks(struct t4 *wc, int which)
int offset = 1; int offset = 1;
int x, y; int x, y;
int gen2; int gen2;
int basesize = T4_BASE_SIZE(wc) >> 2;
if (!has_e1_span(wc)) if (!has_e1_span(wc))
offset += 4; offset += 4;
@ -1743,13 +1826,13 @@ static void setup_chunks(struct t4 *wc, int which)
for (x = 0; x < wc->numspans; x++) { for (x = 0; x < wc->numspans; x++) {
ts = wc->tspans[x]; ts = wc->tspans[x];
ts->writechunk = (void *)(wc->writechunk + (x * 32 * 2) + (which * (1024 >> 2))); ts->writechunk = (void *)(wc->writechunk + (x * 32 * 2) + (which * (basesize)));
ts->readchunk = (void *)(wc->readchunk + (x * 32 * 2) + (which * (1024 >> 2))); ts->readchunk = (void *)(wc->readchunk + (x * 32 * 2) + (which * (basesize)));
for (y=0;y<wc->tspans[x]->span.channels;y++) { for (y=0;y<wc->tspans[x]->span.channels;y++) {
struct dahdi_chan *mychans = ts->chans[y]; struct dahdi_chan *mychans = ts->chans[y];
if (gen2) { if (gen2) {
mychans->writechunk = (void *)(wc->writechunk + ((x * 32 + y + offset) * 2) + (which * (1024 >> 2))); mychans->writechunk = (void *)(wc->writechunk + ((x * 32 + y + offset) * 2) + (which * (basesize)));
mychans->readchunk = (void *)(wc->readchunk + ((x * 32 + y + offset) * 2) + (which * (1024 >> 2))); mychans->readchunk = (void *)(wc->readchunk + ((x * 32 + y + offset) * 2) + (which * (basesize)));
} }
} }
} }
@ -1772,14 +1855,26 @@ static void t4_serial_setup(struct t4 *wc)
} }
spin_lock_irqsave(&wc->reglock, flags); spin_lock_irqsave(&wc->reglock, flags);
/* GPC1: Multiplex mode enabled, FSC is output, active low, RCLK from
* channel 0 */
/* GPC1: Multiplex mode enabled, FSC is output, active low, RCLK from /* GPC1: Multiplex mode enabled, FSC is output, active low, RCLK from
* channel 0 */ * channel 0 */
__t4_framer_out(wc, 0, 0x85, 0xe0); __t4_framer_out(wc, 0, 0x85, 0xe0);
if (is_octal(wc))
__t4_framer_out(wc, 0, FRMR_GPC2, 0x00);
/* IPC: Interrupt push/pull active low */ /* IPC: Interrupt push/pull active low */
__t4_framer_out(wc, 0, 0x08, 0x01); __t4_framer_out(wc, 0, 0x08, 0x01);
if (is_octal(wc)) {
/* Global clocks (16.384 Mhz CLK) */
__t4_framer_out(wc, 0, 0x92, 0x00); /* GCM1 */
__t4_framer_out(wc, 0, 0x93, 0x18);
__t4_framer_out(wc, 0, 0x94, 0xfb);
__t4_framer_out(wc, 0, 0x95, 0x0b);
__t4_framer_out(wc, 0, 0x96, 0x01);
__t4_framer_out(wc, 0, 0x97, 0x0b);
__t4_framer_out(wc, 0, 0x98, 0xdb);
__t4_framer_out(wc, 0, 0x99, 0xdf);
} else {
/* Global clocks (8.192 Mhz CLK) */ /* Global clocks (8.192 Mhz CLK) */
__t4_framer_out(wc, 0, 0x92, 0x00); __t4_framer_out(wc, 0, 0x92, 0x00);
__t4_framer_out(wc, 0, 0x93, 0x18); __t4_framer_out(wc, 0, 0x93, 0x18);
@ -1789,9 +1884,10 @@ static void t4_serial_setup(struct t4 *wc)
__t4_framer_out(wc, 0, 0x97, 0x0b); __t4_framer_out(wc, 0, 0x97, 0x0b);
__t4_framer_out(wc, 0, 0x98, 0xdb); __t4_framer_out(wc, 0, 0x98, 0xdb);
__t4_framer_out(wc, 0, 0x99, 0xdf); __t4_framer_out(wc, 0, 0x99, 0xdf);
}
spin_unlock_irqrestore(&wc->reglock, flags); spin_unlock_irqrestore(&wc->reglock, flags);
for (unit = 0; unit < PORTS_PER_FRAMER; ++unit) { for (unit = 0; unit < ports_on_framer(wc); ++unit) {
spin_lock_irqsave(&wc->reglock, flags); spin_lock_irqsave(&wc->reglock, flags);
/* Configure interrupts */ /* Configure interrupts */
@ -1799,16 +1895,46 @@ static void t4_serial_setup(struct t4 *wc)
__t4_framer_out(wc, unit, FRMR_GCR, 0x00); __t4_framer_out(wc, unit, FRMR_GCR, 0x00);
/* Configure system interface */ /* Configure system interface */
if (is_octal(wc)) {
/* SIC1: 16.384 Mhz clock/bus, double buffer receive /
* transmit, byte interleaved */
__t4_framer_out(wc, unit, FRMR_SIC1, 0xc2 | 0x08);
} else {
/* SIC1: 8.192 Mhz clock/bus, double buffer receive / /* SIC1: 8.192 Mhz clock/bus, double buffer receive /
* transmit, byte interleaved */ * transmit, byte interleaved */
__t4_framer_out(wc, unit, FRMR_SIC1, 0xc2); __t4_framer_out(wc, unit, FRMR_SIC1, 0xc2);
}
/* SIC2: No FFS, no center receive eliastic buffer, phase */ /* SIC2: No FFS, no center receive eliastic buffer, phase */
__t4_framer_out(wc, unit, FRMR_SIC2, 0x20 | (unit << 1)); __t4_framer_out(wc, unit, FRMR_SIC2, 0x20 | (unit << 1));
/* SIC3: Edges for capture */ /* SIC3: Edges for capture */
if (is_octal(wc)) {
__t4_framer_out(wc, unit, FRMR_SIC3, 0x04 | (1 << 4));
} else {
__t4_framer_out(wc, unit, FRMR_SIC3, 0x04); __t4_framer_out(wc, unit, FRMR_SIC3, 0x04);
}
/* CMR2: We provide sync and clock for tx and rx. */ /* CMR2: We provide sync and clock for tx and rx. */
__t4_framer_out(wc, unit, FRMR_CMR2, 0x00); __t4_framer_out(wc, unit, FRMR_CMR2, 0x00);
if (is_octal(wc)) {
/* Set RCLK to 16 MHz */
__t4_framer_out(wc, unit, FRMR_CMR4, 0x5);
if (!has_e1_span(wc)) { /* T1/J1 mode */
__t4_framer_out(wc, unit, FRMR_XC0, 0x07);
__t4_framer_out(wc, unit, FRMR_XC1, 0x04);
if (wc->tspans[unit]->linemode == J1)
__t4_framer_out(wc, unit, FRMR_RC0, 0x87);
else
__t4_framer_out(wc, unit, FRMR_RC0, 0x07);
__t4_framer_out(wc, unit, FRMR_RC1, 0x04);
} else { /* E1 mode */
__t4_framer_out(wc, unit, FRMR_XC0, 0x00);
__t4_framer_out(wc, unit, FRMR_XC1, 0x04);
__t4_framer_out(wc, unit, FRMR_RC0, 0x00);
__t4_framer_out(wc, unit, FRMR_RC1, 0x04);
}
} else {
if (!has_e1_span(wc)) { /* T1/J1 mode */ if (!has_e1_span(wc)) { /* T1/J1 mode */
__t4_framer_out(wc, unit, FRMR_XC0, 0x03); __t4_framer_out(wc, unit, FRMR_XC0, 0x03);
__t4_framer_out(wc, unit, FRMR_XC1, 0x84); __t4_framer_out(wc, unit, FRMR_XC1, 0x84);
@ -1823,6 +1949,7 @@ static void t4_serial_setup(struct t4 *wc)
__t4_framer_out(wc, unit, FRMR_RC0, 0x04); __t4_framer_out(wc, unit, FRMR_RC0, 0x04);
__t4_framer_out(wc, unit, FRMR_RC1, 0x04); __t4_framer_out(wc, unit, FRMR_RC1, 0x04);
} }
}
/* Configure ports */ /* Configure ports */
@ -1832,7 +1959,11 @@ static void t4_serial_setup(struct t4 *wc)
/* PC2: RMFB/XSIG output/input on RPB/XPB */ /* PC2: RMFB/XSIG output/input on RPB/XPB */
/* PC3: Some unused stuff */ /* PC3: Some unused stuff */
/* PC4: Some more unused stuff */ /* PC4: Some more unused stuff */
if (wc->falc31) { if (is_octal(wc)) {
__t4_framer_out(wc, unit, 0x81, 0xBB);
__t4_framer_out(wc, unit, 0x82, 0xf5);
__t4_framer_out(wc, unit, 0x83, 0x35);
} else if (wc->falc31) {
__t4_framer_out(wc, unit, 0x81, 0xBB); __t4_framer_out(wc, unit, 0x81, 0xBB);
__t4_framer_out(wc, unit, 0x82, 0xBB); __t4_framer_out(wc, unit, 0x82, 0xBB);
__t4_framer_out(wc, unit, 0x83, 0xBB); __t4_framer_out(wc, unit, 0x83, 0xBB);
@ -2214,10 +2345,19 @@ static DEFINE_SPINLOCK(synclock);
static void __t4_set_rclk_src(struct t4 *wc, int span) static void __t4_set_rclk_src(struct t4 *wc, int span)
{ {
if (is_octal(wc)) {
int cmr5 = 0x00 | (span << 5);
int cmr1 = 0x38; /* Clock Mode: RCLK sourced by DCO-R1
by default, Disable Clock-Switching */
__t4_framer_out(wc, 0, 0x44, cmr1);
__t4_framer_out(wc, 0, FRMR_CMR5, cmr5);
} else {
int cmr1 = 0x38; /* Clock Mode: RCLK sourced by DCO-R1 int cmr1 = 0x38; /* Clock Mode: RCLK sourced by DCO-R1
by default, Disable Clock-Switching */ by default, Disable Clock-Switching */
cmr1 |= (span << 6); cmr1 |= (span << 6);
__t4_framer_out(wc, 0, 0x44, cmr1); __t4_framer_out(wc, 0, 0x44, cmr1);
}
dev_info(&wc->dev->dev, "RCLK source set to span %d\n", span+1); dev_info(&wc->dev->dev, "RCLK source set to span %d\n", span+1);
} }
@ -2452,7 +2592,12 @@ static void __t4_configure_t1(struct t4 *wc, int unit, int lineconfig, int txlev
mytxlevel = 0; mytxlevel = 0;
else else
mytxlevel = txlevel - 4; mytxlevel = txlevel - 4;
if (is_octal(wc))
fmr1 = 0x9c | 0x02; /* FMR1: Mode 1, T1 mode, CRC on for ESF, 8.192 Mhz system data rate, no XAIS */
else
fmr1 = 0x9c; /* FMR1: Mode 1, T1 mode, CRC on for ESF, 8.192 Mhz system data rate, no XAIS */ fmr1 = 0x9c; /* FMR1: Mode 1, T1 mode, CRC on for ESF, 8.192 Mhz system data rate, no XAIS */
fmr2 = 0x20; /* FMR2: no payload loopback, don't auto yellow */ fmr2 = 0x20; /* FMR2: no payload loopback, don't auto yellow */
fmr4 = 0x0c; /* FMR4: Lose sync on 2 out of 5 framing bits, auto resync */ fmr4 = 0x0c; /* FMR4: Lose sync on 2 out of 5 framing bits, auto resync */
lim2 = 0x21; /* LIM2: 50% peak is a "1", Advanced Loss recovery */ lim2 = 0x21; /* LIM2: 50% peak is a "1", Advanced Loss recovery */
@ -2543,7 +2688,13 @@ static void __t4_configure_e1(struct t4 *wc, int unit, int lineconfig)
unsigned int imr3extra=0; unsigned int imr3extra=0;
char *crc4 = ""; char *crc4 = "";
char *framing, *line; char *framing, *line;
if (is_octal(wc)) {
/* 16 MHz */
fmr1 = 0x44 | 0x02; /* FMR1: E1 mode, Automatic force resync, PCM30 mode, 8.192 Mhz backplane, no XAIS */
} else {
/* 8 MHz */
fmr1 = 0x44; /* FMR1: E1 mode, Automatic force resync, PCM30 mode, 8.192 Mhz backplane, no XAIS */ fmr1 = 0x44; /* FMR1: E1 mode, Automatic force resync, PCM30 mode, 8.192 Mhz backplane, no XAIS */
}
fmr2 = 0x03; /* FMR2: Auto transmit remote alarm, auto loss of multiframe recovery, no payload loopback */ fmr2 = 0x03; /* FMR2: Auto transmit remote alarm, auto loss of multiframe recovery, no payload loopback */
if (lineconfig & DAHDI_CONFIG_CRC4) { if (lineconfig & DAHDI_CONFIG_CRC4) {
fmr1 |= 0x08; /* CRC4 transmit */ fmr1 |= 0x08; /* CRC4 transmit */
@ -2636,6 +2787,7 @@ static int t4_startup(struct file *file, struct dahdi_span *span)
set_bit(T4_IGNORE_LATENCY, &wc->checkflag); set_bit(T4_IGNORE_LATENCY, &wc->checkflag);
if (debug) if (debug)
dev_info(&wc->dev->dev, "About to enter startup!\n"); dev_info(&wc->dev->dev, "About to enter startup!\n");
tspan = span->offset + 1; tspan = span->offset + 1;
if (tspan < 0) { if (tspan < 0) {
dev_info(&wc->dev->dev, "TE%dXXP: Span '%d' isn't us?\n", dev_info(&wc->dev->dev, "TE%dXXP: Span '%d' isn't us?\n",
@ -2676,6 +2828,8 @@ static int t4_startup(struct file *file, struct dahdi_span *span)
if (wc->devtype->flags & FLAG_5THGEN) if (wc->devtype->flags & FLAG_5THGEN)
__t4_pci_out(wc, 5, (ms_per_irq << 16) | wc->numbufs); __t4_pci_out(wc, 5, (ms_per_irq << 16) | wc->numbufs);
else
__t4_pci_out(wc, 5, (1 << 16) | 1);
/* enable interrupts */ /* enable interrupts */
/* Start DMA, enabling DMA interrupts on read only */ /* Start DMA, enabling DMA interrupts on read only */
wc->dmactrl |= (ts->spanflags & FLAG_2NDGEN) ? 0xc0000000 : 0xc0000003; wc->dmactrl |= (ts->spanflags & FLAG_2NDGEN) ? 0xc0000000 : 0xc0000003;
@ -2686,6 +2840,8 @@ static int t4_startup(struct file *file, struct dahdi_span *span)
__t4_pci_out(wc, WC_INTR, 0x0c); __t4_pci_out(wc, WC_INTR, 0x0c);
if (noburst || !(ts->spanflags & FLAG_BURST)) if (noburst || !(ts->spanflags & FLAG_BURST))
wc->dmactrl |= (1 << 26); wc->dmactrl |= (1 << 26);
else
wc->dmactrl &= ~(1 << 26);
__t4_pci_out(wc, WC_DMACTRL, wc->dmactrl); __t4_pci_out(wc, WC_DMACTRL, wc->dmactrl);
/* Startup HDLC controller too */ /* Startup HDLC controller too */
@ -2716,7 +2872,7 @@ static int t4_startup(struct file *file, struct dahdi_span *span)
if (wc->tspans[1]->sync == span->spanno) if (wc->tspans[1]->sync == span->spanno)
dev_info(&wc->dev->dev, "SPAN %d: Secondary Sync Source\n", dev_info(&wc->dev->dev, "SPAN %d: Secondary Sync Source\n",
span->spanno); span->spanno);
if (wc->numspans == 4) { if (wc->numspans >= 4) {
if (wc->tspans[2]->sync == span->spanno) if (wc->tspans[2]->sync == span->spanno)
dev_info(&wc->dev->dev, "SPAN %d: Tertiary Sync Source" dev_info(&wc->dev->dev, "SPAN %d: Tertiary Sync Source"
"\n", span->spanno); "\n", span->spanno);
@ -2724,6 +2880,21 @@ static int t4_startup(struct file *file, struct dahdi_span *span)
dev_info(&wc->dev->dev, "SPAN %d: Quaternary Sync " dev_info(&wc->dev->dev, "SPAN %d: Quaternary Sync "
"Source\n", span->spanno); "Source\n", span->spanno);
} }
if (wc->numspans == 8) {
if (wc->tspans[4]->sync == span->spanno)
dev_info(&wc->dev->dev, "SPAN %d: Quinary Sync "
"Source\n", span->spanno);
if (wc->tspans[5]->sync == span->spanno)
dev_info(&wc->dev->dev, "SPAN %d: Senary Sync "
"Source\n", span->spanno);
if (wc->tspans[6]->sync == span->spanno)
dev_info(&wc->dev->dev, "SPAN %d: Septenary Sync "
"Source\n", span->spanno);
if (wc->tspans[7]->sync == span->spanno)
dev_info(&wc->dev->dev, "SPAN %d: Octonary Sync "
"Source\n", span->spanno);
}
if (debug) if (debug)
dev_info(&wc->dev->dev, "Completed startup!\n"); dev_info(&wc->dev->dev, "Completed startup!\n");
clear_bit(T4_IGNORE_LATENCY, &wc->checkflag); clear_bit(T4_IGNORE_LATENCY, &wc->checkflag);
@ -3622,7 +3793,7 @@ static int t4_allocate_buffers(struct t4 *wc, int numbufs,
dma_addr_t writedma; dma_addr_t writedma;
/* 32 channels, Double-buffer, Read/Write, 4 spans */ /* 32 channels, Double-buffer, Read/Write, 4 spans */
alloc = pci_alloc_consistent(wc->dev, numbufs * T4_BASE_SIZE * 2, alloc = pci_alloc_consistent(wc->dev, numbufs * T4_BASE_SIZE(wc) * 2,
&writedma); &writedma);
if (!alloc) { if (!alloc) {
@ -3640,21 +3811,21 @@ static int t4_allocate_buffers(struct t4 *wc, int numbufs,
wc->writedma = writedma; wc->writedma = writedma;
/* Read is after the whole write piece (in words) */ /* Read is after the whole write piece (in words) */
wc->readchunk = wc->writechunk + (T4_BASE_SIZE * numbufs) / 4; wc->readchunk = wc->writechunk + (T4_BASE_SIZE(wc) * numbufs) / 4;
/* Same thing but in bytes... */ /* Same thing but in bytes... */
wc->readdma = wc->writedma + (T4_BASE_SIZE * numbufs); wc->readdma = wc->writedma + (T4_BASE_SIZE(wc) * numbufs);
wc->numbufs = numbufs; wc->numbufs = numbufs;
/* Initialize Write/Buffers to all blank data */ /* Initialize Write/Buffers to all blank data */
memset(wc->writechunk, 0x00, T4_BASE_SIZE * numbufs); memset(wc->writechunk, 0x00, T4_BASE_SIZE(wc) * numbufs);
memset(wc->readchunk, 0xff, T4_BASE_SIZE * numbufs); memset(wc->readchunk, 0xff, T4_BASE_SIZE(wc) * numbufs);
if (debug) { if (debug) {
dev_notice(&wc->dev->dev, "DMA memory base of size %d at " \ dev_notice(&wc->dev->dev, "DMA memory base of size %d at " \
"%p. Read: %p and Write %p\n", "%p. Read: %p and Write %p\n",
numbufs * T4_BASE_SIZE * 2, wc->writechunk, numbufs * T4_BASE_SIZE(wc) * 2, wc->writechunk,
wc->readchunk, wc->writechunk); wc->readchunk, wc->writechunk);
} }
@ -3701,7 +3872,7 @@ static void t4_increase_latency(struct t4 *wc, int newlatency)
spin_unlock_irqrestore(&wc->reglock, flags); spin_unlock_irqrestore(&wc->reglock, flags);
pci_free_consistent(wc->dev, T4_BASE_SIZE * oldbufs * 2, pci_free_consistent(wc->dev, T4_BASE_SIZE(wc) * oldbufs * 2,
oldalloc, oldaddr); oldalloc, oldaddr);
dev_info(&wc->dev->dev, "Increased latency to %d\n", newlatency); dev_info(&wc->dev->dev, "Increased latency to %d\n", newlatency);
@ -3884,6 +4055,17 @@ DAHDI_IRQ_HANDLER(t4_interrupt_gen2)
t4_framer_interrupt(wc, 2); t4_framer_interrupt(wc, 2);
if (cis & FRMR_CIS_GIS4) if (cis & FRMR_CIS_GIS4)
t4_framer_interrupt(wc, 3); t4_framer_interrupt(wc, 3);
if (is_octal(wc)) {
if (cis & FRMR_CIS_GIS5)
t4_framer_interrupt(wc, 4);
if (cis & FRMR_CIS_GIS6)
t4_framer_interrupt(wc, 5);
if (cis & FRMR_CIS_GIS7)
t4_framer_interrupt(wc, 6);
if (cis & FRMR_CIS_GIS8)
t4_framer_interrupt(wc, 7);
}
} }
#ifdef VPM_SUPPORT #ifdef VPM_SUPPORT
@ -3946,7 +4128,7 @@ static int t4_reset_dma(struct t4 *wc)
#ifdef VPM_SUPPORT #ifdef VPM_SUPPORT
static void t4_vpm450_init(struct t4 *wc) static void t4_vpm450_init(struct t4 *wc)
{ {
int laws[4] = { 0, }; int laws[8] = { 0, };
int x; int x;
unsigned int vpm_capacity; unsigned int vpm_capacity;
struct firmware embedded_firmware; struct firmware embedded_firmware;
@ -3954,11 +4136,14 @@ static void t4_vpm450_init(struct t4 *wc)
#if !defined(HOTPLUG_FIRMWARE) #if !defined(HOTPLUG_FIRMWARE)
extern void _binary_dahdi_fw_oct6114_064_bin_size; extern void _binary_dahdi_fw_oct6114_064_bin_size;
extern void _binary_dahdi_fw_oct6114_128_bin_size; extern void _binary_dahdi_fw_oct6114_128_bin_size;
extern void _binary_dahdi_fw_oct6114_256_bin_size;
extern u8 _binary_dahdi_fw_oct6114_064_bin_start[]; extern u8 _binary_dahdi_fw_oct6114_064_bin_start[];
extern u8 _binary_dahdi_fw_oct6114_128_bin_start[]; extern u8 _binary_dahdi_fw_oct6114_128_bin_start[];
extern u8 _binary_dahdi_fw_oct6114_256_bin_start[];
#else #else
static const char oct064_firmware[] = "dahdi-fw-oct6114-064.bin"; static const char oct064_firmware[] = "dahdi-fw-oct6114-064.bin";
static const char oct128_firmware[] = "dahdi-fw-oct6114-128.bin"; static const char oct128_firmware[] = "dahdi-fw-oct6114-128.bin";
static const char oct256_firmware[] = "dahdi-fw-oct6114-256.bin";
#endif #endif
if (!vpmsupport) { if (!vpmsupport) {
@ -4024,6 +4209,25 @@ static void t4_vpm450_init(struct t4 *wc)
then cast that value to the proper type. then cast that value to the proper type.
*/ */
embedded_firmware.size = (size_t) &_binary_dahdi_fw_oct6114_128_bin_size; embedded_firmware.size = (size_t) &_binary_dahdi_fw_oct6114_128_bin_size;
#endif
break;
case 256:
#if defined(HOTPLUG_FIRMWARE)
if ((request_firmware(&firmware, oct256_firmware, &wc->dev->dev) != 0) ||
!firmware) {
dev_notice(&wc->dev->dev, "VPM450: firmware %s not "
"available from userspace\n", oct256_firmware);
return;
}
#else
embedded_firmware.data = _binary_dahdi_fw_oct6114_256_bin_start;
/* Yes... this is weird. objcopy gives us a symbol containing
the size of the firmware, not a pointer a variable containing
the size. The only way we can get the value of the symbol
is to take its address, so we define it as a pointer and
then cast that value to the proper type.
*/
embedded_firmware.size = (size_t) &_binary_dahdi_fw_oct6114_256_bin_size;
#endif #endif
break; break;
default: default:
@ -4056,12 +4260,21 @@ static void t4_vpm450_init(struct t4 *wc)
static void t4_tsi_reset(struct t4 *wc) static void t4_tsi_reset(struct t4 *wc)
{ {
int x; int x;
for (x=0;x<128;x++) { if (is_octal(wc)) {
for (x = 0; x < 256; x++) {
wc->dmactrl &= ~0x0001ffff;
wc->dmactrl |= (0x00004000 | ((x & 0x7f) << 7) | ((x >> 7) << 15));
t4_pci_out(wc, WC_DMACTRL, wc->dmactrl);
}
wc->dmactrl &= ~0x0001ffff;
} else {
for (x = 0; x < 128; x++) {
wc->dmactrl &= ~0x00007fff; wc->dmactrl &= ~0x00007fff;
wc->dmactrl |= (0x00004000 | (x << 7)); wc->dmactrl |= (0x00004000 | (x << 7));
t4_pci_out(wc, WC_DMACTRL, wc->dmactrl); t4_pci_out(wc, WC_DMACTRL, wc->dmactrl);
} }
wc->dmactrl &= ~0x00007fff; wc->dmactrl &= ~0x00007fff;
}
t4_pci_out(wc, WC_DMACTRL, wc->dmactrl); t4_pci_out(wc, WC_DMACTRL, wc->dmactrl);
} }
@ -4079,11 +4292,24 @@ static void t4_tsi_assign(struct t4 *wc, int fromspan, int fromchan, int tospan,
tots += 4; tots += 4;
} }
spin_lock_irqsave(&wc->reglock, flags); spin_lock_irqsave(&wc->reglock, flags);
if (is_octal(wc)) {
int fromts_b = fromts & 0x7f;
int fromts_t = fromts >> 7;
int tots_b = tots & 0x7f;
int tots_t = tots >> 7;
wc->dmactrl &= ~0x0001ffff;
wc->dmactrl |= ((fromts_t << 16) | (tots_t << 15) | 0x00004000 | (tots_b << 7) | (fromts_b));
__t4_pci_out(wc, WC_DMACTRL, wc->dmactrl);
wc->dmactrl &= ~0x0001ffff;
__t4_pci_out(wc, WC_DMACTRL, wc->dmactrl);
} else {
wc->dmactrl &= ~0x00007fff; wc->dmactrl &= ~0x00007fff;
wc->dmactrl |= (0x00004000 | (tots << 7) | (fromts)); wc->dmactrl |= (0x00004000 | (tots << 7) | (fromts));
__t4_pci_out(wc, WC_DMACTRL, wc->dmactrl); __t4_pci_out(wc, WC_DMACTRL, wc->dmactrl);
wc->dmactrl &= ~0x00007fff; wc->dmactrl &= ~0x00007fff;
__t4_pci_out(wc, WC_DMACTRL, wc->dmactrl); __t4_pci_out(wc, WC_DMACTRL, wc->dmactrl);
}
spin_unlock_irqrestore(&wc->reglock, flags); spin_unlock_irqrestore(&wc->reglock, flags);
} }
@ -4097,6 +4323,18 @@ static void t4_tsi_unassign(struct t4 *wc, int tospan, int tochan)
if (!has_e1_span(wc)) if (!has_e1_span(wc))
tots += 4; tots += 4;
spin_lock_irqsave(&wc->reglock, flags); spin_lock_irqsave(&wc->reglock, flags);
if (is_octal(wc)) {
int tots_b = tots & 0x7f;
int tots_t = tots >> 7;
wc->dmactrl &= ~0x0001ffff;
wc->dmactrl |= ((tots_t << 15) | 0x00004000 | (tots_b << 7));
__t4_pci_out(wc, WC_DMACTRL, wc->dmactrl);
if (debug & DEBUG_TSI)
dev_notice(&wc->dev->dev, "Sending '%08x\n", wc->dmactrl);
wc->dmactrl &= ~0x0001ffff;
__t4_pci_out(wc, WC_DMACTRL, wc->dmactrl);
} else {
wc->dmactrl &= ~0x00007fff; wc->dmactrl &= ~0x00007fff;
wc->dmactrl |= (0x00004000 | (tots << 7)); wc->dmactrl |= (0x00004000 | (tots << 7));
__t4_pci_out(wc, WC_DMACTRL, wc->dmactrl); __t4_pci_out(wc, WC_DMACTRL, wc->dmactrl);
@ -4104,6 +4342,7 @@ static void t4_tsi_unassign(struct t4 *wc, int tospan, int tochan)
dev_notice(&wc->dev->dev, "Sending '%08x\n", wc->dmactrl); dev_notice(&wc->dev->dev, "Sending '%08x\n", wc->dmactrl);
wc->dmactrl &= ~0x00007fff; wc->dmactrl &= ~0x00007fff;
__t4_pci_out(wc, WC_DMACTRL, wc->dmactrl); __t4_pci_out(wc, WC_DMACTRL, wc->dmactrl);
}
spin_unlock_irqrestore(&wc->reglock, flags); spin_unlock_irqrestore(&wc->reglock, flags);
} }
@ -4141,7 +4380,13 @@ static int t4_hardware_init_1(struct t4 *wc, unsigned int cardflags)
unsigned int version; unsigned int version;
version = t4_pci_in(wc, WC_VERSION); version = t4_pci_in(wc, WC_VERSION);
if (is_octal(wc)) {
dev_info(&wc->dev->dev, "Firmware Version: %01x.%02x\n",
(version & 0xf00) >> 8,
version & 0xff);
} else {
dev_info(&wc->dev->dev, "Firmware Version: %08x\n", version); dev_info(&wc->dev->dev, "Firmware Version: %08x\n", version);
}
if (debug) { if (debug) {
dev_info(&wc->dev->dev, "Burst Mode: %s\n", dev_info(&wc->dev->dev, "Burst Mode: %s\n",
(!(cardflags & FLAG_BURST) && noburst) ? "Off" : "On"); (!(cardflags & FLAG_BURST) && noburst) ? "Off" : "On");
@ -4182,6 +4427,10 @@ static int t4_hardware_init_1(struct t4 *wc, unsigned int cardflags)
if (-1 == t1e1override) { if (-1 == t1e1override) {
wc->t1e1 = (((t4_pci_in(wc, WC_LEDS)) & 0x0f00) >> 8); wc->t1e1 = (((t4_pci_in(wc, WC_LEDS)) & 0x0f00) >> 8);
wc->t1e1 &= 0xf; wc->t1e1 &= 0xf;
if (is_octal(wc)) {
wc->t1e1 |= ((t4_pci_in(wc, WC_LEDS2)) &
0x0f00) >> 4;
}
} else { } else {
dev_warn(&wc->dev->dev, "'t1e1override' is deprecated. " dev_warn(&wc->dev->dev, "'t1e1override' is deprecated. "
"Please use 'default_linemode'.\n"); "Please use 'default_linemode'.\n");
@ -4202,6 +4451,25 @@ static int t4_hardware_init_1(struct t4 *wc, unsigned int cardflags)
wc->order = ((t4_pci_in(wc, WC_LEDS)) & 0xf0000000) >> 28; wc->order = ((t4_pci_in(wc, WC_LEDS)) & 0xf0000000) >> 28;
order_index[wc->order]++; order_index[wc->order]++;
/* TE820 Auth Check */
if (is_octal(wc)) {
uint32_t donebit;
donebit = t4_pci_in(wc, WC_LEDS2);
t4_pci_out(wc, WC_LEDS2, WC_SET_AUTH);
msleep(1000);
donebit = t4_pci_in(wc, WC_LEDS2);
if (!(donebit & WC_GET_AUTH)) {
/* Encryption check failed, stop operation */
dev_info(&wc->dev->dev, "Failed encryption check. "\
"Unloading driver.\n");
return -EIO;
}
}
return 0; return 0;
} }
@ -4217,7 +4485,9 @@ static int t4_hardware_init_2(struct t4 *wc)
} }
/* Setup LEDS, take out of reset */ /* Setup LEDS, take out of reset */
t4_pci_out(wc, WC_LEDS, 0x000000ff); t4_pci_out(wc, WC_LEDS, 0x000000ff);
udelay(100);
t4_activate(wc); t4_activate(wc);
udelay(100);
/* In order to find out the QFALC framer version, we have to /* In order to find out the QFALC framer version, we have to
* temporarily turn off compat mode and take a peak at VSTR. We turn * temporarily turn off compat mode and take a peak at VSTR. We turn
@ -4229,20 +4499,27 @@ static int t4_hardware_init_2(struct t4 *wc)
"in compatibility mode.\n"); "in compatibility mode.\n");
spin_lock_irqsave(&wc->reglock, flags); spin_lock_irqsave(&wc->reglock, flags);
regval = __t4_framer_in(wc, 0, 0xd6); regval = __t4_framer_in(wc, 0, 0xd6);
if (is_octal(wc))
regval |= (1 << 4); /* SSI16 - For 16 MHz multiplex mode with comp = 1 */
else
regval |= (1 << 5); /* set COMP_DIS*/ regval |= (1 << 5); /* set COMP_DIS*/
__t4_framer_out(wc, 0, 0xd6, regval); __t4_framer_out(wc, 0, 0xd6, regval);
regval = __t4_framer_in(wc, 0, 0x4a);
spin_unlock_irqrestore(&wc->reglock, flags); spin_unlock_irqrestore(&wc->reglock, flags);
if (regval == 0x05) if (!is_octal(wc)) {
regval = t4_framer_in(wc, 0, 0x4a);
if (regval == 0x05) {
dev_info(&wc->dev->dev, "FALC Framer Version: 2.1 or " dev_info(&wc->dev->dev, "FALC Framer Version: 2.1 or "
"earlier\n"); "earlier\n");
else if (regval == 0x20) { } else if (regval == 0x20) {
dev_info(&wc->dev->dev, "FALC Framer Version: 3.1\n"); dev_info(&wc->dev->dev, "FALC Framer Version: 3.1\n");
wc->falc31 = 1; wc->falc31 = 1;
} else } else {
dev_info(&wc->dev->dev, "FALC Framer Version: Unknown " dev_info(&wc->dev->dev, "FALC Framer Version: Unknown "
"(VSTR = 0x%02x)\n", regval); "(VSTR = 0x%02x)\n", regval);
}
}
spin_lock_irqsave(&wc->reglock, flags); spin_lock_irqsave(&wc->reglock, flags);
regval = __t4_framer_in(wc, 0, 0xd6); regval = __t4_framer_in(wc, 0, 0xd6);
@ -4362,7 +4639,9 @@ static int __devinit t4_init_one(struct pci_dev *pdev, const struct pci_device_i
spin_lock_init(&wc->reglock); spin_lock_init(&wc->reglock);
wc->devtype = (const struct devtype *)(ent->driver_data); wc->devtype = (const struct devtype *)(ent->driver_data);
if (wc->devtype->flags & FLAG_2PORT) if (is_octal(wc))
wc->numspans = 8;
else if (wc->devtype->flags & FLAG_2PORT)
wc->numspans = 2; wc->numspans = 2;
else else
wc->numspans = 4; wc->numspans = 4;
@ -4439,7 +4718,7 @@ static int __devinit t4_init_one(struct pci_dev *pdev, const struct pci_device_i
#endif #endif
/* Allocate pieces we need here */ /* Allocate pieces we need here */
for (x = 0; x < PORTS_PER_FRAMER; x++) { for (x = 0; x < ports_on_framer(wc); x++) {
struct t4_span *ts; struct t4_span *ts;
enum linemode linemode; enum linemode linemode;
@ -4465,7 +4744,10 @@ static int __devinit t4_init_one(struct pci_dev *pdev, const struct pci_device_i
if (request_irq(pdev->irq, (wc->devtype->flags & FLAG_2NDGEN) ? if (request_irq(pdev->irq, (wc->devtype->flags & FLAG_2NDGEN) ?
t4_interrupt_gen2 : t4_interrupt, t4_interrupt_gen2 : t4_interrupt,
DAHDI_IRQ_SHARED_DISABLED, DAHDI_IRQ_SHARED_DISABLED,
(wc->numspans == 2) ? "wct2xxp" : "wct4xxp", wc)) (wc->numspans == 8) ? "wct8xxp" :
(wc->numspans == 2) ? "wct2xxp" :
"wct4xxp",
wc))
#else #else
if (!(wc->tspans[0]->spanflags & FLAG_2NDGEN)) { if (!(wc->tspans[0]->spanflags & FLAG_2NDGEN)) {
dev_notice(&wc->dev->dev, "This driver does not " dev_notice(&wc->dev->dev, "This driver does not "
@ -4581,7 +4863,7 @@ static void _t4_remove_one(struct t4 *wc)
pci_release_regions(wc->dev); pci_release_regions(wc->dev);
/* Immediately free resources */ /* Immediately free resources */
pci_free_consistent(wc->dev, T4_BASE_SIZE * wc->numbufs * 2, pci_free_consistent(wc->dev, T4_BASE_SIZE(wc) * wc->numbufs * 2,
wc->writechunk, wc->writedma); wc->writechunk, wc->writedma);
order_index[wc->order]--; order_index[wc->order]--;
@ -4605,6 +4887,7 @@ static DEFINE_PCI_DEVICE_TABLE(t4_pci_tbl) =
{ {
{ 0x10ee, 0x0314, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)&wct4xxp }, { 0x10ee, 0x0314, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)&wct4xxp },
{ 0xd161, 0x1820, PCI_ANY_ID, PCI_ANY_ID, 0, 0, (unsigned long)&wct820p5 },
{ 0xd161, 0x1420, 0x0005, PCI_ANY_ID, 0, 0, (unsigned long)&wct420p5 }, { 0xd161, 0x1420, 0x0005, PCI_ANY_ID, 0, 0, (unsigned long)&wct420p5 },
{ 0xd161, 0x1410, 0x0005, PCI_ANY_ID, 0, 0, (unsigned long)&wct410p5 }, { 0xd161, 0x1410, 0x0005, PCI_ANY_ID, 0, 0, (unsigned long)&wct410p5 },
{ 0xd161, 0x1405, 0x0005, PCI_ANY_ID, 0, 0, (unsigned long)&wct405p5 }, { 0xd161, 0x1405, 0x0005, PCI_ANY_ID, 0, 0, (unsigned long)&wct405p5 },
@ -4705,7 +4988,7 @@ static void __exit t4_cleanup(void)
} }
MODULE_AUTHOR("Digium Incorporated <support@digium.com>"); MODULE_AUTHOR("Digium Incorporated <support@digium.com>");
MODULE_DESCRIPTION("Wildcard Dual-/Quad-port Digital Card Driver"); MODULE_DESCRIPTION("Wildcard Dual/Quad/Octal-port Digital Card Driver");
MODULE_ALIAS("wct2xxp"); MODULE_ALIAS("wct2xxp");
MODULE_LICENSE("GPL v2"); MODULE_LICENSE("GPL v2");

34
drivers/dahdi/wct4xxp/vpm450m.c
View File

@ -172,9 +172,9 @@ UINT32 Oct6100UserDriverReadBurstApi(tPOCT6100_READ_BURST_PARAMS f_pBurstParams)
struct vpm450m { struct vpm450m {
tPOCT6100_INSTANCE_API pApiInstance; tPOCT6100_INSTANCE_API pApiInstance;
UINT32 aulEchoChanHndl[128]; UINT32 aulEchoChanHndl[256];
int chanflags[128]; int chanflags[256];
int ecmode[128]; int ecmode[256];
int numchans; int numchans;
}; };
@ -422,6 +422,7 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f
tOCT6100_GET_INSTANCE_SIZE InstanceSize; tOCT6100_GET_INSTANCE_SIZE InstanceSize;
tOCT6100_CHANNEL_OPEN *ChannelOpen; tOCT6100_CHANNEL_OPEN *ChannelOpen;
UINT32 ulResult; UINT32 ulResult;
unsigned int sout_stream, rout_stream;
struct vpm450m *vpm450m; struct vpm450m *vpm450m;
int x,y,law; int x,y,law;
@ -467,15 +468,22 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f
ChipOpen->ulMemoryType = cOCT6100_MEM_TYPE_DDR; ChipOpen->ulMemoryType = cOCT6100_MEM_TYPE_DDR;
ChipOpen->ulMemoryChipSize = cOCT6100_MEMORY_CHIP_SIZE_32MB; ChipOpen->ulMemoryChipSize = cOCT6100_MEMORY_CHIP_SIZE_32MB;
ChipOpen->ulNumMemoryChips = 1; ChipOpen->ulNumMemoryChips = 1;
ChipOpen->ulMaxTdmStreams = 4;
ChipOpen->aulTdmStreamFreqs[0] = cOCT6100_TDM_STREAM_FREQ_8MHZ; ChipOpen->aulTdmStreamFreqs[0] = cOCT6100_TDM_STREAM_FREQ_8MHZ;
ChipOpen->ulTdmSampling = cOCT6100_TDM_SAMPLE_AT_FALLING_EDGE;
ChipOpen->ulMaxFlexibleConfParticipants = 0; ChipOpen->ulMaxFlexibleConfParticipants = 0;
ChipOpen->ulMaxConfBridges = 0; ChipOpen->ulMaxConfBridges = 0;
ChipOpen->ulMaxRemoteDebugSessions = 0; ChipOpen->ulMaxRemoteDebugSessions = 0;
ChipOpen->fEnableChannelRecording = FALSE; ChipOpen->fEnableChannelRecording = FALSE;
ChipOpen->ulSoftToneEventsBufSize = 64; ChipOpen->ulSoftToneEventsBufSize = 64;
if (vpm450m->numchans <= 128) {
ChipOpen->ulMaxTdmStreams = 4;
ChipOpen->ulTdmSampling = cOCT6100_TDM_SAMPLE_AT_FALLING_EDGE;
} else {
ChipOpen->ulMaxTdmStreams = 32;
ChipOpen->fEnableFastH100Mode = TRUE;
ChipOpen->ulTdmSampling = cOCT6100_TDM_SAMPLE_AT_RISING_EDGE;
}
#if 0 #if 0
ChipOpen->fEnableAcousticEcho = TRUE; ChipOpen->fEnableAcousticEcho = TRUE;
#endif #endif
@ -507,7 +515,11 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f
kfree(ChannelOpen); kfree(ChannelOpen);
return NULL; return NULL;
} }
for (x = 0; x < ARRAY_SIZE(vpm450m->aulEchoChanHndl); x++) {
sout_stream = (8 == numspans) ? 29 : 2;
rout_stream = (8 == numspans) ? 24 : 3;
for (x = 0; x < ((8 == numspans) ? 256 : 128); x++) {
/* execute this loop always on 4 span cards but /* execute this loop always on 4 span cards but
* on 2 span cards only execute for the channels related to our spans */ * on 2 span cards only execute for the channels related to our spans */
if (( numspans > 2) || ((x & 0x03) <2)) { if (( numspans > 2) || ((x & 0x03) <2)) {
@ -515,7 +527,7 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f
* therefore, the lower 2 bits tell us which span this * therefore, the lower 2 bits tell us which span this
* timeslot/channel * timeslot/channel
*/ */
if (isalaw[x & 0x03]) if (isalaw[x & 0x07])
law = cOCT6100_PCM_A_LAW; law = cOCT6100_PCM_A_LAW;
else else
law = cOCT6100_PCM_U_LAW; law = cOCT6100_PCM_U_LAW;
@ -529,11 +541,13 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f
ChannelOpen->TdmConfig.ulSinStream = 1; ChannelOpen->TdmConfig.ulSinStream = 1;
ChannelOpen->TdmConfig.ulSinTimeslot = x; ChannelOpen->TdmConfig.ulSinTimeslot = x;
ChannelOpen->TdmConfig.ulSoutPcmLaw = law; ChannelOpen->TdmConfig.ulSoutPcmLaw = law;
ChannelOpen->TdmConfig.ulSoutStream = 2; ChannelOpen->TdmConfig.ulSoutStream = sout_stream;
ChannelOpen->TdmConfig.ulSoutTimeslot = x; ChannelOpen->TdmConfig.ulSoutTimeslot = x;
#if 1
ChannelOpen->TdmConfig.ulRoutPcmLaw = law; ChannelOpen->TdmConfig.ulRoutPcmLaw = law;
ChannelOpen->TdmConfig.ulRoutStream = 3; ChannelOpen->TdmConfig.ulRoutStream = rout_stream;
ChannelOpen->TdmConfig.ulRoutTimeslot = x; ChannelOpen->TdmConfig.ulRoutTimeslot = x;
#endif
ChannelOpen->VqeConfig.fEnableNlp = TRUE; ChannelOpen->VqeConfig.fEnableNlp = TRUE;
ChannelOpen->VqeConfig.fRinDcOffsetRemoval = TRUE; ChannelOpen->VqeConfig.fRinDcOffsetRemoval = TRUE;
ChannelOpen->VqeConfig.fSinDcOffsetRemoval = TRUE; ChannelOpen->VqeConfig.fSinDcOffsetRemoval = TRUE;
@ -543,7 +557,7 @@ struct vpm450m *init_vpm450m(void *wc, int *isalaw, int numspans, const struct f
ulResult = Oct6100ChannelOpen(vpm450m->pApiInstance, ChannelOpen); ulResult = Oct6100ChannelOpen(vpm450m->pApiInstance, ChannelOpen);
if (ulResult != GENERIC_OK) { if (ulResult != GENERIC_OK) {
printk(KERN_NOTICE "Failed to open channel %d!\n", x); printk(KERN_NOTICE "Failed to open channel %d %x!\n", x, ulResult);
continue; continue;
} }
for (y = 0; y < ARRAY_SIZE(tones); y++) { for (y = 0; y < ARRAY_SIZE(tones); y++) {

22
drivers/dahdi/wct4xxp/wct4xxp.h
View File

@ -54,6 +54,12 @@
#define FRMR_SIC3 0x40 #define FRMR_SIC3 0x40
#define FRMR_CMR1 0x44 #define FRMR_CMR1 0x44
#define FRMR_CMR2 0x45 #define FRMR_CMR2 0x45
/* OctalFALC Only */
#define FRMR_CMR4 0x41
#define FRMR_CMR5 0x42
#define FRMR_CMR6 0x43
#define FRMR_GPC2 0x8a
/* End Octal */
#define FRMR_GCR 0x46 #define FRMR_GCR 0x46
#define FRMR_ISR0 0x68 #define FRMR_ISR0 0x68
#define FRMR_ISR0_RME 0x80 #define FRMR_ISR0_RME 0x80
@ -76,6 +82,13 @@
#define FRMR_CIS_GIS2 0x02 #define FRMR_CIS_GIS2 0x02
#define FRMR_CIS_GIS3 0x04 #define FRMR_CIS_GIS3 0x04
#define FRMR_CIS_GIS4 0x08 #define FRMR_CIS_GIS4 0x08
/* CIS - Octal falc bits */
#define FRMR_CIS_GIS5 0x10
#define FRMR_CIS_GIS6 0x20
#define FRMR_CIS_GIS7 0x40
#define FRMR_CIS_GIS8 0x80
#define FRMR_CMDR 0x02 #define FRMR_CMDR 0x02
#define FRMR_CMDR_SRES 0x01 #define FRMR_CMDR_SRES 0x01
#define FRMR_CMDR_XRES 0x10 #define FRMR_CMDR_XRES 0x10
@ -113,6 +126,11 @@ struct t4_regs {
unsigned char regs[NUM_REGS]; unsigned char regs[NUM_REGS];
}; };
struct t4_reg {
unsigned int reg;
unsigned int val;
};
#define T4_CHECK_VPM 0 #define T4_CHECK_VPM 0
#define T4_LOADING_FW 1 #define T4_LOADING_FW 1
#define T4_STOP_DMA 2 #define T4_STOP_DMA 2
@ -120,5 +138,7 @@ struct t4_regs {
#define T4_CHANGE_LATENCY 4 #define T4_CHANGE_LATENCY 4
#define T4_IGNORE_LATENCY 5 #define T4_IGNORE_LATENCY 5
#define WCT4_GET_REGS _IOW (DAHDI_CODE, 60, struct t4_regs) #define WCT4_GET_REGS _IOW(DAHDI_CODE, 60, struct t4_regs)
#define WCT4_GET_REG _IOW(DAHDI_CODE, 61, struct t4_reg)
#define WCT4_SET_REG _IOW(DAHDI_CODE, 62, struct t4_reg)