Skip to content

L
linux-davinci
Commit db9bb63a authored by Karsten Keil's avatar Karsten Keil Committed by David S. Miller
Browse files
Options

mISDN: Add XHFC support for embedded Speech-Design board to hfcmulti 

New version without emulating arch specific stuff for the other
architectures, the special IO and init functions for the 8xx
microcontroller are in a separate include file.
Signed-off-by: default avatarAndreas Eversberg <andreas@eversberg.eu>
Signed-off-by: default avatarKarsten Keil <keil@b1-systems.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5df3b8bc
Hide whitespace changes
Inline Side-by-side
Showing with 500 additions and 144 deletions
drivers/isdn/hardware/mISDN/Kconfig
View file @ db9bb63a
...@@ -13,7 +13,7 @@ config MISDN_HFCPCI ...@@ -13,7 +13,7 @@ config MISDN_HFCPCI
config MISDN_HFCMULTI config MISDN_HFCMULTI
tristate "Support for HFC multiport cards (HFC-4S/8S/E1)" tristate "Support for HFC multiport cards (HFC-4S/8S/E1)"
depends on PCI depends on PCI || 8xx
depends on MISDN depends on MISDN
help help
Enable support for cards with Cologne Chip AG's HFC multiport Enable support for cards with Cologne Chip AG's HFC multiport
...@@ -23,6 +23,15 @@ config MISDN_HFCMULTI ...@@ -23,6 +23,15 @@ config MISDN_HFCMULTI
* HFC-8S (8 S/T interfaces on one chip) * HFC-8S (8 S/T interfaces on one chip)
* HFC-E1 (E1 interface for 2Mbit ISDN) * HFC-E1 (E1 interface for 2Mbit ISDN)
config MISDN_HFCMULTI_8xx
boolean "Support for XHFC embedded board in HFC multiport driver"
depends on MISDN
depends on MISDN_HFCMULTI
depends on 8xx
default 8xx
help
Enable support for the XHFC embedded solution from Speech Design.
config MISDN_HFCUSB config MISDN_HFCUSB
tristate "Support for HFC-S USB based TAs" tristate "Support for HFC-S USB based TAs"
depends on USB depends on USB
......
drivers/isdn/hardware/mISDN/hfc_multi.h
View file @ db9bb63a
...@@ -17,6 +17,16 @@ ...@@ -17,6 +17,16 @@
#define PCI_ENA_REGIO 0x01 #define PCI_ENA_REGIO 0x01
#define PCI_ENA_MEMIO 0x02 #define PCI_ENA_MEMIO 0x02
#define XHFC_IRQ 4 /* SIU_IRQ2 */
#define XHFC_MEMBASE 0xFE000000
#define XHFC_MEMSIZE 0x00001000
#define XHFC_OFFSET 0x00001000
#define PA_XHFC_A0 0x0020 /* PA10 */
#define PB_XHFC_IRQ1 0x00000100 /* PB23 */
#define PB_XHFC_IRQ2 0x00000200 /* PB22 */
#define PB_XHFC_IRQ3 0x00000400 /* PB21 */
#define PB_XHFC_IRQ4 0x00000800 /* PB20 */
/* /*
* NOTE: some registers are assigned multiple times due to different modes * NOTE: some registers are assigned multiple times due to different modes
* also registers are assigned differen for HFC-4s/8s and HFC-E1 * also registers are assigned differen for HFC-4s/8s and HFC-E1
...@@ -81,6 +91,11 @@ struct hfcm_hw { ...@@ -81,6 +91,11 @@ struct hfcm_hw {
#define HFC_CFG_CRC4 10 /* disable CRC-4 Multiframe mode, */ #define HFC_CFG_CRC4 10 /* disable CRC-4 Multiframe mode, */
/* use double frame instead. */ /* use double frame instead. */
#define HFC_TYPE_E1 1 /* controller is HFC-E1 */
#define HFC_TYPE_4S 4 /* controller is HFC-4S */
#define HFC_TYPE_8S 8 /* controller is HFC-8S */
#define HFC_TYPE_XHFC 5 /* controller is XHFC */
#define HFC_CHIP_EXRAM_128 0 /* external ram 128k */ #define HFC_CHIP_EXRAM_128 0 /* external ram 128k */
#define HFC_CHIP_EXRAM_512 1 /* external ram 256k */ #define HFC_CHIP_EXRAM_512 1 /* external ram 256k */
#define HFC_CHIP_REVISION0 2 /* old fifo handling */ #define HFC_CHIP_REVISION0 2 /* old fifo handling */
...@@ -88,19 +103,22 @@ struct hfcm_hw { ...@@ -88,19 +103,22 @@ struct hfcm_hw {
#define HFC_CHIP_PCM_MASTER 4 /* PCM is master */ #define HFC_CHIP_PCM_MASTER 4 /* PCM is master */
#define HFC_CHIP_RX_SYNC 5 /* disable pll sync for pcm */ #define HFC_CHIP_RX_SYNC 5 /* disable pll sync for pcm */
#define HFC_CHIP_DTMF 6 /* DTMF decoding is enabled */ #define HFC_CHIP_DTMF 6 /* DTMF decoding is enabled */
#define HFC_CHIP_ULAW 7 /* ULAW mode */ #define HFC_CHIP_CONF 7 /* conference handling is enabled */
#define HFC_CHIP_CLOCK2 8 /* double clock mode */ #define HFC_CHIP_ULAW 8 /* ULAW mode */
#define HFC_CHIP_E1CLOCK_GET 9 /* always get clock from E1 interface */ #define HFC_CHIP_CLOCK2 9 /* double clock mode */
#define HFC_CHIP_E1CLOCK_PUT 10 /* always put clock from E1 interface */ #define HFC_CHIP_E1CLOCK_GET 10 /* always get clock from E1 interface */
#define HFC_CHIP_WATCHDOG 11 /* whether we should send signals */ #define HFC_CHIP_E1CLOCK_PUT 11 /* always put clock from E1 interface */
#define HFC_CHIP_WATCHDOG 12 /* whether we should send signals */
/* to the watchdog */ /* to the watchdog */
#define HFC_CHIP_B410P 12 /* whether we have a b410p with echocan in */ #define HFC_CHIP_B410P 13 /* whether we have a b410p with echocan in */
/* hw */ /* hw */
#define HFC_CHIP_PLXSD 13 /* whether we have a Speech-Design PLX */ #define HFC_CHIP_PLXSD 14 /* whether we have a Speech-Design PLX */
#define HFC_CHIP_EMBSD 15 /* whether we have a SD Embedded board */
#define HFC_IO_MODE_PCIMEM 0x00 /* normal memory mapped IO */ #define HFC_IO_MODE_PCIMEM 0x00 /* normal memory mapped IO */
#define HFC_IO_MODE_REGIO 0x01 /* PCI io access */ #define HFC_IO_MODE_REGIO 0x01 /* PCI io access */
#define HFC_IO_MODE_PLXSD 0x02 /* access HFC via PLX9030 */ #define HFC_IO_MODE_PLXSD 0x02 /* access HFC via PLX9030 */
#define HFC_IO_MODE_EMBSD 0x03 /* direct access */
/* table entry in the PCI devices list */ /* table entry in the PCI devices list */
struct hm_map { struct hm_map {
...@@ -113,6 +131,7 @@ struct hm_map { ...@@ -113,6 +131,7 @@ struct hm_map {
int opticalsupport; int opticalsupport;
int dip_type; int dip_type;
int io_mode; int io_mode;
int irq;
}; };
struct hfc_multi { struct hfc_multi {
...@@ -120,7 +139,7 @@ struct hfc_multi { ...@@ -120,7 +139,7 @@ struct hfc_multi {
struct hm_map *mtyp; struct hm_map *mtyp;
int id; int id;
int pcm; /* id of pcm bus */ int pcm; /* id of pcm bus */
int type; int ctype; /* controller type */
int ports; int ports;
u_int irq; /* irq used by card */ u_int irq; /* irq used by card */
...@@ -160,10 +179,16 @@ struct hfc_multi { ...@@ -160,10 +179,16 @@ struct hfc_multi {
int len); int len);
void (*write_fifo)(struct hfc_multi *hc, u_char *data, void (*write_fifo)(struct hfc_multi *hc, u_char *data,
int len); int len);
u_long pci_origmembase, plx_origmembase, dsp_origmembase; u_long pci_origmembase, plx_origmembase;
void __iomem *pci_membase; /* PCI memory */ void __iomem *pci_membase; /* PCI memory */
void __iomem *plx_membase; /* PLX memory */ void __iomem *plx_membase; /* PLX memory */
u_char *dsp_membase; /* DSP on PLX */ u_long xhfc_origmembase;
u_char *xhfc_membase;
u_long *xhfc_memaddr, *xhfc_memdata;
#ifdef CONFIG_MISDN_HFCMULTI_8xx
struct immap *immap;
#endif
u_long pb_irqmsk; /* Portbit mask to check the IRQ line */
u_long pci_iobase; /* PCI IO */ u_long pci_iobase; /* PCI IO */
struct hfcm_hw hw; /* remember data of write-only-registers */ struct hfcm_hw hw; /* remember data of write-only-registers */
......
drivers/isdn/hardware/mISDN/hfc_multi_8xx.h 0 → 100644
View file @ db9bb63a
/*
* For License see notice in hfc_multi.c
*
* special IO and init functions for the embedded XHFC board
* from Speech Design
*
*/
#include <asm/8xx_immap.h>
/* Change this to the value used by your board */
#ifndef IMAP_ADDR
#define IMAP_ADDR 0xFFF00000
#endif
static void
#ifdef HFC_REGISTER_DEBUG
HFC_outb_embsd(struct hfc_multi *hc, u_char reg, u_char val,
const char *function, int line)
#else
HFC_outb_embsd(struct hfc_multi *hc, u_char reg, u_char val)
#endif
{
hc->immap->im_ioport.iop_padat |= PA_XHFC_A0;
writeb(reg, hc->xhfc_memaddr);
hc->immap->im_ioport.iop_padat &= ~(PA_XHFC_A0);
writeb(val, hc->xhfc_memdata);
}
static u_char
#ifdef HFC_REGISTER_DEBUG
HFC_inb_embsd(struct hfc_multi *hc, u_char reg, const char *function, int line)
#else
HFC_inb_embsd(struct hfc_multi *hc, u_char reg)
#endif
{
hc->immap->im_ioport.iop_padat |= PA_XHFC_A0;
writeb(reg, hc->xhfc_memaddr);
hc->immap->im_ioport.iop_padat &= ~(PA_XHFC_A0);
return readb(hc->xhfc_memdata);
}
static u_short
#ifdef HFC_REGISTER_DEBUG
HFC_inw_embsd(struct hfc_multi *hc, u_char reg, const char *function, int line)
#else
HFC_inw_embsd(struct hfc_multi *hc, u_char reg)
#endif
{
hc->immap->im_ioport.iop_padat |= PA_XHFC_A0;
writeb(reg, hc->xhfc_memaddr);
hc->immap->im_ioport.iop_padat &= ~(PA_XHFC_A0);
return readb(hc->xhfc_memdata);
}
static void
#ifdef HFC_REGISTER_DEBUG
HFC_wait_embsd(struct hfc_multi *hc, const char *function, int line)
#else
HFC_wait_embsd(struct hfc_multi *hc)
#endif
{
hc->immap->im_ioport.iop_padat |= PA_XHFC_A0;
writeb(R_STATUS, hc->xhfc_memaddr);
hc->immap->im_ioport.iop_padat &= ~(PA_XHFC_A0);
while (readb(hc->xhfc_memdata) & V_BUSY)
cpu_relax();
}
/* write fifo data (EMBSD) */
void
write_fifo_embsd(struct hfc_multi *hc, u_char *data, int len)
{
hc->immap->im_ioport.iop_padat |= PA_XHFC_A0;
*hc->xhfc_memaddr = A_FIFO_DATA0;
hc->immap->im_ioport.iop_padat &= ~(PA_XHFC_A0);
while (len) {
*hc->xhfc_memdata = *data;
data++;
len--;
}
}
/* read fifo data (EMBSD) */
void
read_fifo_embsd(struct hfc_multi *hc, u_char *data, int len)
{
hc->immap->im_ioport.iop_padat |= PA_XHFC_A0;
*hc->xhfc_memaddr = A_FIFO_DATA0;
hc->immap->im_ioport.iop_padat &= ~(PA_XHFC_A0);
while (len) {
*data = (u_char)(*hc->xhfc_memdata);
data++;
len--;
}
}
static int
setup_embedded(struct hfc_multi *hc, struct hm_map *m)
{
printk(KERN_INFO
"HFC-multi: card manufacturer: '%s' card name: '%s' clock: %s\n",
m->vendor_name, m->card_name, m->clock2 ? "double" : "normal");
hc->pci_dev = NULL;
if (m->clock2)
test_and_set_bit(HFC_CHIP_CLOCK2, &hc->chip);
hc->leds = m->leds;
hc->ledstate = 0xAFFEAFFE;
hc->opticalsupport = m->opticalsupport;
hc->pci_iobase = 0;
hc->pci_membase = 0;
hc->xhfc_membase = NULL;
hc->xhfc_memaddr = NULL;
hc->xhfc_memdata = NULL;
/* set memory access methods */
if (m->io_mode) /* use mode from card config */
hc->io_mode = m->io_mode;
switch (hc->io_mode) {
case HFC_IO_MODE_EMBSD:
test_and_set_bit(HFC_CHIP_EMBSD, &hc->chip);
hc->slots = 128; /* required */
/* fall through */
hc->HFC_outb = HFC_outb_embsd;
hc->HFC_inb = HFC_inb_embsd;
hc->HFC_inw = HFC_inw_embsd;
hc->HFC_wait = HFC_wait_embsd;
hc->read_fifo = read_fifo_embsd;
hc->write_fifo = write_fifo_embsd;
hc->xhfc_origmembase = XHFC_MEMBASE + XHFC_OFFSET * hc->id;
hc->xhfc_membase = (u_char *)ioremap(hc->xhfc_origmembase,
XHFC_MEMSIZE);
if (!hc->xhfc_membase) {
printk(KERN_WARNING
"HFC-multi: failed to remap xhfc address space. "
"(internal error)\n");
return -EIO;
}
hc->xhfc_memaddr = (u_long *)(hc->xhfc_membase + 4);
hc->xhfc_memdata = (u_long *)(hc->xhfc_membase);
printk(KERN_INFO
"HFC-multi: xhfc_membase:%#lx xhfc_origmembase:%#lx "
"xhfc_memaddr:%#lx xhfc_memdata:%#lx\n",
(u_long)hc->xhfc_membase, hc->xhfc_origmembase,
(u_long)hc->xhfc_memaddr, (u_long)hc->xhfc_memdata);
break;
default:
printk(KERN_WARNING "HFC-multi: Invalid IO mode.\n");
return -EIO;
}
/* Prepare the MPC8XX PortA 10 as output (address/data selector) */
hc->immap = (struct immap *)(IMAP_ADDR);
hc->immap->im_ioport.iop_papar &= ~(PA_XHFC_A0);
hc->immap->im_ioport.iop_paodr &= ~(PA_XHFC_A0);
hc->immap->im_ioport.iop_padir |= PA_XHFC_A0;
/* Prepare the MPC8xx PortB __X__ as input (ISDN__X__IRQ) */
hc->pb_irqmsk = (PB_XHFC_IRQ1 << hc->id);
hc->immap->im_cpm.cp_pbpar &= ~(hc->pb_irqmsk);
hc->immap->im_cpm.cp_pbodr &= ~(hc->pb_irqmsk);
hc->immap->im_cpm.cp_pbdir &= ~(hc->pb_irqmsk);
/* At this point the needed config is done */
/* fifos are still not enabled */
return 0;
}
drivers/isdn/hardware/mISDN/hfcmulti.c
View file @ db9bb63a
...@@ -139,6 +139,10 @@ ...@@ -139,6 +139,10 @@
* Selects interface with clock source for mISDN and applications. * Selects interface with clock source for mISDN and applications.
* Set to card number starting with 1. Set to -1 to disable. * Set to card number starting with 1. Set to -1 to disable.
* By default, the first card is used as clock source. * By default, the first card is used as clock source.
*
* hwid:
* NOTE: only one hwid value must be given once
* Enable special embedded devices with XHFC controllers.
*/ */
/* /*
...@@ -206,6 +210,11 @@ static int clock; ...@@ -206,6 +210,11 @@ static int clock;
static uint timer; static uint timer;
static uint clockdelay_te = CLKDEL_TE; static uint clockdelay_te = CLKDEL_TE;
static uint clockdelay_nt = CLKDEL_NT; static uint clockdelay_nt = CLKDEL_NT;
#define HWID_NONE 0
#define HWID_MINIP4 1
#define HWID_MINIP8 2
#define HWID_MINIP16 3
static uint hwid = HWID_NONE;
static int HFC_cnt, Port_cnt, PCM_cnt = 99; static int HFC_cnt, Port_cnt, PCM_cnt = 99;
...@@ -223,6 +232,7 @@ module_param_array(pcm, int, NULL, S_IRUGO | S_IWUSR); ...@@ -223,6 +232,7 @@ module_param_array(pcm, int, NULL, S_IRUGO | S_IWUSR);
module_param_array(dslot, int, NULL, S_IRUGO | S_IWUSR); module_param_array(dslot, int, NULL, S_IRUGO | S_IWUSR);
module_param_array(iomode, uint, NULL, S_IRUGO | S_IWUSR); module_param_array(iomode, uint, NULL, S_IRUGO | S_IWUSR);
module_param_array(port, uint, NULL, S_IRUGO | S_IWUSR); module_param_array(port, uint, NULL, S_IRUGO | S_IWUSR);
module_param(hwid, uint, S_IRUGO | S_IWUSR); /* The hardware ID */
#ifdef HFC_REGISTER_DEBUG #ifdef HFC_REGISTER_DEBUG
#define HFC_outb(hc, reg, val) \ #define HFC_outb(hc, reg, val) \
...@@ -252,6 +262,10 @@ module_param_array(port, uint, NULL, S_IRUGO | S_IWUSR); ...@@ -252,6 +262,10 @@ module_param_array(port, uint, NULL, S_IRUGO | S_IWUSR);
#define HFC_wait_nodebug(hc) (hc->HFC_wait_nodebug(hc)) #define HFC_wait_nodebug(hc) (hc->HFC_wait_nodebug(hc))
#endif #endif
#ifdef CONFIG_MISDN_HFCMULTI_8xx
#include "hfc_multi_8xx.h"
#endif
/* HFC_IO_MODE_PCIMEM */ /* HFC_IO_MODE_PCIMEM */
static void static void
#ifdef HFC_REGISTER_DEBUG #ifdef HFC_REGISTER_DEBUG
...@@ -928,7 +942,7 @@ hfcmulti_resync(struct hfc_multi *locked, struct hfc_multi *newmaster, int rm) ...@@ -928,7 +942,7 @@ hfcmulti_resync(struct hfc_multi *locked, struct hfc_multi *newmaster, int rm)
writel(pv, plx_acc_32); writel(pv, plx_acc_32);
if (test_bit(HFC_CHIP_PCM_MASTER, &hc->chip)) { if (test_bit(HFC_CHIP_PCM_MASTER, &hc->chip)) {
pcmmaster = hc; pcmmaster = hc;
if (hc->type == 1) { if (hc->ctype == HFC_TYPE_E1) {
if (debug & DEBUG_HFCMULTI_PLXSD) if (debug & DEBUG_HFCMULTI_PLXSD)
printk(KERN_DEBUG printk(KERN_DEBUG
"Schedule SYNC_I\n"); "Schedule SYNC_I\n");
...@@ -949,7 +963,8 @@ hfcmulti_resync(struct hfc_multi *locked, struct hfc_multi *newmaster, int rm) ...@@ -949,7 +963,8 @@ hfcmulti_resync(struct hfc_multi *locked, struct hfc_multi *newmaster, int rm)
pv |= PLX_SYNC_O_EN; pv |= PLX_SYNC_O_EN;
writel(pv, plx_acc_32); writel(pv, plx_acc_32);
/* switch to jatt PLL, if not disabled by RX_SYNC */ /* switch to jatt PLL, if not disabled by RX_SYNC */
if (hc->type == 1 && !test_bit(HFC_CHIP_RX_SYNC, &hc->chip)) { if (hc->ctype == HFC_TYPE_E1
&& !test_bit(HFC_CHIP_RX_SYNC, &hc->chip)) {
if (debug & DEBUG_HFCMULTI_PLXSD) if (debug & DEBUG_HFCMULTI_PLXSD)
printk(KERN_DEBUG "Schedule jatt PLL\n"); printk(KERN_DEBUG "Schedule jatt PLL\n");
hc->e1_resync |= 2; /* switch to jatt */ hc->e1_resync |= 2; /* switch to jatt */
...@@ -961,7 +976,7 @@ hfcmulti_resync(struct hfc_multi *locked, struct hfc_multi *newmaster, int rm) ...@@ -961,7 +976,7 @@ hfcmulti_resync(struct hfc_multi *locked, struct hfc_multi *newmaster, int rm)
printk(KERN_DEBUG printk(KERN_DEBUG
"id=%d (0x%p) = PCM master syncronized " "id=%d (0x%p) = PCM master syncronized "
"with QUARTZ\n", hc->id, hc); "with QUARTZ\n", hc->id, hc);
if (hc->type == 1) { if (hc->ctype == HFC_TYPE_E1) {
/* Use the crystal clock for the PCM /* Use the crystal clock for the PCM
master card */ master card */
if (debug & DEBUG_HFCMULTI_PLXSD) if (debug & DEBUG_HFCMULTI_PLXSD)
...@@ -972,7 +987,7 @@ hfcmulti_resync(struct hfc_multi *locked, struct hfc_multi *newmaster, int rm) ...@@ -972,7 +987,7 @@ hfcmulti_resync(struct hfc_multi *locked, struct hfc_multi *newmaster, int rm)
if (debug & DEBUG_HFCMULTI_PLXSD) if (debug & DEBUG_HFCMULTI_PLXSD)
printk(KERN_DEBUG printk(KERN_DEBUG
"QUARTZ is automatically " "QUARTZ is automatically "
"enabled by HFC-%dS\n", hc->type); "enabled by HFC-%dS\n", hc->ctype);
} }
plx_acc_32 = hc->plx_membase + PLX_GPIOC; plx_acc_32 = hc->plx_membase + PLX_GPIOC;
pv = readl(plx_acc_32); pv = readl(plx_acc_32);
...@@ -1060,13 +1075,16 @@ release_io_hfcmulti(struct hfc_multi *hc) ...@@ -1060,13 +1075,16 @@ release_io_hfcmulti(struct hfc_multi *hc)
/* disable memory mapped ports / io ports */ /* disable memory mapped ports / io ports */
test_and_clear_bit(HFC_CHIP_PLXSD, &hc->chip); /* prevent resync */ test_and_clear_bit(HFC_CHIP_PLXSD, &hc->chip); /* prevent resync */
pci_write_config_word(hc->pci_dev, PCI_COMMAND, 0); if (hc->pci_dev)
pci_write_config_word(hc->pci_dev, PCI_COMMAND, 0);
if (hc->pci_membase) if (hc->pci_membase)
iounmap(hc->pci_membase); iounmap(hc->pci_membase);
if (hc->plx_membase) if (hc->plx_membase)
iounmap(hc->plx_membase); iounmap(hc->plx_membase);
if (hc->pci_iobase) if (hc->pci_iobase)
release_region(hc->pci_iobase, 8); release_region(hc->pci_iobase, 8);
if (hc->xhfc_membase)
iounmap((void *)hc->xhfc_membase);
if (hc->pci_dev) { if (hc->pci_dev) {
pci_disable_device(hc->pci_dev); pci_disable_device(hc->pci_dev);
...@@ -1100,8 +1118,9 @@ init_chip(struct hfc_multi *hc) ...@@ -1100,8 +1118,9 @@ init_chip(struct hfc_multi *hc)
/* revision check */ /* revision check */
if (debug & DEBUG_HFCMULTI_INIT) if (debug & DEBUG_HFCMULTI_INIT)
printk(KERN_DEBUG "%s: entered\n", __func__); printk(KERN_DEBUG "%s: entered\n", __func__);
val = HFC_inb(hc, R_CHIP_ID)>>4; val = HFC_inb(hc, R_CHIP_ID);
if (val != 0x8 && val != 0xc && val != 0xe) { if ((val>>4) != 0x8 && (val>>4) != 0xc && (val>>4) != 0xe
&& (val>>1) != 0x31) {
printk(KERN_INFO "HFC_multi: unknown CHIP_ID:%x\n", (u_int)val); printk(KERN_INFO "HFC_multi: unknown CHIP_ID:%x\n", (u_int)val);
err = -EIO; err = -EIO;
goto out; goto out;
...@@ -1109,8 +1128,9 @@ init_chip(struct hfc_multi *hc) ...@@ -1109,8 +1128,9 @@ init_chip(struct hfc_multi *hc)
rev = HFC_inb(hc, R_CHIP_RV); rev = HFC_inb(hc, R_CHIP_RV);
printk(KERN_INFO printk(KERN_INFO
"HFC_multi: detected HFC with chip ID=0x%lx revision=%ld%s\n", "HFC_multi: detected HFC with chip ID=0x%lx revision=%ld%s\n",
val, rev, (rev == 0) ? " (old FIFO handling)" : ""); val, rev, (rev == 0 && (hc->ctype != HFC_TYPE_XHFC)) ?
if (rev == 0) { " (old FIFO handling)" : "");
if (hc->ctype != HFC_TYPE_XHFC && rev == 0) {
test_and_set_bit(HFC_CHIP_REVISION0, &hc->chip); test_and_set_bit(HFC_CHIP_REVISION0, &hc->chip);
printk(KERN_WARNING printk(KERN_WARNING
"HFC_multi: NOTE: Your chip is revision 0, " "HFC_multi: NOTE: Your chip is revision 0, "
...@@ -1152,6 +1172,12 @@ init_chip(struct hfc_multi *hc) ...@@ -1152,6 +1172,12 @@ init_chip(struct hfc_multi *hc)
hc->Zlen = 8000; hc->Zlen = 8000;
hc->DTMFbase = 0x2000; hc->DTMFbase = 0x2000;
} }
if (hc->ctype == HFC_TYPE_XHFC) {
hc->Flen = 0x8;
hc->Zmin = 0x0;
hc->Zlen = 64;
hc->DTMFbase = 0x0;
}
hc->max_trans = poll << 1; hc->max_trans = poll << 1;
if (hc->max_trans > hc->Zlen) if (hc->max_trans > hc->Zlen)
hc->max_trans = hc->Zlen; hc->max_trans = hc->Zlen;
...@@ -1211,6 +1237,9 @@ init_chip(struct hfc_multi *hc) ...@@ -1211,6 +1237,9 @@ init_chip(struct hfc_multi *hc)
hc->hw.r_pcm_md0 = V_F0_LEN; /* shift clock for DSP */ hc->hw.r_pcm_md0 = V_F0_LEN; /* shift clock for DSP */
} }
if (test_bit(HFC_CHIP_EMBSD, &hc->chip))
hc->hw.r_pcm_md0 = V_F0_LEN; /* shift clock for DSP */
/* we only want the real Z2 read-pointer for revision > 0 */ /* we only want the real Z2 read-pointer for revision > 0 */
if (!test_bit(HFC_CHIP_REVISION0, &hc->chip)) if (!test_bit(HFC_CHIP_REVISION0, &hc->chip))
hc->hw.r_ram_sz |= V_FZ_MD; hc->hw.r_ram_sz |= V_FZ_MD;
...@@ -1234,15 +1263,24 @@ init_chip(struct hfc_multi *hc) ...@@ -1234,15 +1263,24 @@ init_chip(struct hfc_multi *hc)
/* soft reset */ /* soft reset */
HFC_outb(hc, R_CTRL, hc->hw.r_ctrl); HFC_outb(hc, R_CTRL, hc->hw.r_ctrl);
HFC_outb(hc, R_RAM_SZ, hc->hw.r_ram_sz); if (hc->ctype == HFC_TYPE_XHFC)
HFC_outb(hc, 0x0C /* R_FIFO_THRES */,
0x11 /* 16 Bytes TX/RX */);
else
HFC_outb(hc, R_RAM_SZ, hc->hw.r_ram_sz);
HFC_outb(hc, R_FIFO_MD, 0); HFC_outb(hc, R_FIFO_MD, 0);
hc->hw.r_cirm = V_SRES | V_HFCRES | V_PCMRES | V_STRES | V_RLD_EPR; if (hc->ctype == HFC_TYPE_XHFC)
hc->hw.r_cirm = V_SRES | V_HFCRES | V_PCMRES | V_STRES;
else
hc->hw.r_cirm = V_SRES | V_HFCRES | V_PCMRES | V_STRES
| V_RLD_EPR;
HFC_outb(hc, R_CIRM, hc->hw.r_cirm); HFC_outb(hc, R_CIRM, hc->hw.r_cirm);
udelay(100); udelay(100);
hc->hw.r_cirm = 0; hc->hw.r_cirm = 0;
HFC_outb(hc, R_CIRM, hc->hw.r_cirm); HFC_outb(hc, R_CIRM, hc->hw.r_cirm);
udelay(100); udelay(100);
HFC_outb(hc, R_RAM_SZ, hc->hw.r_ram_sz); if (hc->ctype != HFC_TYPE_XHFC)
HFC_outb(hc, R_RAM_SZ, hc->hw.r_ram_sz);
/* Speech Design PLX bridge pcm and sync mode */ /* Speech Design PLX bridge pcm and sync mode */
if (test_bit(HFC_CHIP_PLXSD, &hc->chip)) { if (test_bit(HFC_CHIP_PLXSD, &hc->chip)) {
...@@ -1278,13 +1316,16 @@ init_chip(struct hfc_multi *hc) ...@@ -1278,13 +1316,16 @@ init_chip(struct hfc_multi *hc)
HFC_outb(hc, R_PCM_MD0, hc->hw.r_pcm_md0 | 0xa0); HFC_outb(hc, R_PCM_MD0, hc->hw.r_pcm_md0 | 0xa0);
if (test_bit(HFC_CHIP_PLXSD, &hc->chip)) if (test_bit(HFC_CHIP_PLXSD, &hc->chip))
HFC_outb(hc, R_PCM_MD2, V_SYNC_SRC); /* sync via SYNC_I / O */ HFC_outb(hc, R_PCM_MD2, V_SYNC_SRC); /* sync via SYNC_I / O */
else if (test_bit(HFC_CHIP_EMBSD, &hc->chip))
HFC_outb(hc, R_PCM_MD2, 0x10); /* V_C2O_EN */
else else
HFC_outb(hc, R_PCM_MD2, 0x00); /* sync from interface */ HFC_outb(hc, R_PCM_MD2, 0x00); /* sync from interface */
HFC_outb(hc, R_PCM_MD0, hc->hw.r_pcm_md0 | 0x00); HFC_outb(hc, R_PCM_MD0, hc->hw.r_pcm_md0 | 0x00);
for (i = 0; i < 256; i++) { for (i = 0; i < 256; i++) {
HFC_outb_nodebug(hc, R_SLOT, i); HFC_outb_nodebug(hc, R_SLOT, i);
HFC_outb_nodebug(hc, A_SL_CFG, 0); HFC_outb_nodebug(hc, A_SL_CFG, 0);
HFC_outb_nodebug(hc, A_CONF, 0); if (hc->ctype != HFC_TYPE_XHFC)
HFC_outb_nodebug(hc, A_CONF, 0);
hc->slot_owner[i] = -1; hc->slot_owner[i] = -1;
} }
...@@ -1296,6 +1337,9 @@ init_chip(struct hfc_multi *hc) ...@@ -1296,6 +1337,9 @@ init_chip(struct hfc_multi *hc)
HFC_outb(hc, R_BRG_PCM_CFG, V_PCM_CLK); HFC_outb(hc, R_BRG_PCM_CFG, V_PCM_CLK);
} }
if (test_bit(HFC_CHIP_EMBSD, &hc->chip))
HFC_outb(hc, 0x02 /* R_CLK_CFG */, 0x40 /* V_CLKO_OFF */);
/* B410P GPIO */ /* B410P GPIO */
if (test_bit(HFC_CHIP_B410P, &hc->chip)) { if (test_bit(HFC_CHIP_B410P, &hc->chip)) {
printk(KERN_NOTICE "Setting GPIOs\n"); printk(KERN_NOTICE "Setting GPIOs\n");
...@@ -1424,7 +1468,7 @@ controller_fail: ...@@ -1424,7 +1468,7 @@ controller_fail:
hc->hw.r_irqmsk_misc |= V_TI_IRQMSK; hc->hw.r_irqmsk_misc |= V_TI_IRQMSK;
/* set E1 state machine IRQ */ /* set E1 state machine IRQ */
if (hc->type == 1) if (hc->ctype == HFC_TYPE_E1)
hc->hw.r_irqmsk_misc |= V_STA_IRQMSK; hc->hw.r_irqmsk_misc |= V_STA_IRQMSK;
/* set DTMF detection */ /* set DTMF detection */
...@@ -1444,7 +1488,8 @@ controller_fail: ...@@ -1444,7 +1488,8 @@ controller_fail:
r_conf_en = V_CONF_EN | V_ULAW; r_conf_en = V_CONF_EN | V_ULAW;
else else
r_conf_en = V_CONF_EN; r_conf_en = V_CONF_EN;
HFC_outb(hc, R_CONF_EN, r_conf_en); if (hc->ctype != HFC_TYPE_XHFC)
HFC_outb(hc, R_CONF_EN, r_conf_en);
/* setting leds */ /* setting leds */
switch (hc->leds) { switch (hc->leds) {
...@@ -1468,16 +1513,23 @@ controller_fail: ...@@ -1468,16 +1513,23 @@ controller_fail:
break; break;
} }
if (test_bit(HFC_CHIP_EMBSD, &hc->chip)) {
hc->hw.r_st_sync = 0x10; /* V_AUTO_SYNCI */
HFC_outb(hc, R_ST_SYNC, hc->hw.r_st_sync);
}
/* set master clock */ /* set master clock */
if (hc->masterclk >= 0) { if (hc->masterclk >= 0) {
if (debug & DEBUG_HFCMULTI_INIT) if (debug & DEBUG_HFCMULTI_INIT)
printk(KERN_DEBUG "%s: setting ST master clock " printk(KERN_DEBUG "%s: setting ST master clock "
"to port %d (0..%d)\n", "to port %d (0..%d)\n",
__func__, hc->masterclk, hc->ports-1); __func__, hc->masterclk, hc->ports-1);
hc->hw.r_st_sync = hc->masterclk | V_AUTO_SYNC; hc->hw.r_st_sync |= (hc->masterclk | V_AUTO_SYNC);
HFC_outb(hc, R_ST_SYNC, hc->hw.r_st_sync); HFC_outb(hc, R_ST_SYNC, hc->hw.r_st_sync);
} }
/* setting misc irq */ /* setting misc irq */
HFC_outb(hc, R_IRQMSK_MISC, hc->hw.r_irqmsk_misc); HFC_outb(hc, R_IRQMSK_MISC, hc->hw.r_irqmsk_misc);
if (debug & DEBUG_HFCMULTI_INIT) if (debug & DEBUG_HFCMULTI_INIT)
...@@ -1929,7 +1981,7 @@ next_frame: ...@@ -1929,7 +1981,7 @@ next_frame:
Fspace = 1; Fspace = 1;
} }
/* one frame only for ST D-channels, to allow resending */ /* one frame only for ST D-channels, to allow resending */
if (hc->type != 1 && dch) { if (hc->ctype != HFC_TYPE_E1 && dch) {
if (f1 != f2) if (f1 != f2)
Fspace = 0; Fspace = 0;
} }
...@@ -1971,12 +2023,22 @@ next_frame: ...@@ -1971,12 +2023,22 @@ next_frame:
"slot_tx %d\n", "slot_tx %d\n",
__func__, ch, slot_tx); __func__, ch, slot_tx);
/* connect slot */ /* connect slot */
HFC_outb(hc, A_CON_HDLC, 0xc0 | 0x00 | if (hc->ctype == HFC_TYPE_XHFC)
V_HDLC_TRP | V_IFF); HFC_outb(hc, A_CON_HDLC, 0xc0
| 0x07 << 2 | V_HDLC_TRP | V_IFF);
/* Enable FIFO, no interrupt */
else
HFC_outb(hc, A_CON_HDLC, 0xc0 | 0x00 |
V_HDLC_TRP | V_IFF);
HFC_outb_nodebug(hc, R_FIFO, ch<<1 | 1); HFC_outb_nodebug(hc, R_FIFO, ch<<1 | 1);
HFC_wait_nodebug(hc); HFC_wait_nodebug(hc);
HFC_outb(hc, A_CON_HDLC, 0xc0 | 0x00 | if (hc->ctype == HFC_TYPE_XHFC)
V_HDLC_TRP | V_IFF); HFC_outb(hc, A_CON_HDLC, 0xc0
| 0x07 << 2 | V_HDLC_TRP | V_IFF);
/* Enable FIFO, no interrupt */
else
HFC_outb(hc, A_CON_HDLC, 0xc0 | 0x00 |
V_HDLC_TRP | V_IFF);
HFC_outb_nodebug(hc, R_FIFO, ch<<1); HFC_outb_nodebug(hc, R_FIFO, ch<<1);
HFC_wait_nodebug(hc); HFC_wait_nodebug(hc);
} }
...@@ -2004,10 +2066,22 @@ next_frame: ...@@ -2004,10 +2066,22 @@ next_frame:
"FIFO data: channel %d slot_tx %d\n", "FIFO data: channel %d slot_tx %d\n",
__func__, ch, slot_tx); __func__, ch, slot_tx);
/* disconnect slot */ /* disconnect slot */
HFC_outb(hc, A_CON_HDLC, 0x80 | 0x00 | V_HDLC_TRP | V_IFF); if (hc->ctype == HFC_TYPE_XHFC)
HFC_outb(hc, A_CON_HDLC, 0x80
| 0x07 << 2 | V_HDLC_TRP | V_IFF);
/* Enable FIFO, no interrupt */
else
HFC_outb(hc, A_CON_HDLC, 0x80 | 0x00 |
V_HDLC_TRP | V_IFF);
HFC_outb_nodebug(hc, R_FIFO, ch<<1 | 1); HFC_outb_nodebug(hc, R_FIFO, ch<<1 | 1);
HFC_wait_nodebug(hc); HFC_wait_nodebug(hc);
HFC_outb(hc, A_CON_HDLC, 0x80 | 0x00 | V_HDLC_TRP | V_IFF); if (hc->ctype == HFC_TYPE_XHFC)
HFC_outb(hc, A_CON_HDLC, 0x80
| 0x07 << 2 | V_HDLC_TRP | V_IFF);
/* Enable FIFO, no interrupt */
else
HFC_outb(hc, A_CON_HDLC, 0x80 | 0x00 |
V_HDLC_TRP | V_IFF);
HFC_outb_nodebug(hc, R_FIFO, ch<<1); HFC_outb_nodebug(hc, R_FIFO, ch<<1);
HFC_wait_nodebug(hc); HFC_wait_nodebug(hc);
} }
...@@ -2327,7 +2401,7 @@ handle_timer_irq(struct hfc_multi *hc) ...@@ -2327,7 +2401,7 @@ handle_timer_irq(struct hfc_multi *hc)
spin_unlock_irqrestore(&HFClock, flags); spin_unlock_irqrestore(&HFClock, flags);
} }
if (hc->type != 1 || hc->e1_state == 1) if (hc->ctype != HFC_TYPE_E1 || hc->e1_state == 1)
for (ch = 0; ch <= 31; ch++) { for (ch = 0; ch <= 31; ch++) {
if (hc->created[hc->chan[ch].port]) { if (hc->created[hc->chan[ch].port]) {
hfcmulti_tx(hc, ch); hfcmulti_tx(hc, ch);
...@@ -2350,7 +2424,7 @@ handle_timer_irq(struct hfc_multi *hc) ...@@ -2350,7 +2424,7 @@ handle_timer_irq(struct hfc_multi *hc)
} }
} }
} }
if (hc->type == 1 && hc->created[0]) { if (hc->ctype == HFC_TYPE_E1 && hc->created[0]) {
dch = hc->chan[hc->dslot].dch; dch = hc->chan[hc->dslot].dch;
if (test_bit(HFC_CFG_REPORT_LOS, &hc->chan[hc->dslot].cfg)) { if (test_bit(HFC_CFG_REPORT_LOS, &hc->chan[hc->dslot].cfg)) {
/* LOS */ /* LOS */
...@@ -2610,7 +2684,10 @@ hfcmulti_interrupt(int intno, void *dev_id) ...@@ -2610,7 +2684,10 @@ hfcmulti_interrupt(int intno, void *dev_id)
"card %d, this is no bug.\n", hc->id + 1, irqsem); "card %d, this is no bug.\n", hc->id + 1, irqsem);
irqsem = hc->id + 1; irqsem = hc->id + 1;
#endif #endif
#ifdef CONFIG_MISDN_HFCMULTI_8xx
if (hc->immap->im_cpm.cp_pbdat & hc->pb_irqmsk)
goto irq_notforus;
#endif
if (test_bit(HFC_CHIP_PLXSD, &hc->chip)) { if (test_bit(HFC_CHIP_PLXSD, &hc->chip)) {
spin_lock_irqsave(&plx_lock, flags); spin_lock_irqsave(&plx_lock, flags);
plx_acc = hc->plx_membase + PLX_INTCSR; plx_acc = hc->plx_membase + PLX_INTCSR;
...@@ -2650,7 +2727,7 @@ hfcmulti_interrupt(int intno, void *dev_id) ...@@ -2650,7 +2727,7 @@ hfcmulti_interrupt(int intno, void *dev_id)
} }
hc->irqcnt++; hc->irqcnt++;
if (r_irq_statech) { if (r_irq_statech) {
if (hc->type != 1) if (hc->ctype != HFC_TYPE_E1)
ph_state_irq(hc, r_irq_statech); ph_state_irq(hc, r_irq_statech);
} }
if (status & V_EXT_IRQSTA) if (status & V_EXT_IRQSTA)
...@@ -2664,7 +2741,7 @@ hfcmulti_interrupt(int intno, void *dev_id) ...@@ -2664,7 +2741,7 @@ hfcmulti_interrupt(int intno, void *dev_id)
r_irq_misc = HFC_inb_nodebug(hc, R_IRQ_MISC); r_irq_misc = HFC_inb_nodebug(hc, R_IRQ_MISC);
r_irq_misc &= hc->hw.r_irqmsk_misc; /* ignore disabled irqs */ r_irq_misc &= hc->hw.r_irqmsk_misc; /* ignore disabled irqs */
if (r_irq_misc & V_STA_IRQ) { if (r_irq_misc & V_STA_IRQ) {
if (hc->type == 1) { if (hc->ctype == HFC_TYPE_E1) {
/* state machine */ /* state machine */
dch = hc->chan[hc->dslot].dch; dch = hc->chan[hc->dslot].dch;
e1_syncsta = HFC_inb_nodebug(hc, R_SYNC_STA); e1_syncsta = HFC_inb_nodebug(hc, R_SYNC_STA);
...@@ -2786,7 +2863,8 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx, ...@@ -2786,7 +2863,8 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx,
if (hc->slot_owner[oslot_tx<<1] == ch) { if (hc->slot_owner[oslot_tx<<1] == ch) {
HFC_outb(hc, R_SLOT, oslot_tx << 1); HFC_outb(hc, R_SLOT, oslot_tx << 1);
HFC_outb(hc, A_SL_CFG, 0); HFC_outb(hc, A_SL_CFG, 0);
HFC_outb(hc, A_CONF, 0); if (hc->ctype != HFC_TYPE_XHFC)
HFC_outb(hc, A_CONF, 0);
hc->slot_owner[oslot_tx<<1] = -1; hc->slot_owner[oslot_tx<<1] = -1;
} else { } else {
if (debug & DEBUG_HFCMULTI_MODE) if (debug & DEBUG_HFCMULTI_MODE)
...@@ -2839,7 +2917,9 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx, ...@@ -2839,7 +2917,9 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx,
flow_tx, routing, conf); flow_tx, routing, conf);
HFC_outb(hc, R_SLOT, slot_tx << 1); HFC_outb(hc, R_SLOT, slot_tx << 1);
HFC_outb(hc, A_SL_CFG, (ch<<1) | routing); HFC_outb(hc, A_SL_CFG, (ch<<1) | routing);
HFC_outb(hc, A_CONF, (conf < 0) ? 0 : (conf | V_CONF_SL)); if (hc->ctype != HFC_TYPE_XHFC)
HFC_outb(hc, A_CONF,
(conf < 0) ? 0 : (conf | V_CONF_SL));
hc->slot_owner[slot_tx << 1] = ch; hc->slot_owner[slot_tx << 1] = ch;
hc->chan[ch].slot_tx = slot_tx; hc->chan[ch].slot_tx = slot_tx;
hc->chan[ch].bank_tx = bank_tx; hc->chan[ch].bank_tx = bank_tx;
...@@ -2889,7 +2969,7 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx, ...@@ -2889,7 +2969,7 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx,
HFC_outb(hc, A_IRQ_MSK, 0); HFC_outb(hc, A_IRQ_MSK, 0);
HFC_outb(hc, R_INC_RES_FIFO, V_RES_F); HFC_outb(hc, R_INC_RES_FIFO, V_RES_F);
HFC_wait(hc); HFC_wait(hc);
if (hc->chan[ch].bch && hc->type != 1) { if (hc->chan[ch].bch && hc->ctype != HFC_TYPE_E1) {
hc->hw.a_st_ctrl0[hc->chan[ch].port] &= hc->hw.a_st_ctrl0[hc->chan[ch].port] &=
((ch & 0x3) == 0)? ~V_B1_EN: ~V_B2_EN; ((ch & 0x3) == 0)? ~V_B1_EN: ~V_B2_EN;
HFC_outb(hc, R_ST_SEL, hc->chan[ch].port); HFC_outb(hc, R_ST_SEL, hc->chan[ch].port);
...@@ -2965,8 +3045,13 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx, ...@@ -2965,8 +3045,13 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx,
/* enable TX fifo */ /* enable TX fifo */
HFC_outb(hc, R_FIFO, ch << 1); HFC_outb(hc, R_FIFO, ch << 1);
HFC_wait(hc); HFC_wait(hc);
HFC_outb(hc, A_CON_HDLC, flow_tx | 0x00 | if (hc->ctype == HFC_TYPE_XHFC)
V_HDLC_TRP | V_IFF); HFC_outb(hc, A_CON_HDLC, flow_tx | 0x07 << 2 |
V_HDLC_TRP | V_IFF);
/* Enable FIFO, no interrupt */
else
HFC_outb(hc, A_CON_HDLC, flow_tx | 0x00 |
V_HDLC_TRP | V_IFF);
HFC_outb(hc, A_SUBCH_CFG, 0); HFC_outb(hc, A_SUBCH_CFG, 0);
HFC_outb(hc, A_IRQ_MSK, 0); HFC_outb(hc, A_IRQ_MSK, 0);
HFC_outb(hc, R_INC_RES_FIFO, V_RES_F); HFC_outb(hc, R_INC_RES_FIFO, V_RES_F);
...@@ -2976,13 +3061,19 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx, ...@@ -2976,13 +3061,19 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx,
/* enable RX fifo */ /* enable RX fifo */
HFC_outb(hc, R_FIFO, (ch<<1)|1); HFC_outb(hc, R_FIFO, (ch<<1)|1);
HFC_wait(hc); HFC_wait(hc);
HFC_outb(hc, A_CON_HDLC, flow_rx | 0x00 | V_HDLC_TRP); if (hc->ctype == HFC_TYPE_XHFC)
HFC_outb(hc, A_CON_HDLC, flow_rx | 0x07 << 2 |
V_HDLC_TRP);
/* Enable FIFO, no interrupt*/
else
HFC_outb(hc, A_CON_HDLC, flow_rx | 0x00 |
V_HDLC_TRP);
HFC_outb(hc, A_SUBCH_CFG, 0); HFC_outb(hc, A_SUBCH_CFG, 0);
HFC_outb(hc, A_IRQ_MSK, 0); HFC_outb(hc, A_IRQ_MSK, 0);
HFC_outb(hc, R_INC_RES_FIFO, V_RES_F); HFC_outb(hc, R_INC_RES_FIFO, V_RES_F);
HFC_wait(hc); HFC_wait(hc);
} }
if (hc->type != 1) { if (hc->ctype != HFC_TYPE_E1) {
hc->hw.a_st_ctrl0[hc->chan[ch].port] |= hc->hw.a_st_ctrl0[hc->chan[ch].port] |=
((ch & 0x3) == 0) ? V_B1_EN : V_B2_EN; ((ch & 0x3) == 0) ? V_B1_EN : V_B2_EN;
HFC_outb(hc, R_ST_SEL, hc->chan[ch].port); HFC_outb(hc, R_ST_SEL, hc->chan[ch].port);
...@@ -3003,7 +3094,7 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx, ...@@ -3003,7 +3094,7 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx,
/* enable TX fifo */ /* enable TX fifo */
HFC_outb(hc, R_FIFO, ch<<1); HFC_outb(hc, R_FIFO, ch<<1);
HFC_wait(hc); HFC_wait(hc);
if (hc->type == 1 || hc->chan[ch].bch) { if (hc->ctype == HFC_TYPE_E1 || hc->chan[ch].bch) {
/* E1 or B-channel */ /* E1 or B-channel */
HFC_outb(hc, A_CON_HDLC, flow_tx | 0x04); HFC_outb(hc, A_CON_HDLC, flow_tx | 0x04);
HFC_outb(hc, A_SUBCH_CFG, 0); HFC_outb(hc, A_SUBCH_CFG, 0);
...@@ -3019,7 +3110,7 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx, ...@@ -3019,7 +3110,7 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx,
HFC_outb(hc, R_FIFO, (ch<<1)|1); HFC_outb(hc, R_FIFO, (ch<<1)|1);
HFC_wait(hc); HFC_wait(hc);
HFC_outb(hc, A_CON_HDLC, flow_rx | 0x04); HFC_outb(hc, A_CON_HDLC, flow_rx | 0x04);
if (hc->type == 1 || hc->chan[ch].bch) if (hc->ctype == HFC_TYPE_E1 || hc->chan[ch].bch)
HFC_outb(hc, A_SUBCH_CFG, 0); /* full 8 bits */ HFC_outb(hc, A_SUBCH_CFG, 0); /* full 8 bits */
else else
HFC_outb(hc, A_SUBCH_CFG, 2); /* 2 bits dchannel */ HFC_outb(hc, A_SUBCH_CFG, 2); /* 2 bits dchannel */
...@@ -3028,7 +3119,7 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx, ...@@ -3028,7 +3119,7 @@ mode_hfcmulti(struct hfc_multi *hc, int ch, int protocol, int slot_tx,
HFC_wait(hc); HFC_wait(hc);
if (hc->chan[ch].bch) { if (hc->chan[ch].bch) {
test_and_set_bit(FLG_HDLC, &hc->chan[ch].bch->Flags); test_and_set_bit(FLG_HDLC, &hc->chan[ch].bch->Flags);
if (hc->type != 1) { if (hc->ctype != HFC_TYPE_E1) {
hc->hw.a_st_ctrl0[hc->chan[ch].port] |= hc->hw.a_st_ctrl0[hc->chan[ch].port] |=
((ch&0x3) == 0) ? V_B1_EN : V_B2_EN; ((ch&0x3) == 0) ? V_B1_EN : V_B2_EN;
HFC_outb(hc, R_ST_SEL, hc->chan[ch].port); HFC_outb(hc, R_ST_SEL, hc->chan[ch].port);
...@@ -3108,7 +3199,7 @@ hfcm_l1callback(struct dchannel *dch, u_int cmd) ...@@ -3108,7 +3199,7 @@ hfcm_l1callback(struct dchannel *dch, u_int cmd)
case HW_RESET_REQ: case HW_RESET_REQ:
/* start activation */ /* start activation */
spin_lock_irqsave(&hc->lock, flags); spin_lock_irqsave(&hc->lock, flags);
if (hc->type == 1) { if (hc->ctype == HFC_TYPE_E1) {
if (debug & DEBUG_HFCMULTI_MSG) if (debug & DEBUG_HFCMULTI_MSG)
printk(KERN_DEBUG printk(KERN_DEBUG
"%s: HW_RESET_REQ no BRI\n", "%s: HW_RESET_REQ no BRI\n",
...@@ -3129,7 +3220,7 @@ hfcm_l1callback(struct dchannel *dch, u_int cmd) ...@@ -3129,7 +3220,7 @@ hfcm_l1callback(struct dchannel *dch, u_int cmd)
case HW_DEACT_REQ: case HW_DEACT_REQ:
/* start deactivation */ /* start deactivation */
spin_lock_irqsave(&hc->lock, flags); spin_lock_irqsave(&hc->lock, flags);
if (hc->type == 1) { if (hc->ctype == HFC_TYPE_E1) {
if (debug & DEBUG_HFCMULTI_MSG) if (debug & DEBUG_HFCMULTI_MSG)
printk(KERN_DEBUG printk(KERN_DEBUG
"%s: HW_DEACT_REQ no BRI\n", "%s: HW_DEACT_REQ no BRI\n",
...@@ -3163,7 +3254,7 @@ hfcm_l1callback(struct dchannel *dch, u_int cmd) ...@@ -3163,7 +3254,7 @@ hfcm_l1callback(struct dchannel *dch, u_int cmd)
break; break;
case HW_POWERUP_REQ: case HW_POWERUP_REQ:
spin_lock_irqsave(&hc->lock, flags); spin_lock_irqsave(&hc->lock, flags);
if (hc->type == 1) { if (hc->ctype == HFC_TYPE_E1) {
if (debug & DEBUG_HFCMULTI_MSG) if (debug & DEBUG_HFCMULTI_MSG)
printk(KERN_DEBUG printk(KERN_DEBUG
"%s: HW_POWERUP_REQ no BRI\n", "%s: HW_POWERUP_REQ no BRI\n",
...@@ -3240,7 +3331,7 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb) ...@@ -3240,7 +3331,7 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb)
__func__, hc->chan[dch->slot].port, __func__, hc->chan[dch->slot].port,
hc->ports-1); hc->ports-1);
/* start activation */ /* start activation */
if (hc->type == 1) { if (hc->ctype == HFC_TYPE_E1) {
ph_state_change(dch); ph_state_change(dch);
if (debug & DEBUG_HFCMULTI_STATE) if (debug & DEBUG_HFCMULTI_STATE)
printk(KERN_DEBUG printk(KERN_DEBUG
...@@ -3273,7 +3364,7 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb) ...@@ -3273,7 +3364,7 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb)
__func__, hc->chan[dch->slot].port, __func__, hc->chan[dch->slot].port,
hc->ports-1); hc->ports-1);
/* start deactivation */ /* start deactivation */
if (hc->type == 1) { if (hc->ctype == HFC_TYPE_E1) {
if (debug & DEBUG_HFCMULTI_MSG) if (debug & DEBUG_HFCMULTI_MSG)
printk(KERN_DEBUG printk(KERN_DEBUG
"%s: PH_DEACTIVATE no BRI\n", "%s: PH_DEACTIVATE no BRI\n",
...@@ -3493,6 +3584,8 @@ channel_bctrl(struct bchannel *bch, struct mISDN_ctrl_req *cq) ...@@ -3493,6 +3584,8 @@ channel_bctrl(struct bchannel *bch, struct mISDN_ctrl_req *cq)
features->hfc_id = hc->id; features->hfc_id = hc->id;
if (test_bit(HFC_CHIP_DTMF, &hc->chip)) if (test_bit(HFC_CHIP_DTMF, &hc->chip))
features->hfc_dtmf = 1; features->hfc_dtmf = 1;
if (test_bit(HFC_CHIP_CONF, &hc->chip))
features->hfc_conf = 1;
features->hfc_loops = 0; features->hfc_loops = 0;
if (test_bit(HFC_CHIP_B410P, &hc->chip)) { if (test_bit(HFC_CHIP_B410P, &hc->chip)) {
features->hfc_echocanhw = 1; features->hfc_echocanhw = 1;
...@@ -3630,7 +3723,7 @@ ph_state_change(struct dchannel *dch) ...@@ -3630,7 +3723,7 @@ ph_state_change(struct dchannel *dch)
hc = dch->hw; hc = dch->hw;
ch = dch->slot; ch = dch->slot;
if (hc->type == 1) { if (hc->ctype == HFC_TYPE_E1) {
if (dch->dev.D.protocol == ISDN_P_TE_E1) { if (dch->dev.D.protocol == ISDN_P_TE_E1) {
if (debug & DEBUG_HFCMULTI_STATE) if (debug & DEBUG_HFCMULTI_STATE)
printk(KERN_DEBUG printk(KERN_DEBUG
...@@ -3755,7 +3848,7 @@ hfcmulti_initmode(struct dchannel *dch) ...@@ -3755,7 +3848,7 @@ hfcmulti_initmode(struct dchannel *dch)
if (debug & DEBUG_HFCMULTI_INIT) if (debug & DEBUG_HFCMULTI_INIT)
printk(KERN_DEBUG "%s: entered\n", __func__); printk(KERN_DEBUG "%s: entered\n", __func__);
if (hc->type == 1) { if (hc->ctype == HFC_TYPE_E1) {
hc->chan[hc->dslot].slot_tx = -1; hc->chan[hc->dslot].slot_tx = -1;
hc->chan[hc->dslot].slot_rx = -1; hc->chan[hc->dslot].slot_rx = -1;
hc->chan[hc->dslot].conf = -1; hc->chan[hc->dslot].conf = -1;
...@@ -3904,6 +3997,11 @@ hfcmulti_initmode(struct dchannel *dch) ...@@ -3904,6 +3997,11 @@ hfcmulti_initmode(struct dchannel *dch)
} }
if (!test_bit(HFC_CFG_NONCAP_TX, &hc->chan[i].cfg)) if (!test_bit(HFC_CFG_NONCAP_TX, &hc->chan[i].cfg))
hc->hw.a_st_ctrl0[pt] |= V_TX_LI; hc->hw.a_st_ctrl0[pt] |= V_TX_LI;
if (hc->ctype == HFC_TYPE_XHFC) {
hc->hw.a_st_ctrl0[pt] |= 0x40 /* V_ST_PU_CTRL */;
HFC_outb(hc, 0x35 /* A_ST_CTRL3 */,
0x7c << 1 /* V_ST_PULSE */);
}
/* line setup */ /* line setup */
HFC_outb(hc, A_ST_CTRL0, hc->hw.a_st_ctrl0[pt]); HFC_outb(hc, A_ST_CTRL0, hc->hw.a_st_ctrl0[pt]);
/* disable E-channel */ /* disable E-channel */
...@@ -3990,7 +4088,7 @@ open_bchannel(struct hfc_multi *hc, struct dchannel *dch, ...@@ -3990,7 +4088,7 @@ open_bchannel(struct hfc_multi *hc, struct dchannel *dch,
return -EINVAL; return -EINVAL;
if (rq->protocol == ISDN_P_NONE) if (rq->protocol == ISDN_P_NONE)
return -EINVAL; return -EINVAL;
if (hc->type == 1) if (hc->ctype == HFC_TYPE_E1)
ch = rq->adr.channel; ch = rq->adr.channel;
else else
ch = (rq->adr.channel - 1) + (dch->slot - 2); ch = (rq->adr.channel - 1) + (dch->slot - 2);
...@@ -4081,7 +4179,7 @@ hfcm_dctrl(struct mISDNchannel *ch, u_int cmd, void *arg) ...@@ -4081,7 +4179,7 @@ hfcm_dctrl(struct mISDNchannel *ch, u_int cmd, void *arg)
switch (rq->protocol) { switch (rq->protocol) {
case ISDN_P_TE_S0: case ISDN_P_TE_S0:
case ISDN_P_NT_S0: case ISDN_P_NT_S0:
if (hc->type == 1) { if (hc->ctype == HFC_TYPE_E1) {
err = -EINVAL; err = -EINVAL;
break; break;
} }
...@@ -4089,7 +4187,7 @@ hfcm_dctrl(struct mISDNchannel *ch, u_int cmd, void *arg) ...@@ -4089,7 +4187,7 @@ hfcm_dctrl(struct mISDNchannel *ch, u_int cmd, void *arg)
break; break;
case ISDN_P_TE_E1: case ISDN_P_TE_E1:
case ISDN_P_NT_E1: case ISDN_P_NT_E1:
if (hc->type != 1) { if (hc->ctype != HFC_TYPE_E1) {
err = -EINVAL; err = -EINVAL;
break; break;
} }
...@@ -4156,13 +4254,13 @@ init_card(struct hfc_multi *hc) ...@@ -4156,13 +4254,13 @@ init_card(struct hfc_multi *hc)
disable_hwirq(hc); disable_hwirq(hc);
spin_unlock_irqrestore(&hc->lock, flags); spin_unlock_irqrestore(&hc->lock, flags);
if (request_irq(hc->pci_dev->irq, hfcmulti_interrupt, IRQF_SHARED, if (request_irq(hc->irq, hfcmulti_interrupt, IRQF_SHARED,
"HFC-multi", hc)) { "HFC-multi", hc)) {
printk(KERN_WARNING "mISDN: Could not get interrupt %d.\n", printk(KERN_WARNING "mISDN: Could not get interrupt %d.\n",
hc->pci_dev->irq); hc->irq);
hc->irq = 0;
return -EIO; return -EIO;
} }
hc->irq = hc->pci_dev->irq;
if (test_bit(HFC_CHIP_PLXSD, &hc->chip)) { if (test_bit(HFC_CHIP_PLXSD, &hc->chip)) {
spin_lock_irqsave(&plx_lock, plx_flags); spin_lock_irqsave(&plx_lock, plx_flags);
...@@ -4269,6 +4367,10 @@ setup_pci(struct hfc_multi *hc, struct pci_dev *pdev, ...@@ -4269,6 +4367,10 @@ setup_pci(struct hfc_multi *hc, struct pci_dev *pdev,
hc->ledstate = 0xAFFEAFFE; hc->ledstate = 0xAFFEAFFE;
hc->opticalsupport = m->opticalsupport; hc->opticalsupport = m->opticalsupport;
hc->pci_iobase = 0;
hc->pci_membase = NULL;
hc->plx_membase = NULL;
/* set memory access methods */ /* set memory access methods */
if (m->io_mode) /* use mode from card config */ if (m->io_mode) /* use mode from card config */
hc->io_mode = m->io_mode; hc->io_mode = m->io_mode;
...@@ -4276,44 +4378,12 @@ setup_pci(struct hfc_multi *hc, struct pci_dev *pdev, ...@@ -4276,44 +4378,12 @@ setup_pci(struct hfc_multi *hc, struct pci_dev *pdev,
case HFC_IO_MODE_PLXSD: case HFC_IO_MODE_PLXSD:
test_and_set_bit(HFC_CHIP_PLXSD, &hc->chip); test_and_set_bit(HFC_CHIP_PLXSD, &hc->chip);
hc->slots = 128; /* required */ hc->slots = 128; /* required */
/* fall through */
case HFC_IO_MODE_PCIMEM:
hc->HFC_outb = HFC_outb_pcimem; hc->HFC_outb = HFC_outb_pcimem;
hc->HFC_inb = HFC_inb_pcimem; hc->HFC_inb = HFC_inb_pcimem;
hc->HFC_inw = HFC_inw_pcimem; hc->HFC_inw = HFC_inw_pcimem;
hc->HFC_wait = HFC_wait_pcimem; hc->HFC_wait = HFC_wait_pcimem;
hc->read_fifo = read_fifo_pcimem; hc->read_fifo = read_fifo_pcimem;
hc->write_fifo = write_fifo_pcimem; hc->write_fifo = write_fifo_pcimem;
break;
case HFC_IO_MODE_REGIO:
hc->HFC_outb = HFC_outb_regio;
hc->HFC_inb = HFC_inb_regio;
hc->HFC_inw = HFC_inw_regio;
hc->HFC_wait = HFC_wait_regio;
hc->read_fifo = read_fifo_regio;
hc->write_fifo = write_fifo_regio;
break;
default:
printk(KERN_WARNING "HFC-multi: Invalid IO mode.\n");
pci_disable_device(hc->pci_dev);
return -EIO;
}
hc->HFC_outb_nodebug = hc->HFC_outb;
hc->HFC_inb_nodebug = hc->HFC_inb;
hc->HFC_inw_nodebug = hc->HFC_inw;
hc->HFC_wait_nodebug = hc->HFC_wait;
#ifdef HFC_REGISTER_DEBUG
hc->HFC_outb = HFC_outb_debug;
hc->HFC_inb = HFC_inb_debug;
hc->HFC_inw = HFC_inw_debug;
hc->HFC_wait = HFC_wait_debug;
#endif
hc->pci_iobase = 0;
hc->pci_membase = NULL;
hc->plx_membase = NULL;
switch (hc->io_mode) {
case HFC_IO_MODE_PLXSD:
hc->plx_origmembase = hc->pci_dev->resource[0].start; hc->plx_origmembase = hc->pci_dev->resource[0].start;
/* MEMBASE 1 is PLX PCI Bridge */ /* MEMBASE 1 is PLX PCI Bridge */
...@@ -4361,6 +4431,12 @@ setup_pci(struct hfc_multi *hc, struct pci_dev *pdev, ...@@ -4361,6 +4431,12 @@ setup_pci(struct hfc_multi *hc, struct pci_dev *pdev,
pci_write_config_word(hc->pci_dev, PCI_COMMAND, PCI_ENA_MEMIO); pci_write_config_word(hc->pci_dev, PCI_COMMAND, PCI_ENA_MEMIO);
break; break;
case HFC_IO_MODE_PCIMEM: case HFC_IO_MODE_PCIMEM:
hc->HFC_outb = HFC_outb_pcimem;
hc->HFC_inb = HFC_inb_pcimem;
hc->HFC_inw = HFC_inw_pcimem;
hc->HFC_wait = HFC_wait_pcimem;
hc->read_fifo = read_fifo_pcimem;
hc->write_fifo = write_fifo_pcimem;
hc->pci_origmembase = hc->pci_dev->resource[1].start; hc->pci_origmembase = hc->pci_dev->resource[1].start;
if (!hc->pci_origmembase) { if (!hc->pci_origmembase) {
printk(KERN_WARNING printk(KERN_WARNING
...@@ -4377,12 +4453,18 @@ setup_pci(struct hfc_multi *hc, struct pci_dev *pdev, ...@@ -4377,12 +4453,18 @@ setup_pci(struct hfc_multi *hc, struct pci_dev *pdev,
pci_disable_device(hc->pci_dev); pci_disable_device(hc->pci_dev);
return -EIO; return -EIO;
} }
printk(KERN_INFO "card %d: defined at MEMBASE %#lx (%#lx) IRQ %d " printk(KERN_INFO "card %d: defined at MEMBASE %#lx (%#lx) IRQ "
"HZ %d leds-type %d\n", hc->id, (u_long)hc->pci_membase, "%d HZ %d leds-type %d\n", hc->id, (u_long)hc->pci_membase,
hc->pci_origmembase, hc->pci_dev->irq, HZ, hc->leds); hc->pci_origmembase, hc->pci_dev->irq, HZ, hc->leds);
pci_write_config_word(hc->pci_dev, PCI_COMMAND, PCI_ENA_MEMIO); pci_write_config_word(hc->pci_dev, PCI_COMMAND, PCI_ENA_MEMIO);
break; break;
case HFC_IO_MODE_REGIO: case HFC_IO_MODE_REGIO:
hc->HFC_outb = HFC_outb_regio;
hc->HFC_inb = HFC_inb_regio;
hc->HFC_inw = HFC_inw_regio;
hc->HFC_wait = HFC_wait_regio;
hc->read_fifo = read_fifo_regio;
hc->write_fifo = write_fifo_regio;
hc->pci_iobase = (u_int) hc->pci_dev->resource[0].start; hc->pci_iobase = (u_int) hc->pci_dev->resource[0].start;
if (!hc->pci_iobase) { if (!hc->pci_iobase) {
printk(KERN_WARNING printk(KERN_WARNING
...@@ -4464,7 +4546,7 @@ release_port(struct hfc_multi *hc, struct dchannel *dch) ...@@ -4464,7 +4546,7 @@ release_port(struct hfc_multi *hc, struct dchannel *dch)
dch->timer.function = NULL; dch->timer.function = NULL;
} }
if (hc->type == 1) { /* E1 */ if (hc->ctype == HFC_TYPE_E1) { /* E1 */
/* remove sync */ /* remove sync */
if (test_bit(HFC_CHIP_PLXSD, &hc->chip)) { if (test_bit(HFC_CHIP_PLXSD, &hc->chip)) {
hc->syncronized = 0; hc->syncronized = 0;
...@@ -4863,9 +4945,15 @@ init_multi_port(struct hfc_multi *hc, int pt) ...@@ -4863,9 +4945,15 @@ init_multi_port(struct hfc_multi *hc, int pt)
test_and_set_bit(HFC_CFG_DIS_ECHANNEL, test_and_set_bit(HFC_CFG_DIS_ECHANNEL,
&hc->chan[i + 2].cfg); &hc->chan[i + 2].cfg);
} }
snprintf(name, MISDN_MAX_IDLEN - 1, "hfc-%ds.%d-%d", if (hc->ctype == HFC_TYPE_XHFC) {
hc->type, HFC_cnt + 1, pt + 1); snprintf(name, MISDN_MAX_IDLEN - 1, "xhfc.%d-%d",
ret = mISDN_register_device(&dch->dev, &hc->pci_dev->dev, name); HFC_cnt + 1, pt + 1);
ret = mISDN_register_device(&dch->dev, NULL, name);
} else {
snprintf(name, MISDN_MAX_IDLEN - 1, "hfc-%ds.%d-%d",
hc->ctype, HFC_cnt + 1, pt + 1);
ret = mISDN_register_device(&dch->dev, &hc->pci_dev->dev, name);
}
if (ret) if (ret)
goto free_chan; goto free_chan;
hc->created[pt] = 1; hc->created[pt] = 1;
...@@ -4876,9 +4964,9 @@ free_chan: ...@@ -4876,9 +4964,9 @@ free_chan:
} }
static int static int
hfcmulti_init(struct pci_dev *pdev, const struct pci_device_id *ent) hfcmulti_init(struct hm_map *m, struct pci_dev *pdev,
const struct pci_device_id *ent)
{ {
struct hm_map *m = (struct hm_map *)ent->driver_data;
int ret_err = 0; int ret_err = 0;
int pt; int pt;
struct hfc_multi *hc; struct hfc_multi *hc;
...@@ -4913,16 +5001,18 @@ hfcmulti_init(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -4913,16 +5001,18 @@ hfcmulti_init(struct pci_dev *pdev, const struct pci_device_id *ent)
} }
spin_lock_init(&hc->lock); spin_lock_init(&hc->lock);
hc->mtyp = m; hc->mtyp = m;
hc->type = m->type; hc->ctype = m->type;
hc->ports = m->ports; hc->ports = m->ports;
hc->id = HFC_cnt; hc->id = HFC_cnt;
hc->pcm = pcm[HFC_cnt]; hc->pcm = pcm[HFC_cnt];
hc->io_mode = iomode[HFC_cnt]; hc->io_mode = iomode[HFC_cnt];
if (dslot[HFC_cnt] < 0 && hc->type == 1) { if (dslot[HFC_cnt] < 0 && hc->ctype == HFC_TYPE_E1) {
hc->dslot = 0; hc->dslot = 0;
printk(KERN_INFO "HFC-E1 card has disabled D-channel, but " printk(KERN_INFO "HFC-E1 card has disabled D-channel, but "
"31 B-channels\n"); "31 B-channels\n");
} if (dslot[HFC_cnt] > 0 && dslot[HFC_cnt] < 32 && hc->type == 1) { }
if (dslot[HFC_cnt] > 0 && dslot[HFC_cnt] < 32
&& hc->ctype == HFC_TYPE_E1) {
hc->dslot = dslot[HFC_cnt]; hc->dslot = dslot[HFC_cnt];
printk(KERN_INFO "HFC-E1 card has alternating D-channel on " printk(KERN_INFO "HFC-E1 card has alternating D-channel on "
"time slot %d\n", dslot[HFC_cnt]); "time slot %d\n", dslot[HFC_cnt]);
...@@ -4944,8 +5034,11 @@ hfcmulti_init(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -4944,8 +5034,11 @@ hfcmulti_init(struct pci_dev *pdev, const struct pci_device_id *ent)
for (i = 0; i < (poll >> 1); i++) for (i = 0; i < (poll >> 1); i++)
hc->silence_data[i] = hc->silence; hc->silence_data[i] = hc->silence;
if (!(type[HFC_cnt] & 0x200)) if (hc->ctype != HFC_TYPE_XHFC) {
test_and_set_bit(HFC_CHIP_DTMF, &hc->chip); if (!(type[HFC_cnt] & 0x200))
test_and_set_bit(HFC_CHIP_DTMF, &hc->chip);
test_and_set_bit(HFC_CHIP_CONF, &hc->chip);
}
if (type[HFC_cnt] & 0x800) if (type[HFC_cnt] & 0x800)
test_and_set_bit(HFC_CHIP_PCM_SLAVE, &hc->chip); test_and_set_bit(HFC_CHIP_PCM_SLAVE, &hc->chip);
...@@ -4969,8 +5062,18 @@ hfcmulti_init(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -4969,8 +5062,18 @@ hfcmulti_init(struct pci_dev *pdev, const struct pci_device_id *ent)
printk(KERN_NOTICE "Watchdog enabled\n"); printk(KERN_NOTICE "Watchdog enabled\n");
} }
/* setup pci, hc->slots may change due to PLXSD */ if (pdev && ent)
ret_err = setup_pci(hc, pdev, ent); /* setup pci, hc->slots may change due to PLXSD */
ret_err = setup_pci(hc, pdev, ent);
else
#ifdef CONFIG_MISDN_HFCMULTI_8xx
ret_err = setup_embedded(hc, m);
#else
{
printk(KERN_WARNING "Embedded IO Mode not selected\n");
ret_err = -EIO;
}
#endif
if (ret_err) { if (ret_err) {
if (hc == syncmaster) if (hc == syncmaster)
syncmaster = NULL; syncmaster = NULL;
...@@ -4978,7 +5081,17 @@ hfcmulti_init(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -4978,7 +5081,17 @@ hfcmulti_init(struct pci_dev *pdev, const struct pci_device_id *ent)
return ret_err; return ret_err;
} }
/* crate channels */ hc->HFC_outb_nodebug = hc->HFC_outb;
hc->HFC_inb_nodebug = hc->HFC_inb;
hc->HFC_inw_nodebug = hc->HFC_inw;
hc->HFC_wait_nodebug = hc->HFC_wait;
#ifdef HFC_REGISTER_DEBUG
hc->HFC_outb = HFC_outb_debug;
hc->HFC_inb = HFC_inb_debug;
hc->HFC_inw = HFC_inw_debug;
hc->HFC_wait = HFC_wait_debug;
#endif
/* create channels */
for (pt = 0; pt < hc->ports; pt++) { for (pt = 0; pt < hc->ports; pt++) {
if (Port_cnt >= MAX_PORTS) { if (Port_cnt >= MAX_PORTS) {
printk(KERN_ERR "too many ports (max=%d).\n", printk(KERN_ERR "too many ports (max=%d).\n",
...@@ -4986,7 +5099,7 @@ hfcmulti_init(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -4986,7 +5099,7 @@ hfcmulti_init(struct pci_dev *pdev, const struct pci_device_id *ent)
ret_err = -EINVAL; ret_err = -EINVAL;
goto free_card; goto free_card;
} }
if (hc->type == 1) if (hc->ctype == HFC_TYPE_E1)
ret_err = init_e1_port(hc, m); ret_err = init_e1_port(hc, m);
else else
ret_err = init_multi_port(hc, pt); ret_err = init_multi_port(hc, pt);
...@@ -5070,6 +5183,7 @@ hfcmulti_init(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -5070,6 +5183,7 @@ hfcmulti_init(struct pci_dev *pdev, const struct pci_device_id *ent)
hc->iclock = mISDN_register_clock("HFCMulti", 0, clockctl, hc); hc->iclock = mISDN_register_clock("HFCMulti", 0, clockctl, hc);
/* initialize hardware */ /* initialize hardware */
hc->irq = (m->irq) ? : hc->pci_dev->irq;
ret_err = init_card(hc); ret_err = init_card(hc);
if (ret_err) { if (ret_err) {
printk(KERN_ERR "init card returns %d\n", ret_err); printk(KERN_ERR "init card returns %d\n", ret_err);
...@@ -5120,45 +5234,47 @@ static void __devexit hfc_remove_pci(struct pci_dev *pdev) ...@@ -5120,45 +5234,47 @@ static void __devexit hfc_remove_pci(struct pci_dev *pdev)
#define VENDOR_PRIM "PrimuX" #define VENDOR_PRIM "PrimuX"
static const struct hm_map hfcm_map[] = { static const struct hm_map hfcm_map[] = {
/*0*/ {VENDOR_BN, "HFC-1S Card (mini PCI)", 4, 1, 1, 3, 0, DIP_4S, 0}, /*0*/ {VENDOR_BN, "HFC-1S Card (mini PCI)", 4, 1, 1, 3, 0, DIP_4S, 0, 0},
/*1*/ {VENDOR_BN, "HFC-2S Card", 4, 2, 1, 3, 0, DIP_4S, 0}, /*1*/ {VENDOR_BN, "HFC-2S Card", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
/*2*/ {VENDOR_BN, "HFC-2S Card (mini PCI)", 4, 2, 1, 3, 0, DIP_4S, 0}, /*2*/ {VENDOR_BN, "HFC-2S Card (mini PCI)", 4, 2, 1, 3, 0, DIP_4S, 0, 0},
/*3*/ {VENDOR_BN, "HFC-4S Card", 4, 4, 1, 2, 0, DIP_4S, 0}, /*3*/ {VENDOR_BN, "HFC-4S Card", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
/*4*/ {VENDOR_BN, "HFC-4S Card (mini PCI)", 4, 4, 1, 2, 0, 0, 0}, /*4*/ {VENDOR_BN, "HFC-4S Card (mini PCI)", 4, 4, 1, 2, 0, 0, 0, 0},
/*5*/ {VENDOR_CCD, "HFC-4S Eval (old)", 4, 4, 0, 0, 0, 0, 0}, /*5*/ {VENDOR_CCD, "HFC-4S Eval (old)", 4, 4, 0, 0, 0, 0, 0, 0},
/*6*/ {VENDOR_CCD, "HFC-4S IOB4ST", 4, 4, 1, 2, 0, DIP_4S, 0}, /*6*/ {VENDOR_CCD, "HFC-4S IOB4ST", 4, 4, 1, 2, 0, DIP_4S, 0, 0},
/*7*/ {VENDOR_CCD, "HFC-4S", 4, 4, 1, 2, 0, 0, 0}, /*7*/ {VENDOR_CCD, "HFC-4S", 4, 4, 1, 2, 0, 0, 0, 0},
/*8*/ {VENDOR_DIG, "HFC-4S Card", 4, 4, 0, 2, 0, 0, HFC_IO_MODE_REGIO}, /*8*/ {VENDOR_DIG, "HFC-4S Card", 4, 4, 0, 2, 0, 0, HFC_IO_MODE_REGIO, 0},
/*9*/ {VENDOR_CCD, "HFC-4S Swyx 4xS0 SX2 QuadBri", 4, 4, 1, 2, 0, 0, 0}, /*9*/ {VENDOR_CCD, "HFC-4S Swyx 4xS0 SX2 QuadBri", 4, 4, 1, 2, 0, 0, 0, 0},
/*10*/ {VENDOR_JH, "HFC-4S (junghanns 2.0)", 4, 4, 1, 2, 0, 0, 0}, /*10*/ {VENDOR_JH, "HFC-4S (junghanns 2.0)", 4, 4, 1, 2, 0, 0, 0, 0},
/*11*/ {VENDOR_PRIM, "HFC-2S Primux Card", 4, 2, 0, 0, 0, 0, 0}, /*11*/ {VENDOR_PRIM, "HFC-2S Primux Card", 4, 2, 0, 0, 0, 0, 0, 0},
/*12*/ {VENDOR_BN, "HFC-8S Card", 8, 8, 1, 0, 0, 0, 0}, /*12*/ {VENDOR_BN, "HFC-8S Card", 8, 8, 1, 0, 0, 0, 0, 0},
/*13*/ {VENDOR_BN, "HFC-8S Card (+)", 8, 8, 1, 8, 0, DIP_8S, /*13*/ {VENDOR_BN, "HFC-8S Card (+)", 8, 8, 1, 8, 0, DIP_8S,
HFC_IO_MODE_REGIO}, HFC_IO_MODE_REGIO, 0},
/*14*/ {VENDOR_CCD, "HFC-8S Eval (old)", 8, 8, 0, 0, 0, 0, 0}, /*14*/ {VENDOR_CCD, "HFC-8S Eval (old)", 8, 8, 0, 0, 0, 0, 0, 0},
/*15*/ {VENDOR_CCD, "HFC-8S IOB4ST Recording", 8, 8, 1, 0, 0, 0, 0}, /*15*/ {VENDOR_CCD, "HFC-8S IOB4ST Recording", 8, 8, 1, 0, 0, 0, 0, 0},
/*16*/ {VENDOR_CCD, "HFC-8S IOB8ST", 8, 8, 1, 0, 0, 0, 0}, /*16*/ {VENDOR_CCD, "HFC-8S IOB8ST", 8, 8, 1, 0, 0, 0, 0, 0},
/*17*/ {VENDOR_CCD, "HFC-8S", 8, 8, 1, 0, 0, 0, 0}, /*17*/ {VENDOR_CCD, "HFC-8S", 8, 8, 1, 0, 0, 0, 0, 0},
/*18*/ {VENDOR_CCD, "HFC-8S", 8, 8, 1, 0, 0, 0, 0}, /*18*/ {VENDOR_CCD, "HFC-8S", 8, 8, 1, 0, 0, 0, 0, 0},
/*19*/ {VENDOR_BN, "HFC-E1 Card", 1, 1, 0, 1, 0, DIP_E1, 0}, /*19*/ {VENDOR_BN, "HFC-E1 Card", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
/*20*/ {VENDOR_BN, "HFC-E1 Card (mini PCI)", 1, 1, 0, 1, 0, 0, 0}, /*20*/ {VENDOR_BN, "HFC-E1 Card (mini PCI)", 1, 1, 0, 1, 0, 0, 0, 0},
/*21*/ {VENDOR_BN, "HFC-E1+ Card (Dual)", 1, 1, 0, 1, 0, DIP_E1, 0}, /*21*/ {VENDOR_BN, "HFC-E1+ Card (Dual)", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
/*22*/ {VENDOR_BN, "HFC-E1 Card (Dual)", 1, 1, 0, 1, 0, DIP_E1, 0}, /*22*/ {VENDOR_BN, "HFC-E1 Card (Dual)", 1, 1, 0, 1, 0, DIP_E1, 0, 0},
/*23*/ {VENDOR_CCD, "HFC-E1 Eval (old)", 1, 1, 0, 0, 0, 0, 0}, /*23*/ {VENDOR_CCD, "HFC-E1 Eval (old)", 1, 1, 0, 0, 0, 0, 0, 0},
/*24*/ {VENDOR_CCD, "HFC-E1 IOB1E1", 1, 1, 0, 1, 0, 0, 0}, /*24*/ {VENDOR_CCD, "HFC-E1 IOB1E1", 1, 1, 0, 1, 0, 0, 0, 0},
/*25*/ {VENDOR_CCD, "HFC-E1", 1, 1, 0, 1, 0, 0, 0}, /*25*/ {VENDOR_CCD, "HFC-E1", 1, 1, 0, 1, 0, 0, 0, 0},
/*26*/ {VENDOR_CCD, "HFC-4S Speech Design", 4, 4, 0, 0, 0, 0, /*26*/ {VENDOR_CCD, "HFC-4S Speech Design", 4, 4, 0, 0, 0, 0,
HFC_IO_MODE_PLXSD}, HFC_IO_MODE_PLXSD, 0},
/*27*/ {VENDOR_CCD, "HFC-E1 Speech Design", 1, 1, 0, 0, 0, 0, /*27*/ {VENDOR_CCD, "HFC-E1 Speech Design", 1, 1, 0, 0, 0, 0,
HFC_IO_MODE_PLXSD}, HFC_IO_MODE_PLXSD, 0},
/*28*/ {VENDOR_CCD, "HFC-4S OpenVox", 4, 4, 1, 0, 0, 0, 0}, /*28*/ {VENDOR_CCD, "HFC-4S OpenVox", 4, 4, 1, 0, 0, 0, 0, 0},
/*29*/ {VENDOR_CCD, "HFC-2S OpenVox", 4, 2, 1, 0, 0, 0, 0}, /*29*/ {VENDOR_CCD, "HFC-2S OpenVox", 4, 2, 1, 0, 0, 0, 0, 0},
/*30*/ {VENDOR_CCD, "HFC-8S OpenVox", 8, 8, 1, 0, 0, 0, 0}, /*30*/ {VENDOR_CCD, "HFC-8S OpenVox", 8, 8, 1, 0, 0, 0, 0, 0},
/*31*/ {VENDOR_CCD, "XHFC-4S Speech Design", 5, 4, 0, 0, 0, 0,
HFC_IO_MODE_EMBSD, XHFC_IRQ},
}; };
#undef H #undef H
...@@ -5265,7 +5381,7 @@ hfcmulti_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -5265,7 +5381,7 @@ hfcmulti_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
"Please contact the driver maintainer for support.\n"); "Please contact the driver maintainer for support.\n");
return -ENODEV; return -ENODEV;
} }
ret = hfcmulti_init(pdev, ent); ret = hfcmulti_init(m, pdev, ent);
if (ret) if (ret)
return ret; return ret;
HFC_cnt++; HFC_cnt++;
...@@ -5295,6 +5411,8 @@ static int __init ...@@ -5295,6 +5411,8 @@ static int __init
HFCmulti_init(void) HFCmulti_init(void)
{ {
int err; int err;
int i, xhfc = 0;
struct hm_map m;
printk(KERN_INFO "mISDN: HFC-multi driver %s\n", HFC_MULTI_VERSION); printk(KERN_INFO "mISDN: HFC-multi driver %s\n", HFC_MULTI_VERSION);
...@@ -5342,11 +5460,43 @@ HFCmulti_init(void) ...@@ -5342,11 +5460,43 @@ HFCmulti_init(void)
if (!clock) if (!clock)
clock = 1; clock = 1;
/* Register the embedded devices.
* This should be done before the PCI cards registration */
switch (hwid) {
case HWID_MINIP4:
xhfc = 1;
m = hfcm_map[31];
break;
case HWID_MINIP8:
xhfc = 2;
m = hfcm_map[31];
break;
case HWID_MINIP16:
xhfc = 4;
m = hfcm_map[31];
break;
default:
xhfc = 0;
}
for (i = 0; i < xhfc; ++i) {
err = hfcmulti_init(&m, NULL, NULL);
if (err) {
printk(KERN_ERR "error registering embedded driver: "
"%x\n", err);
return -err;
}
HFC_cnt++;
printk(KERN_INFO "%d devices registered\n", HFC_cnt);
}
/* Register the PCI cards */
err = pci_register_driver(&hfcmultipci_driver); err = pci_register_driver(&hfcmultipci_driver);
if (err < 0) { if (err < 0) {
printk(KERN_ERR "error registering pci driver: %x\n", err); printk(KERN_ERR "error registering pci driver: %x\n", err);
return err; return err;
} }
return 0; return 0;
} }
......
drivers/isdn/mISDN/dsp_cmx.c
View file @ db9bb63a
...@@ -947,6 +947,10 @@ conf_software: ...@@ -947,6 +947,10 @@ conf_software:
if (current_conf >= 0) { if (current_conf >= 0) {
join_members: join_members:
list_for_each_entry(member, &conf->mlist, list) { list_for_each_entry(member, &conf->mlist, list) {
/* if no conference engine on our chip, change to
* software */
if (!member->dsp->features.hfc_conf)
goto conf_software;
/* in case of hdlc, change to software */ /* in case of hdlc, change to software */
if (member->dsp->hdlc) if (member->dsp->hdlc)
goto conf_software; goto conf_software;
......
include/linux/mISDNdsp.h
View file @ db9bb63a
...@@ -25,6 +25,7 @@ extern void mISDN_dsp_element_unregister(struct mISDN_dsp_element *elem); ...@@ -25,6 +25,7 @@ extern void mISDN_dsp_element_unregister(struct mISDN_dsp_element *elem);
struct dsp_features { struct dsp_features {
int hfc_id; /* unique id to identify the chip (or -1) */ int hfc_id; /* unique id to identify the chip (or -1) */
int hfc_dtmf; /* set if HFCmulti card supports dtmf */ int hfc_dtmf; /* set if HFCmulti card supports dtmf */
int hfc_conf; /* set if HFCmulti card supports conferences */
int hfc_loops; /* set if card supports tone loops */ int hfc_loops; /* set if card supports tone loops */
int hfc_echocanhw; /* set if card supports echocancelation*/ int hfc_echocanhw; /* set if card supports echocancelation*/
int pcm_id; /* unique id to identify the pcm bus (or -1) */ int pcm_id; /* unique id to identify the pcm bus (or -1) */
......
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