sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Drastic measures to work around missed interrupts -- must be a better way

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1860 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2009-06-07 15:48:01 +00:00
parent 275e43aba2
commit 696571a749
1 changed files with 168 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

205
arch/arm/src/str71x/str71x_serial.c
View File

@ -42,7 +42,9 @@
#include <unistd.h> #include <unistd.h>
#include <semaphore.h> #include <semaphore.h>
#include <string.h> #include <string.h>
#include <time.h>
#include <errno.h> #include <errno.h>
#include <wdog.h>
#include <debug.h> #include <debug.h>
#include <nuttx/irq.h> #include <nuttx/irq.h>
#include <nuttx/arch.h> #include <nuttx/arch.h>
@ -195,6 +197,11 @@
# warning "No CONFIG_UARTn_SERIAL_CONSOLE Setting" # warning "No CONFIG_UARTn_SERIAL_CONSOLE Setting"
#endif #endif
/* I am problems with lost UART interrupts. Could this just be my hardware? */
#define CONFIG_UART_LOSTTXINTPROTECTION 1
#define LOSTINT_TIMEOUT (100/CLK_TCK)
/* Select RX interrupt enable bits. There are two models: (1) We interrupt /* Select RX interrupt enable bits. There are two models: (1) We interrupt
* when each character is received. Or, (2) we interrupt when either the Rx * when each character is received. Or, (2) we interrupt when either the Rx
* FIFO is half full, OR a timeout occurs with data in the RX FIFO. The * FIFO is half full, OR a timeout occurs with data in the RX FIFO. The
@ -229,12 +236,34 @@ struct up_dev_s
ubyte parity; /* 0=none, 1=odd, 2=even */ ubyte parity; /* 0=none, 1=odd, 2=even */
ubyte bits; /* Number of bits (7 or 8) */ ubyte bits; /* Number of bits (7 or 8) */
boolean stopbits2; /* TRUE: Configure with 2 stop bits instead of 1 */ boolean stopbits2; /* TRUE: Configure with 2 stop bits instead of 1 */
#ifdef CONFIG_UART_LOSTTXINTPROTECTION
boolean wdrunning; /* TRUE: The watchdog is running */
WDOG_ID wdog; /* Watchdog to catch missed UART interrupts */
#endif
}; };
/**************************************************************************** /****************************************************************************
* Private Function Prototypes * Private Function Prototypes
****************************************************************************/ ****************************************************************************/
/* Internal Helpers */
static inline uint16 up_serialin(struct up_dev_s *priv, int offset);
static inline void up_serialout(struct up_dev_s *priv, int offset, uint16 value);
static inline void up_disableuartint(struct up_dev_s *priv, uint16 *ier);
static inline void up_restoreuartint(struct up_dev_s *priv, uint16 ier);
#ifdef HAVE_CONSOLE
static inline void up_waittxnotfull(struct up_dev_s *priv);
#endif
#ifdef CONFIG_UART_LOSTTXINTPROTECTION
static void up_lostint(int argc, uint32 arg1, ...);
static int up_intinternal(struct uart_dev_s *dev);
#else
static inline int up_intinternal(struct uart_dev_s *dev);
#endif
/* Serial Driver Methods */
static int up_setup(struct uart_dev_s *dev); static int up_setup(struct uart_dev_s *dev);
static void up_shutdown(struct uart_dev_s *dev); static void up_shutdown(struct uart_dev_s *dev);
static int up_attach(struct uart_dev_s *dev); static int up_attach(struct uart_dev_s *dev);
@ -266,7 +295,7 @@ struct uart_ops_s g_uart_ops =
.send = up_send, .send = up_send,
.txint = up_txint, .txint = up_txint,
.txready = up_txready, .txready = up_txready,
.txempty = up_txempty, .txempty = up_txempty,
}; };
/* I/O buffers */ /* I/O buffers */
@ -479,6 +508,35 @@ static inline void up_waittxnotfull(struct up_dev_s *priv)
} }
#endif #endif
/****************************************************************************
* Name: up_lostint
*
* Description:
* Check for lost interrupts
*
****************************************************************************/
#ifdef CONFIG_UART_LOSTTXINTPROTECTION
static void up_lostint(int argc, uint32 arg1, ...)
{
struct uart_dev_s *dev = (struct uart_dev_s*)arg1;
struct up_dev_s *priv;
/* Check if we missed any interrupt conditions */
DEBUGASSERT(argc == 1 && dev && dev->priv);
(void)up_intinternal(dev);
/* Re-start a watchdog to catch more missed interrupts */
priv = (struct up_dev_s*)dev->priv;
if (priv->wdrunning)
{
wd_start(priv->wdog, LOSTINT_TIMEOUT, up_lostint, 1, (void*)dev);
}
}
#endif
/**************************************************************************** /****************************************************************************
* Name: up_setup * Name: up_setup
* *
@ -559,6 +617,11 @@ static int up_setup(struct uart_dev_s *dev)
/* Set up the IER */ /* Set up the IER */
priv->ier = up_serialin(priv, STR71X_UART_IER_OFFSET); priv->ier = up_serialin(priv, STR71X_UART_IER_OFFSET);
/* Set up a watchdog to catch missed UART interrupts */
#ifdef CONFIG_UART_LOSTTXINTPROTECTION
priv->wdog = wd_create();
#endif
#endif #endif
return OK; return OK;
} }
@ -576,6 +639,9 @@ static void up_shutdown(struct uart_dev_s *dev)
{ {
struct up_dev_s *priv = (struct up_dev_s*)dev->priv; struct up_dev_s *priv = (struct up_dev_s*)dev->priv;
up_disableuartint(priv, NULL); up_disableuartint(priv, NULL);
#ifdef CONFIG_UART_LOSTTXINTPROTECTION
wd_delete(priv->wdog);
#endif
} }
/**************************************************************************** /****************************************************************************
@ -646,45 +712,18 @@ static void up_detach(struct uart_dev_s *dev)
* *
****************************************************************************/ ****************************************************************************/
static int up_interrupt(int irq, void *context) #ifdef CONFIG_UART_LOSTTXINTPROTECTION
static int up_intinternal(struct uart_dev_s *dev)
#else
static inline int up_intinternal(struct uart_dev_s *dev)
#endif
{ {
struct uart_dev_s *dev = NULL; struct up_dev_s *priv;
struct up_dev_s *priv; int passes;
int passes; boolean handled;
boolean handled;
#ifdef CONFIG_STR71X_UART0
if (g_uart0priv.irq == irq)
{
dev = &g_uart0port;
}
else
#endif
#ifdef CONFIG_STR71X_UART1
if (g_uart1priv.irq == irq)
{
dev = &g_uart1port;
}
else
#endif
#ifdef CONFIG_STR71X_UART2
if (g_uart2priv.irq == irq)
{
dev = &g_uart2port;
}
else
#endif
#ifdef CONFIG_STR71X_UART3
if (g_uart3priv.irq == irq)
{
dev = &g_uart3port;
}
else
#endif
{
PANIC(OSERR_INTERNAL);
}
priv = (struct up_dev_s*)dev->priv; priv = (struct up_dev_s*)dev->priv;
DEBUGASSERT(priv && dev);
/* Loop until there are no characters to be transferred or, /* Loop until there are no characters to be transferred or,
* until we have been looping for a long time. * until we have been looping for a long time.
@ -724,6 +763,44 @@ static int up_interrupt(int irq, void *context)
return OK; return OK;
} }
static int up_interrupt(int irq, void *context)
{
struct uart_dev_s *dev = NULL;
#ifdef CONFIG_STR71X_UART0
if (g_uart0priv.irq == irq)
{
dev = &g_uart0port;
}
else
#endif
#ifdef CONFIG_STR71X_UART1
if (g_uart1priv.irq == irq)
{
dev = &g_uart1port;
}
else
#endif
#ifdef CONFIG_STR71X_UART2
if (g_uart2priv.irq == irq)
{
dev = &g_uart2port;
}
else
#endif
#ifdef CONFIG_STR71X_UART3
if (g_uart3priv.irq == irq)
{
dev = &g_uart3port;
}
else
#endif
{
PANIC(OSERR_INTERNAL);
}
return up_intinternal(dev);
}
/**************************************************************************** /****************************************************************************
* Name: up_ioctl * Name: up_ioctl
* *
@ -848,19 +925,73 @@ static void up_send(struct uart_dev_s *dev, int ch)
static void up_txint(struct uart_dev_s *dev, boolean enable) static void up_txint(struct uart_dev_s *dev, boolean enable)
{ {
#ifdef CONFIG_UART_LOSTTXINTPROTECTION
struct up_dev_s *priv = (struct up_dev_s*)dev->priv;
irqstate_t flags;
flags = irqsave();
if (enable)
{
/* Set to receive an interrupt when the TX fifo is half emptied */
#ifndef CONFIG_SUPPRESS_SERIAL_INTS
priv->ier |= STR71X_UARTSR_THE;
up_serialout(priv, STR71X_UART_IER_OFFSET, priv->ier);
/* Start a watchdog to catch missed UART Tx interrupts (Need to do
* this before calling uart_xmitchars() because that function
* could recurse and disable Tx interrupts before returning.
*/
wd_start(priv->wdog, LOSTINT_TIMEOUT, up_lostint, 1, (void*)dev);
priv->wdrunning = TRUE;
/* The serial driver wants an interrupt here, but will not get get
* one unless we "prime the pump."
*/
uart_xmitchars(dev);
#endif
}
else
{
/* Stop the watchdog if it is running */
if (priv->wdrunning)
{
wd_cancel(priv->wdog);
priv->wdrunning = FALSE;
}
/* Disable the TX interrupt */
priv->ier &= ~STR71X_UARTSR_THE;
up_serialout(priv, STR71X_UART_IER_OFFSET, priv->ier);
}
irqrestore(flags);
#else /* CONFIG_UART_LOSTTXINTPROTECTION */
struct up_dev_s *priv = (struct up_dev_s*)dev->priv; struct up_dev_s *priv = (struct up_dev_s*)dev->priv;
if (enable) if (enable)
{ {
/* Set to receive an interrupt when the TX fifo is half emptied */ /* Set to receive an interrupt when the TX fifo is half emptied */
#ifndef CONFIG_SUPPRESS_SERIAL_INTS #ifndef CONFIG_SUPPRESS_SERIAL_INTS
priv->ier |= STR71X_UARTSR_THE; priv->ier |= STR71X_UARTSR_THE;
#endif #endif
} }
else else
{ {
/* Disable the TX interrupt */
priv->ier &= ~STR71X_UARTSR_THE; priv->ier &= ~STR71X_UARTSR_THE;
} }
up_serialout(priv, STR71X_UART_IER_OFFSET, priv->ier); up_serialout(priv, STR71X_UART_IER_OFFSET, priv->ier);
#endif /* CONFIG_UART_LOSTTXINTPROTECTION */
} }
/**************************************************************************** /****************************************************************************