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

Fix issues on fe310 including interrupt handling (#46)

Browse Source 
* arch: fe310: Fix comments

* arch: fe310: Improve irq handling in fe310_serial.c

* arch: fe310: Fix initial interrupt status (mstatus)

Also, removed unnecessary up_enable_irq(FE310_IRQ_ECALLM)
This commit is contained in:
Masayuki Ishikawa 2020-01-07 19:17:39 +09:00 committed by Alan Carvalho de Assis
parent 926a41feba
commit 4ea49c5691
6 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/risc-v/include/fe310/irq.h
View File

@ -46,6 +46,7 @@
/* In mstatus register */ /* In mstatus register */
#define MSTATUS_MIE (0x1 << 3) /* Machine Interrupt Enable */ #define MSTATUS_MIE (0x1 << 3) /* Machine Interrupt Enable */
#define MSTATUS_MPIE (0x1 << 7) /* Machine Previous Interrupt Enable */
/* In mie (machine interrupt enable) register */ /* In mie (machine interrupt enable) register */

2
arch/risc-v/src/fe310/fe310_clockconfig.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* arch/arm/src/fe310/fe310_clockconfig.c * arch/risc-v/src/fe310/fe310_clockconfig.c
* *
* Copyright (C) 2019 Masayuki Ishikawa. All rights reserved. * Copyright (C) 2019 Masayuki Ishikawa. All rights reserved.
* Author: Masayuki Ishikawa <masayuki.ishikawa@gmail.com> * Author: Masayuki Ishikawa <masayuki.ishikawa@gmail.com>

2
arch/risc-v/src/fe310/fe310_clockconfig.h
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* arch/arm/src/fe310/fe310_clockconfig.h * arch/risc-v/src/fe310/fe310_clockconfig.h
* *
* Copyright (C) 2019 Masayuki Ishikawa. All rights reserved. * Copyright (C) 2019 Masayuki Ishikawa. All rights reserved.
* Author: Masayuki Ishikawa <masayuki.ishikawa@gmail.com> * Author: Masayuki Ishikawa <masayuki.ishikawa@gmail.com>

2
arch/risc-v/src/fe310/fe310_gpio.c
View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* arch/arm/src/fe310/fe310_gpio.c * arch/risc-v/src/fe310/fe310_gpio.c
* *
* Copyright (C) 2019 Masayuki Ishikawa. All rights reserved. * Copyright (C) 2019 Masayuki Ishikawa. All rights reserved.
* Author: Masayuki Ishikawa <masayuki.ishikawa@gmail.com> * Author: Masayuki Ishikawa <masayuki.ishikawa@gmail.com>

7
arch/risc-v/src/fe310/fe310_irq.c
View File

@ -100,7 +100,6 @@ void up_irqinitialize(void)
/* Attach the ecall interrupt handler */ /* Attach the ecall interrupt handler */
irq_attach(FE310_IRQ_ECALLM, up_swint, NULL); irq_attach(FE310_IRQ_ECALLM, up_swint, NULL);
up_enable_irq(FE310_IRQ_ECALLM);
#ifndef CONFIG_SUPPRESS_INTERRUPTS #ifndef CONFIG_SUPPRESS_INTERRUPTS
@ -188,13 +187,13 @@ void up_enable_irq(int irq)
* Name: up_get_newintctx * Name: up_get_newintctx
* *
* Description: * Description:
* Return a value for EPIC. But FE310 doesn't use EPIC for event control. * Return initial mstatus when a task is created.
* *
****************************************************************************/ ****************************************************************************/
uint32_t up_get_newintctx(void) uint32_t up_get_newintctx(void)
{ {
return 0; return (MSTATUS_MPIE | MSTATUS_MIE);
} }
/**************************************************************************** /****************************************************************************
@ -238,7 +237,7 @@ irqstate_t up_irq_save(void)
void up_irq_restore(irqstate_t flags) void up_irq_restore(irqstate_t flags)
{ {
/* Machine mode - mstatus */ /* Write flags to mstatus */
asm volatile("csrw mstatus, %0" : /* no output */ : "r" (flags)); asm volatile("csrw mstatus, %0" : /* no output */ : "r" (flags));
} }

12
arch/risc-v/src/fe310/fe310_serial.c
View File

@ -398,6 +398,11 @@ static int up_interrupt(int irq, void *context, FAR void *arg)
status = up_serialin(priv, UART_IP_OFFSET); status = up_serialin(priv, UART_IP_OFFSET);
if (status == 0)
{
break;
}
if (status & UART_IP_RXWM) if (status & UART_IP_RXWM)
{ {
/* Process incoming bytes */ /* Process incoming bytes */
@ -405,9 +410,12 @@ static int up_interrupt(int irq, void *context, FAR void *arg)
uart_recvchars(dev); uart_recvchars(dev);
} }
/* Process outgoing bytes */ if (status & UART_IP_TXWM)
{
/* Process outgoing bytes */
uart_xmitchars(dev); uart_xmitchars(dev);
}
} }
return OK; return OK;