OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

arch/intel64: fix IRQ conflict with GOLDFISH 

Also move MSI IRQ definition to place where other IRQ definitions are.

Signed-off-by: p-szafonimateusz <p-szafonimateusz@xiaomi.com>
This commit is contained in:
p-szafonimateusz 2024-09-10 08:58:27 +02:00 committed by Xiang Xiao
parent 76bfb994a7
commit b47839b9c2
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
arch/x86_64/include/intel64/irq.h
View File

@ -346,10 +346,18 @@
#define HPET0_IRQ IRQ2 #define HPET0_IRQ IRQ2
#define HPET1_IRQ IRQ8 #define HPET1_IRQ IRQ8
/* Use IRQ15 IRQ16 for SMP */ /* NuttX custom interrupts configuration starts from here.
* IRQ16-IRQ23 are reserved for GOLDFISH so we start from IRQ24.
*/
#define SMP_IPI_IRQ IRQ15 /* Use IRQ24 IRQ25 for SMP */
#define SMP_IPI_ASYNC_IRQ IRQ16
#define SMP_IPI_IRQ IRQ24
#define SMP_IPI_ASYNC_IRQ IRQ25
/* Use IRQ32 and above for MSI */
#define IRQ_MSI_START IRQ32
/* Common register save structure created by up_saveusercontext() and by /* Common register save structure created by up_saveusercontext() and by
* ISR/IRQ interrupt processing. * ISR/IRQ interrupt processing.

1
arch/x86_64/src/intel64/intel64_irq.c
View File

@ -48,7 +48,6 @@
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
#define IRQ_MSI_START IRQ32
#define X86_64_MAR_DEST 0xfee00000 #define X86_64_MAR_DEST 0xfee00000
#define X86_64_MDR_TYPE 0x4000 #define X86_64_MDR_TYPE 0x4000