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

wct4xxp: __t4_framer_in and __t4_framer_out speedups.

Browse Source 
Speeds up these calls primarily by eliminating unnecessary flushes
of writes to the PCI bus.

Before:

 7.095 us    |  __t4_framer_in();
 5.835 us    |  __t4_framer_out();
 7.122 us    |  __t4_framer_in();
 7.071 us    |  __t4_framer_in();
 7.059 us    |  __t4_framer_in();
 5.859 us    |  __t4_framer_out();
 7.076 us    |  __t4_framer_in();
 5.852 us    |  __t4_framer_out();
 7.124 us    |  __t4_framer_in();
 7.080 us    |  __t4_framer_in();

After:

 1.694 us    |  __t4_framer_out();
 1.686 us    |  __t4_framer_out();
 1.695 us    |  __t4_framer_out();
 3.182 us    |  __t4_framer_in();
 3.283 us    |  __t4_framer_in();
 2.889 us    |  __t4_framer_in();
 2.942 us    |  __t4_framer_in();
 2.951 us    |  __t4_framer_in();
 2.906 us    |  __t4_framer_in();

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

git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10234 a0bf4364-ded3-4de4-8d8a-66a801d63aff
This commit is contained in:
Shaun Ruffell 2011-10-20 20:52:18 +00:00
parent fbc506c865
commit d8c0898fb7
1 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -541,12 +541,18 @@ static inline unsigned int __t4_pci_in(struct t4 *wc, const unsigned int addr)
static inline void __t4_pci_out(struct t4 *wc, const unsigned int addr, const unsigned int value) static inline void __t4_pci_out(struct t4 *wc, const unsigned int addr, const unsigned int value)
{ {
#ifdef DEBUG
unsigned int tmp; unsigned int tmp;
#endif
writel(value, wc->membase + (addr * sizeof(u32))); writel(value, wc->membase + (addr * sizeof(u32)));
#ifdef DEBUG
tmp = __t4_pci_in(wc, WC_VERSION); tmp = __t4_pci_in(wc, WC_VERSION);
if ((tmp & 0xffff0000) != 0xc01a0000) if ((tmp & 0xffff0000) != 0xc01a0000)
dev_notice(&wc->dev->dev, dev_notice(&wc->dev->dev,
"Version Synchronization Error!\n"); "Version Synchronization Error!\n");
#else
__t4_pci_in(wc, WC_VERSION);
#endif
} }
static inline void __t4_gpio_set(struct t4 *wc, unsigned bits, unsigned int val) static inline void __t4_gpio_set(struct t4 *wc, unsigned bits, unsigned int val)
@ -621,22 +627,24 @@ static inline unsigned int t4_pci_in(struct t4 *wc, const unsigned int addr)
return ret; return ret;
} }
static unsigned int __t4_framer_in(struct t4 *wc, int unit, static unsigned int __t4_framer_in(const struct t4 *wc, int unit,
const unsigned int addr) const unsigned int addr)
{ {
unsigned int ret; unsigned int ret;
register u32 val;
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_ldata = wc->membase + (WC_LDATA*sizeof(u32));
unit &= 0x3; unit &= 0x3;
__t4_pci_out(wc, WC_LADDR, (unit << 8) | (addr & 0xff));
__t4_pci_out(wc, WC_LADDR, (unit << 8) | (addr & 0xff) | WC_LFRMR_CS | WC_LREAD);
__t4_pci_out(wc, WC_VERSION, 0);
ret = __t4_pci_in(wc, WC_LDATA);
__t4_pci_out(wc, WC_LADDR, (unit << 8) | (addr & 0xff));
if (unlikely(debug & DEBUG_REGS)) val = ((unit & 0x3) << 8) | (addr & 0xff);
dev_info(&wc->dev->dev, "Reading unit %d address %02x is " writel(val, wc_laddr);
"%02x\n", unit, addr, ret & 0xff); /* readl(wc_version); */
writel(val | WC_LFRMR_CS | WC_LREAD, wc_laddr);
return ret & 0xff; readl(wc_version);
ret = readb(wc_ldata);
writel(val, wc_laddr);
return ret;
} }
static unsigned int static unsigned int
@ -648,25 +656,27 @@ t4_framer_in(struct t4 *wc, int unit, const unsigned int addr)
ret = __t4_framer_in(wc, unit, addr); ret = __t4_framer_in(wc, unit, addr);
spin_unlock_irqrestore(&wc->reglock, flags); spin_unlock_irqrestore(&wc->reglock, flags);
return ret; return ret;
} }
static void __t4_framer_out(struct t4 *wc, int unit, const unsigned int addr, static void __t4_framer_out(const struct t4 *wc, int unit, const u8 addr,
const unsigned int value) const unsigned int value)
{ {
unit &= 0x3; register u32 val;
if (unlikely(debug & DEBUG_REGS)) void __iomem *const wc_laddr = wc->membase + (WC_LADDR*sizeof(u32));
dev_info(&wc->dev->dev, "Writing %02x to address %02x of " void __iomem *const wc_version = wc->membase + (WC_VERSION*sizeof(u32));
"unit %d\n", value, addr, unit); void __iomem *const wc_ldata = wc->membase + (WC_LDATA*sizeof(u32));
__t4_pci_out(wc, WC_LADDR, (unit << 8) | (addr & 0xff));
__t4_pci_out(wc, WC_LDATA, value); val = ((unit & 0x3) << 8) | (addr & 0xff);
__t4_pci_out(wc, WC_LADDR, (unit << 8) | (addr & 0xff) | WC_LFRMR_CS | WC_LWRITE); writel(val, wc_laddr);
__t4_pci_out(wc, WC_LADDR, (unit << 8) | (addr & 0xff)); writel(value, wc_ldata);
if (unlikely(debug & DEBUG_REGS)) readl(wc_version);
dev_info(&wc->dev->dev, "Write complete\n"); writel(val | WC_LFRMR_CS | WC_LWRITE, wc_laddr);
/* readl(wc_version); */
writel(val, wc_laddr);
} }
static void t4_framer_out(struct t4 *wc, int unit, const unsigned int addr, static void t4_framer_out(struct t4 *wc, int unit,
const unsigned int addr,
const unsigned int value) const unsigned int value)
{ {
unsigned long flags; unsigned long flags;