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

arm/armv8-m: Handle the special irq correctly in up_secure_irq

Browse Source 
Signed-off-by: Xiang Xiao <xiaoxiang@xiaomi.com>
This commit is contained in:
Xiang Xiao 2022-02-13 06:30:56 +08:00 committed by Masayuki Ishikawa
parent 1ca952243c
commit 4207882cdc
1 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
arch/arm/src/armv8-m/arm_secure_irq.c
View File

@ -51,17 +51,41 @@ void up_secure_irq(int irq, bool secure)
{
uint32_t regaddr;
uint32_t regval;
int shift;
uint32_t regbit;
DEBUGASSERT(irq >= NVIC_IRQ_FIRST && irq < NR_IRQS);
switch (irq)
{
case NVIC_IRQ_NMI:
case NVIC_IRQ_HARDFAULT:
case NVIC_IRQ_BUSFAULT:
regaddr = NVIC_AIRCR;
regbit = NVIC_AIRCR_BFHFNMINS;
break;
irq -= NVIC_IRQ_FIRST;
regaddr = NVIC_IRQ_TARGET(irq);
case NVIC_IRQ_DBGMONITOR:
regaddr = NVIC_DEMCR;
regbit = NVIC_DEMCR_SDME;
secure = !secure;
break;
default:
DEBUGASSERT(irq >= NVIC_IRQ_FIRST && irq < NR_IRQS);
irq -= NVIC_IRQ_FIRST;
regaddr = NVIC_IRQ_TARGET(irq);
regbit = 1 << (irq & 0x1f);
break;
}
regval = getreg32(regaddr);
if (secure)
{
regval &= ~regbit;
}
else
{
regval |= regbit;
}
regval = getreg32(regaddr);
shift = irq & 0x1f;
regval &= ~(1 << shift);
regval |= !secure << shift;
putreg32(regval, regaddr);
}
@ -77,6 +101,12 @@ void up_secure_irq_all(bool secure)
{
int i;
modreg32(secure ? 0 : NVIC_AIRCR_BFHFNMINS,
NVIC_AIRCR_BFHFNMINS, NVIC_AIRCR);
modreg32(secure ? NVIC_DEMCR_SDME : 0,
NVIC_DEMCR_SDME, NVIC_DEMCR);
for (i = 0; i <= NR_IRQS - NVIC_IRQ_FIRST; i += 32)
{
putreg32(secure ? 0x0 : 0xffffffff, NVIC_IRQ_TARGET(i));