deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

cc2538: aes: Fix possibly missing result available status

Browse source 
Depending on the use case and on the timings,
aes_auth_crypt_check_status() sometimes never reported an available
result, leading to a deadlock of any protothread waiting for this event,
and to a WDT reset if a protothread was polling it.

This was caused by aes_auth_crypt_start() clearing the result available
interrupt after operations that may rightfully trigger it, leading to a
missed interrupt.

Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau.dev@gmail.com>
This commit is contained in:
Benoît Thébaudeau 2016-06-23 22:25:27 +02:00
parent 8fd7719c07
commit 1da00a482f
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
cpu/cc2538/dev/aes.c
View file

@ -226,12 +226,14 @@ aes_auth_crypt_start(uint32_t ctrl, uint8_t key_area, const void *iv,
REG(AES_CTRL_ALG_SEL) = 0x00000000; REG(AES_CTRL_ALG_SEL) = 0x00000000;
return CRYPTO_DMA_BUS_ERROR; return CRYPTO_DMA_BUS_ERROR;
} }
/* Clear interrupt status */
REG(AES_CTRL_INT_CLR) = AES_CTRL_INT_CLR_DMA_IN_DONE;
} }
} }
/* Clear interrupt status */ /* Enable result available bit in interrupt enable */
REG(AES_CTRL_INT_CLR) = AES_CTRL_INT_CLR_DMA_IN_DONE | REG(AES_CTRL_INT_EN) = AES_CTRL_INT_EN_RESULT_AV;
AES_CTRL_INT_CLR_RESULT_AV;
if(process != NULL) { if(process != NULL) {
crypto_register_process_notification(process); crypto_register_process_notification(process);
@ -239,9 +241,6 @@ aes_auth_crypt_start(uint32_t ctrl, uint8_t key_area, const void *iv,
nvic_interrupt_enable(NVIC_INT_AES); nvic_interrupt_enable(NVIC_INT_AES);
} }
/* Enable result available bit in interrupt enable */
REG(AES_CTRL_INT_EN) = AES_CTRL_INT_EN_RESULT_AV;
if(data_len != 0) { if(data_len != 0) {
/* Configure DMAC /* Configure DMAC
* Enable DMA channel 0 */ * Enable DMA channel 0 */