From ae2785e0e7a7e5e310d266a94aa4d32c93eab53a Mon Sep 17 00:00:00 2001 From: Shaun Ruffell Date: Wed, 12 Oct 2011 16:12:33 +0000 Subject: [PATCH] wct4xxp: Fix condition where hardware echo canceler erroneously mutes DTMF. Commit r9750 "wct4xxp: Reduce the memory footprint of the hardware echocanceler.", as part of reducing the non-pageable memory required to support the VPMOCT064 and VPMOCT128, disabled caching of some hardware echocan registers. This resulted in more physical reads to the echo canceler. These new read transactions exposed an existing issue where sometimes reads could be turned into writes which put a channel into an unintended state preventing Asterisk from detecting any DTMF. This issue is resolved by ensuring that the write signal to the Octasic part is explicitly cleared between when the address is presented on the bus and when the read and chip select signals are asserted. The cost is an increase in the average time to enable / disable echo cancellation by about 5 us on one Intel Xeon X3220 test machine (~250ns increase per read from the Octasic part and 20 reads to enable / disable a channel). This commit resolves a behavioral regression first introduced in 2.5.0 and 2.4.1 which could take many calls before revealing itself. This change only affects cards with a VPMOCT128 or VPMOCT064 installed. Signed-off-by: Shaun Ruffell Acked-by: Doug Bailey git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@10220 a0bf4364-ded3-4de4-8d8a-66a801d63aff --- drivers/dahdi/wct4xxp/base.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/dahdi/wct4xxp/base.c b/drivers/dahdi/wct4xxp/base.c index 69d18e6..3b5e9e2 100644 --- a/drivers/dahdi/wct4xxp/base.c +++ b/drivers/dahdi/wct4xxp/base.c @@ -764,11 +764,9 @@ static inline unsigned int __t4_raw_oct_in(struct t4 *wc, const unsigned int add __t4_pci_out(wc, WC_LADDR, (WC_LWRITE | WC_LALE)); if (!pedanticpci) __t4_pci_in(wc, WC_VERSION); -#ifdef PEDANTIC_OCTASIC_CHECKING __t4_pci_out(wc, WC_LADDR, (WC_LALE)); if (!pedanticpci) __t4_pci_in(wc, WC_VERSION); -#endif if (!octopt) { __t4_gpio_setdir(wc, 0xff, 0x00); __t4_gpio_set(wc, 0xff, 0x00);