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

Tiva Ethernet: Move place where interrupts are disabled. It is probably not possible, but the logic looks like it could leave interrupts disabled

Browse Source
This commit is contained in:
Gregory Nutt 2015-01-27 14:59:31 -06:00
parent 523b12c624
commit ce80d90e6d
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
arch/arm/src/tiva/tm4c_ethernet.c
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
* arch/arm/src/tiva/tm4c_ethernet.c * arch/arm/src/tiva/tm4c_ethernet.c
* *
* Copyright (C) 2014 Gregory Nutt. All rights reserved. * Copyright (C) 2014-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -2127,22 +2127,24 @@ static int tiva_interrupt(int irq, FAR void *context)
#ifdef CONFIG_NET_NOINTS #ifdef CONFIG_NET_NOINTS
uint32_t dmaris; uint32_t dmaris;
/* Disable further Ethernet interrupts. Because Ethernet interrupts are /* Get the raw interrupt status. */
* also disabled if the TX timeout event occurs, there can be no race
* condition here.
*/
up_disable_irq(TIVA_IRQ_ETHCON);
/* Check if a packet transmission just completed. */
dmaris = tiva_getreg(TIVA_EMAC_DMARIS); dmaris = tiva_getreg(TIVA_EMAC_DMARIS);
if (dmaris != 0) if (dmaris != 0)
{ {
/* Disable further Ethernet interrupts. Because Ethernet interrupts
* are also disabled if the TX timeout event occurs, there can be no
* race condition here.
*/
up_disable_irq(TIVA_IRQ_ETHCON);
/* Check if a packet transmission just completed. */
if ((dmaris & EMAC_DMAINT_TI) != 0) if ((dmaris & EMAC_DMAINT_TI) != 0)
{ {
/* If a TX transfer just completed, then cancel the TX timeout so /* If a TX transfer just completed, then cancel the TX timeout so
* there will be do race condition between any subsequent timeout * there will be no race condition between any subsequent timeout
* expiration and the deferred interrupt processing. * expiration and the deferred interrupt processing.
*/ */