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

wcaxx: Use startup/shutdown callbacks to protect access to channel registers.

Browse Source 
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
This commit is contained in:
Shaun Ruffell 2013-11-25 11:38:11 -06:00
parent 3a0905b1ec
commit 1cf7d9b08c
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/dahdi/wcaxx-base.c
View File

@ -33,6 +33,7 @@
#include <linux/moduleparam.h> #include <linux/moduleparam.h>
#include <linux/firmware.h> #include <linux/firmware.h>
#include <linux/crc32.h> #include <linux/crc32.h>
#include <linux/interrupt.h>
#include <stdbool.h> #include <stdbool.h>
@ -1986,8 +1987,7 @@ static void wcaxx_handle_receive(struct wcxb *xb, void *_frame)
wc->module_poll_time = wc->framecount + MODULE_POLL_TIME_MS; wc->module_poll_time = wc->framecount + MODULE_POLL_TIME_MS;
} }
/* TODO: This protection needs to be thought about. */ if (!test_bit(DAHDI_FLAGBIT_RUNNING, &wc->span.flags))
if (!test_bit(DAHDI_FLAGBIT_REGISTERED, &wc->span.flags))
return; return;
for (j = 0; j < DAHDI_CHUNKSIZE; j++) { for (j = 0; j < DAHDI_CHUNKSIZE; j++) {
@ -2012,8 +2012,7 @@ static void wcaxx_handle_transmit(struct wcxb *xb, void *_frame)
wcxb_spi_handle_interrupt(wc->master); wcxb_spi_handle_interrupt(wc->master);
/* TODO: This protection needs to be thought about. */ if (!test_bit(DAHDI_FLAGBIT_RUNNING, &wc->span.flags))
if (!test_bit(DAHDI_FLAGBIT_REGISTERED, &wc->span.flags))
return; return;
_dahdi_transmit(&wc->span); _dahdi_transmit(&wc->span);
@ -3384,36 +3383,41 @@ wcaxx_chanconfig(struct file *file, struct dahdi_chan *chan, int sigtype)
} }
/* /*
* wcaxx_assigned - Called when span is assigned. * wcaxx_span_shutdown - Called when span is unassigned or shutdown.
* @span: The span that is now assigned. * @span: The span that is shutdown
*
* This function is called by the core of DAHDI after the span number and
* channel numbers have been assigned.
* *
*/ */
static void wcaxx_assigned(struct dahdi_span *span) static int wcaxx_span_shutdown(struct dahdi_span *span)
{ {
struct dahdi_span *s; struct wcaxx *wc = container_of(span, struct wcaxx, span);
struct dahdi_device *ddev = span->parent; clear_bit(DAHDI_FLAGBIT_RUNNING, &span->flags);
struct wcaxx *wc = NULL; synchronize_irq(wc->xb.pdev->irq);
return 0;
}
list_for_each_entry(s, &ddev->spans, device_node) { /*
wc = container_of(s, struct wcaxx, span); * wcaxx_span_startup - Called when span is unassigned or shutdown.
if (!test_bit(DAHDI_FLAGBIT_REGISTERED, &s->flags)) * @span: The span that is shutdown
return; *
} */
static int wcaxx_span_startup(struct file *file, struct dahdi_span *span)
{
set_bit(DAHDI_FLAGBIT_RUNNING, &span->flags);
return 0;
} }
static const struct dahdi_span_ops wcaxx_span_ops = { static const struct dahdi_span_ops wcaxx_span_ops = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.hooksig = wcaxx_hooksig, .hooksig = wcaxx_hooksig,
.shutdown = wcaxx_span_shutdown,
.startup = wcaxx_span_startup,
.open = wcaxx_open, .open = wcaxx_open,
.close = wcaxx_close, .close = wcaxx_close,
.ioctl = wcaxx_ioctl, .ioctl = wcaxx_ioctl,
.watchdog = wcaxx_watchdog, .watchdog = wcaxx_watchdog,
.chanconfig = wcaxx_chanconfig, .chanconfig = wcaxx_chanconfig,
.dacs = wcaxx_dacs, .dacs = wcaxx_dacs,
.assigned = wcaxx_assigned,
#ifdef VPM_SUPPORT #ifdef VPM_SUPPORT
.echocan_create = wcaxx_echocan_create, .echocan_create = wcaxx_echocan_create,
.echocan_name = wcaxx_echocan_name, .echocan_name = wcaxx_echocan_name,