From f3919b8e454ab6e46d52e162f97b66ad5e354618 Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 11 May 2019 08:04:43 +0000 Subject: [PATCH] Updated F7 mcuconf.h files to enable CRY driver. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12784 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- .../NASA-OSAL-STM32F746G-DISCOVERY/cfg/mcuconf.h | 5 +++++ .../STM32/NIL-STM32F746G-DISCOVERY/cfg/mcuconf.h | 5 +++++ .../cfg/stm32f746_discovery/mcuconf.h | 5 +++++ .../cfg/stm32f746_discovery/mcuconf.h | 5 +++++ demos/STM32/RT-STM32F746G-DISCOVERY/cfg/mcuconf.h | 5 +++++ .../STM32/RT-STM32F746ZG-NUCLEO144/cfg/mcuconf.h | 5 +++++ .../STM32/RT-STM32F756ZG-NUCLEO144/cfg/mcuconf.h | 5 +++++ os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.c | 8 ++++---- os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.h | 15 +++------------ testhal/STM32/STM32F7xx/GPT-ADC/mcuconf.h | 5 +++++ testhal/STM32/STM32F7xx/IRQ_STORM/mcuconf.h | 5 +++++ testhal/STM32/STM32F7xx/PWM-ICU/mcuconf.h | 5 +++++ testhal/STM32/STM32F7xx/SPI/mcuconf.h | 5 +++++ testhal/STM32/STM32F7xx/USB_RAW/mcuconf.h | 5 +++++ .../CRYPTO/cfg/stm32f756zg_nucleo144/mcuconf.h | 7 ++++++- testhal/STM32/multi/CRYPTO/main.c | 11 +++++++++++ .../multi/PAL/cfg/stm32f746_discovery/mcuconf.h | 5 +++++ .../multi/RTC/cfg/stm32f746_discovery/mcuconf.h | 5 +++++ .../multi/UART/cfg/stm32f746_discovery/mcuconf.h | 5 +++++ .../USB_CDC/cfg/stm32f746_discovery/mcuconf.h | 5 +++++ .../conf/mcuconf_stm32f746xx/mcuconf.h.ftl | 5 +++++ 21 files changed, 109 insertions(+), 17 deletions(-) diff --git a/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/cfg/mcuconf.h b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/cfg/mcuconf.h index cf18f72fb..2ee801f0b 100644 --- a/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/cfg/mcuconf.h +++ b/demos/STM32/NASA-OSAL-STM32F746G-DISCOVERY/cfg/mcuconf.h @@ -148,9 +148,14 @@ #define STM32_CRY_USE_HASH1 FALSE #define STM32_CRY_CRYP1_IRQ_PRIORITY 9 #define STM32_CRY_HASH1_IRQ_PRIORITY 9 +#define STM32_CRY_CRYP1_IN_DMA_STREAM STM32_DMA_STREAM_ID(2, 6) +#define STM32_CRY_CRYP1_OUT_DMA_STREAM STM32_DMA_STREAM_ID(2, 5) #define STM32_CRY_HASH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) +#define STM32_CRY_CRYP1_IN_DMA_PRIORITY 0 +#define STM32_CRY_CRYP1_OUT_DMA_PRIORITY 1 #define STM32_CRY_HASH1_DMA_PRIORITY 0 #define STM32_CRY_HASH_SIZE_THRESHOLD 1024 +#define STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") #define STM32_CRY_HASH_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") /* diff --git a/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/mcuconf.h b/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/mcuconf.h index 4688cd053..dde3318b8 100644 --- a/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/mcuconf.h +++ b/demos/STM32/NIL-STM32F746G-DISCOVERY/cfg/mcuconf.h @@ -148,9 +148,14 @@ #define STM32_CRY_USE_HASH1 FALSE #define STM32_CRY_CRYP1_IRQ_PRIORITY 9 #define STM32_CRY_HASH1_IRQ_PRIORITY 9 +#define STM32_CRY_CRYP1_IN_DMA_STREAM STM32_DMA_STREAM_ID(2, 6) +#define STM32_CRY_CRYP1_OUT_DMA_STREAM STM32_DMA_STREAM_ID(2, 5) #define STM32_CRY_HASH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) +#define STM32_CRY_CRYP1_IN_DMA_PRIORITY 0 +#define STM32_CRY_CRYP1_OUT_DMA_PRIORITY 1 #define STM32_CRY_HASH1_DMA_PRIORITY 0 #define STM32_CRY_HASH_SIZE_THRESHOLD 1024 +#define STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") #define STM32_CRY_HASH_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") /* diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/mcuconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/mcuconf.h index 0a0847b19..899f46955 100644 --- a/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/mcuconf.h +++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB-HTTPS/cfg/stm32f746_discovery/mcuconf.h @@ -148,9 +148,14 @@ #define STM32_CRY_USE_HASH1 FALSE #define STM32_CRY_CRYP1_IRQ_PRIORITY 9 #define STM32_CRY_HASH1_IRQ_PRIORITY 9 +#define STM32_CRY_CRYP1_IN_DMA_STREAM STM32_DMA_STREAM_ID(2, 6) +#define STM32_CRY_CRYP1_OUT_DMA_STREAM STM32_DMA_STREAM_ID(2, 5) #define STM32_CRY_HASH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) +#define STM32_CRY_CRYP1_IN_DMA_PRIORITY 0 +#define STM32_CRY_CRYP1_OUT_DMA_PRIORITY 1 #define STM32_CRY_HASH1_DMA_PRIORITY 0 #define STM32_CRY_HASH_SIZE_THRESHOLD 1024 +#define STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") #define STM32_CRY_HASH_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") /* diff --git a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/mcuconf.h b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/mcuconf.h index 0a0847b19..899f46955 100644 --- a/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/mcuconf.h +++ b/demos/STM32/RT-STM32-LWIP-FATFS-USB/cfg/stm32f746_discovery/mcuconf.h @@ -148,9 +148,14 @@ #define STM32_CRY_USE_HASH1 FALSE #define STM32_CRY_CRYP1_IRQ_PRIORITY 9 #define STM32_CRY_HASH1_IRQ_PRIORITY 9 +#define STM32_CRY_CRYP1_IN_DMA_STREAM STM32_DMA_STREAM_ID(2, 6) +#define STM32_CRY_CRYP1_OUT_DMA_STREAM STM32_DMA_STREAM_ID(2, 5) #define STM32_CRY_HASH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) +#define STM32_CRY_CRYP1_IN_DMA_PRIORITY 0 +#define STM32_CRY_CRYP1_OUT_DMA_PRIORITY 1 #define STM32_CRY_HASH1_DMA_PRIORITY 0 #define STM32_CRY_HASH_SIZE_THRESHOLD 1024 +#define STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") #define STM32_CRY_HASH_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") /* diff --git a/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/mcuconf.h b/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/mcuconf.h index 4688cd053..dde3318b8 100644 --- a/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/mcuconf.h +++ b/demos/STM32/RT-STM32F746G-DISCOVERY/cfg/mcuconf.h @@ -148,9 +148,14 @@ #define STM32_CRY_USE_HASH1 FALSE #define STM32_CRY_CRYP1_IRQ_PRIORITY 9 #define STM32_CRY_HASH1_IRQ_PRIORITY 9 +#define STM32_CRY_CRYP1_IN_DMA_STREAM STM32_DMA_STREAM_ID(2, 6) +#define STM32_CRY_CRYP1_OUT_DMA_STREAM STM32_DMA_STREAM_ID(2, 5) #define STM32_CRY_HASH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) +#define STM32_CRY_CRYP1_IN_DMA_PRIORITY 0 +#define STM32_CRY_CRYP1_OUT_DMA_PRIORITY 1 #define STM32_CRY_HASH1_DMA_PRIORITY 0 #define STM32_CRY_HASH_SIZE_THRESHOLD 1024 +#define STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") #define STM32_CRY_HASH_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") /* diff --git a/demos/STM32/RT-STM32F746ZG-NUCLEO144/cfg/mcuconf.h b/demos/STM32/RT-STM32F746ZG-NUCLEO144/cfg/mcuconf.h index 1f233e46c..e40bd381d 100644 --- a/demos/STM32/RT-STM32F746ZG-NUCLEO144/cfg/mcuconf.h +++ b/demos/STM32/RT-STM32F746ZG-NUCLEO144/cfg/mcuconf.h @@ -148,9 +148,14 @@ #define STM32_CRY_USE_HASH1 FALSE #define STM32_CRY_CRYP1_IRQ_PRIORITY 9 #define STM32_CRY_HASH1_IRQ_PRIORITY 9 +#define STM32_CRY_CRYP1_IN_DMA_STREAM STM32_DMA_STREAM_ID(2, 6) +#define STM32_CRY_CRYP1_OUT_DMA_STREAM STM32_DMA_STREAM_ID(2, 5) #define STM32_CRY_HASH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) +#define STM32_CRY_CRYP1_IN_DMA_PRIORITY 0 +#define STM32_CRY_CRYP1_OUT_DMA_PRIORITY 1 #define STM32_CRY_HASH1_DMA_PRIORITY 0 #define STM32_CRY_HASH_SIZE_THRESHOLD 1024 +#define STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") #define STM32_CRY_HASH_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") /* diff --git a/demos/STM32/RT-STM32F756ZG-NUCLEO144/cfg/mcuconf.h b/demos/STM32/RT-STM32F756ZG-NUCLEO144/cfg/mcuconf.h index 1f233e46c..e40bd381d 100644 --- a/demos/STM32/RT-STM32F756ZG-NUCLEO144/cfg/mcuconf.h +++ b/demos/STM32/RT-STM32F756ZG-NUCLEO144/cfg/mcuconf.h @@ -148,9 +148,14 @@ #define STM32_CRY_USE_HASH1 FALSE #define STM32_CRY_CRYP1_IRQ_PRIORITY 9 #define STM32_CRY_HASH1_IRQ_PRIORITY 9 +#define STM32_CRY_CRYP1_IN_DMA_STREAM STM32_DMA_STREAM_ID(2, 6) +#define STM32_CRY_CRYP1_OUT_DMA_STREAM STM32_DMA_STREAM_ID(2, 5) #define STM32_CRY_HASH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) +#define STM32_CRY_CRYP1_IN_DMA_PRIORITY 0 +#define STM32_CRY_CRYP1_OUT_DMA_PRIORITY 1 #define STM32_CRY_HASH1_DMA_PRIORITY 0 #define STM32_CRY_HASH_SIZE_THRESHOLD 1024 +#define STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") #define STM32_CRY_HASH_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") /* diff --git a/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.c b/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.c index 134aad36a..d2542d658 100644 --- a/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.c +++ b/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.c @@ -174,9 +174,9 @@ static void cry_lld_serve_cryp_in_interrupt(CRYDriver *cryp, uint32_t flags) { (void)cryp; /* DMA errors handling.*/ -#if defined(STM32_CRY_CRYP_IN_DMA_ERROR_HOOK) +#if defined(STM32_CRY_CRYP_DMA_ERROR_HOOK) if ((flags & (STM32_DMA_ISR_TEIF | STM32_DMA_ISR_DMEIF)) != 0U) { - STM32_CRY_CRYP_IN_DMA_ERROR_HOOK(cryp); + STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp); } #endif } @@ -190,9 +190,9 @@ static void cry_lld_serve_cryp_in_interrupt(CRYDriver *cryp, uint32_t flags) { static void cry_lld_serve_cryp_out_interrupt(CRYDriver *cryp, uint32_t flags) { /* DMA errors handling.*/ -#if defined(STM32_CRY_CRYP_OUT_DMA_ERROR_HOOK) +#if defined(STM32_CRY_CRYP_DMA_ERROR_HOOK) if ((flags & (STM32_DMA_ISR_TEIF | STM32_DMA_ISR_DMEIF)) != 0U) { - STM32_CRY_CRYP_OUT_DMA_ERROR_HOOK(cryp); + STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp); } #endif diff --git a/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.h b/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.h index 0533a8fe7..a7c990e5d 100644 --- a/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.h +++ b/os/hal/ports/STM32/LLD/CRYPv1/hal_crypto_lld.h @@ -104,21 +104,12 @@ #endif /** - * @brief CRYP-IN DMA error hook. + * @brief CRYP DMA error hook. * @note The default action for DMA errors is a system halt because DMA * error can only happen because programming errors. */ -#if !defined(STM32_CRY_CRYP_IN_DMA_ERROR_HOOK) || defined(__DOXYGEN__) -#define STM32_CRY_CRYP_IN_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") -#endif - -/** - * @brief CRYP-OUT DMA error hook. - * @note The default action for DMA errors is a system halt because DMA - * error can only happen because programming errors. - */ -#if !defined(STM32_CRY_CRYP_OUT_DMA_ERROR_HOOK) || defined(__DOXYGEN__) -#define STM32_CRY_CRYP_OUT_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") +#if !defined(STM32_CRY_CRYP_DMA_ERROR_HOOK) || defined(__DOXYGEN__) +#define STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") #endif /** @} */ diff --git a/testhal/STM32/STM32F7xx/GPT-ADC/mcuconf.h b/testhal/STM32/STM32F7xx/GPT-ADC/mcuconf.h index faaa20d3e..39884c16f 100644 --- a/testhal/STM32/STM32F7xx/GPT-ADC/mcuconf.h +++ b/testhal/STM32/STM32F7xx/GPT-ADC/mcuconf.h @@ -148,9 +148,14 @@ #define STM32_CRY_USE_HASH1 FALSE #define STM32_CRY_CRYP1_IRQ_PRIORITY 9 #define STM32_CRY_HASH1_IRQ_PRIORITY 9 +#define STM32_CRY_CRYP1_IN_DMA_STREAM STM32_DMA_STREAM_ID(2, 6) +#define STM32_CRY_CRYP1_OUT_DMA_STREAM STM32_DMA_STREAM_ID(2, 5) #define STM32_CRY_HASH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) +#define STM32_CRY_CRYP1_IN_DMA_PRIORITY 0 +#define STM32_CRY_CRYP1_OUT_DMA_PRIORITY 1 #define STM32_CRY_HASH1_DMA_PRIORITY 0 #define STM32_CRY_HASH_SIZE_THRESHOLD 1024 +#define STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") #define STM32_CRY_HASH_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") /* diff --git a/testhal/STM32/STM32F7xx/IRQ_STORM/mcuconf.h b/testhal/STM32/STM32F7xx/IRQ_STORM/mcuconf.h index d658bc057..a06b371c3 100644 --- a/testhal/STM32/STM32F7xx/IRQ_STORM/mcuconf.h +++ b/testhal/STM32/STM32F7xx/IRQ_STORM/mcuconf.h @@ -148,9 +148,14 @@ #define STM32_CRY_USE_HASH1 FALSE #define STM32_CRY_CRYP1_IRQ_PRIORITY 9 #define STM32_CRY_HASH1_IRQ_PRIORITY 9 +#define STM32_CRY_CRYP1_IN_DMA_STREAM STM32_DMA_STREAM_ID(2, 6) +#define STM32_CRY_CRYP1_OUT_DMA_STREAM STM32_DMA_STREAM_ID(2, 5) #define STM32_CRY_HASH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) +#define STM32_CRY_CRYP1_IN_DMA_PRIORITY 0 +#define STM32_CRY_CRYP1_OUT_DMA_PRIORITY 1 #define STM32_CRY_HASH1_DMA_PRIORITY 0 #define STM32_CRY_HASH_SIZE_THRESHOLD 1024 +#define STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") #define STM32_CRY_HASH_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") /* diff --git a/testhal/STM32/STM32F7xx/PWM-ICU/mcuconf.h b/testhal/STM32/STM32F7xx/PWM-ICU/mcuconf.h index f661620c1..81f4706ce 100644 --- a/testhal/STM32/STM32F7xx/PWM-ICU/mcuconf.h +++ b/testhal/STM32/STM32F7xx/PWM-ICU/mcuconf.h @@ -148,9 +148,14 @@ #define STM32_CRY_USE_HASH1 FALSE #define STM32_CRY_CRYP1_IRQ_PRIORITY 9 #define STM32_CRY_HASH1_IRQ_PRIORITY 9 +#define STM32_CRY_CRYP1_IN_DMA_STREAM STM32_DMA_STREAM_ID(2, 6) +#define STM32_CRY_CRYP1_OUT_DMA_STREAM STM32_DMA_STREAM_ID(2, 5) #define STM32_CRY_HASH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) +#define STM32_CRY_CRYP1_IN_DMA_PRIORITY 0 +#define STM32_CRY_CRYP1_OUT_DMA_PRIORITY 1 #define STM32_CRY_HASH1_DMA_PRIORITY 0 #define STM32_CRY_HASH_SIZE_THRESHOLD 1024 +#define STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") #define STM32_CRY_HASH_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") /* diff --git a/testhal/STM32/STM32F7xx/SPI/mcuconf.h b/testhal/STM32/STM32F7xx/SPI/mcuconf.h index ea826d8b0..54bdd070e 100644 --- a/testhal/STM32/STM32F7xx/SPI/mcuconf.h +++ b/testhal/STM32/STM32F7xx/SPI/mcuconf.h @@ -148,9 +148,14 @@ #define STM32_CRY_USE_HASH1 FALSE #define STM32_CRY_CRYP1_IRQ_PRIORITY 9 #define STM32_CRY_HASH1_IRQ_PRIORITY 9 +#define STM32_CRY_CRYP1_IN_DMA_STREAM STM32_DMA_STREAM_ID(2, 6) +#define STM32_CRY_CRYP1_OUT_DMA_STREAM STM32_DMA_STREAM_ID(2, 5) #define STM32_CRY_HASH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) +#define STM32_CRY_CRYP1_IN_DMA_PRIORITY 0 +#define STM32_CRY_CRYP1_OUT_DMA_PRIORITY 1 #define STM32_CRY_HASH1_DMA_PRIORITY 0 #define STM32_CRY_HASH_SIZE_THRESHOLD 1024 +#define STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") #define STM32_CRY_HASH_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") /* diff --git a/testhal/STM32/STM32F7xx/USB_RAW/mcuconf.h b/testhal/STM32/STM32F7xx/USB_RAW/mcuconf.h index f028ebe8f..e8c2f81d0 100644 --- a/testhal/STM32/STM32F7xx/USB_RAW/mcuconf.h +++ b/testhal/STM32/STM32F7xx/USB_RAW/mcuconf.h @@ -148,9 +148,14 @@ #define STM32_CRY_USE_HASH1 FALSE #define STM32_CRY_CRYP1_IRQ_PRIORITY 9 #define STM32_CRY_HASH1_IRQ_PRIORITY 9 +#define STM32_CRY_CRYP1_IN_DMA_STREAM STM32_DMA_STREAM_ID(2, 6) +#define STM32_CRY_CRYP1_OUT_DMA_STREAM STM32_DMA_STREAM_ID(2, 5) #define STM32_CRY_HASH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) +#define STM32_CRY_CRYP1_IN_DMA_PRIORITY 0 +#define STM32_CRY_CRYP1_OUT_DMA_PRIORITY 1 #define STM32_CRY_HASH1_DMA_PRIORITY 0 #define STM32_CRY_HASH_SIZE_THRESHOLD 1024 +#define STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") #define STM32_CRY_HASH_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") /* diff --git a/testhal/STM32/multi/CRYPTO/cfg/stm32f756zg_nucleo144/mcuconf.h b/testhal/STM32/multi/CRYPTO/cfg/stm32f756zg_nucleo144/mcuconf.h index 58315d901..c0109a4a7 100644 --- a/testhal/STM32/multi/CRYPTO/cfg/stm32f756zg_nucleo144/mcuconf.h +++ b/testhal/STM32/multi/CRYPTO/cfg/stm32f756zg_nucleo144/mcuconf.h @@ -144,13 +144,18 @@ /* * CRY driver system settings. */ -#define STM32_CRY_USE_CRYP1 FALSE +#define STM32_CRY_USE_CRYP1 TRUE #define STM32_CRY_USE_HASH1 TRUE #define STM32_CRY_CRYP1_IRQ_PRIORITY 9 #define STM32_CRY_HASH1_IRQ_PRIORITY 9 +#define STM32_CRY_CRYP1_IN_DMA_STREAM STM32_DMA_STREAM_ID(2, 6) +#define STM32_CRY_CRYP1_OUT_DMA_STREAM STM32_DMA_STREAM_ID(2, 5) #define STM32_CRY_HASH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) +#define STM32_CRY_CRYP1_IN_DMA_PRIORITY 0 +#define STM32_CRY_CRYP1_OUT_DMA_PRIORITY 1 #define STM32_CRY_HASH1_DMA_PRIORITY 0 #define STM32_CRY_HASH_SIZE_THRESHOLD 1024 +#define STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") #define STM32_CRY_HASH_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") /* diff --git a/testhal/STM32/multi/CRYPTO/main.c b/testhal/STM32/multi/CRYPTO/main.c index 75d5e51e5..1e4f4f66f 100644 --- a/testhal/STM32/multi/CRYPTO/main.c +++ b/testhal/STM32/multi/CRYPTO/main.c @@ -66,6 +66,11 @@ int main(void) { /* Normal main() thread activity, in this demo it does nothing.*/ while (true) { uint8_t digest[32]; + static uint8_t key[16] = {00, 00, 00, 00, 00, 00, 00, 00, + 00, 00, 00, 00, 00, 00, 00, 00}; + static uint8_t data[16] = {00, 00, 00, 00, 00, 00, 00, 00, + 00, 00, 00, 00, 00, 00, 00, 00}; + uint8_t out[16]; if (palReadLine(PORTAB_LINE_BUTTON) == PORTAB_BUTTON_PRESSED) { SHA256Context ctx256; @@ -81,6 +86,12 @@ int main(void) { crySHA256Init(&CRYD1, &ctx256); crySHA256Update(&CRYD1, &ctx256, 56U, (const uint8_t *)"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"); crySHA256Final(&CRYD1, &ctx256, digest); + + cryLoadAESTransientKey(&CRYD1, sizeof (key), key); + cryEncryptAES(&CRYD1, (crykey_t)0, data, out); + cryDecryptAES(&CRYD1, (crykey_t)0, data, out); + cryEncryptAES_ECB(&CRYD1, (crykey_t)0, 16U, data, out); + cryDecryptAES_ECB(&CRYD1, (crykey_t)0, 16U, data, out); } chThdSleepMilliseconds(500); } diff --git a/testhal/STM32/multi/PAL/cfg/stm32f746_discovery/mcuconf.h b/testhal/STM32/multi/PAL/cfg/stm32f746_discovery/mcuconf.h index 4688cd053..dde3318b8 100644 --- a/testhal/STM32/multi/PAL/cfg/stm32f746_discovery/mcuconf.h +++ b/testhal/STM32/multi/PAL/cfg/stm32f746_discovery/mcuconf.h @@ -148,9 +148,14 @@ #define STM32_CRY_USE_HASH1 FALSE #define STM32_CRY_CRYP1_IRQ_PRIORITY 9 #define STM32_CRY_HASH1_IRQ_PRIORITY 9 +#define STM32_CRY_CRYP1_IN_DMA_STREAM STM32_DMA_STREAM_ID(2, 6) +#define STM32_CRY_CRYP1_OUT_DMA_STREAM STM32_DMA_STREAM_ID(2, 5) #define STM32_CRY_HASH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) +#define STM32_CRY_CRYP1_IN_DMA_PRIORITY 0 +#define STM32_CRY_CRYP1_OUT_DMA_PRIORITY 1 #define STM32_CRY_HASH1_DMA_PRIORITY 0 #define STM32_CRY_HASH_SIZE_THRESHOLD 1024 +#define STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") #define STM32_CRY_HASH_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") /* diff --git a/testhal/STM32/multi/RTC/cfg/stm32f746_discovery/mcuconf.h b/testhal/STM32/multi/RTC/cfg/stm32f746_discovery/mcuconf.h index 63217ec11..f68c554e2 100644 --- a/testhal/STM32/multi/RTC/cfg/stm32f746_discovery/mcuconf.h +++ b/testhal/STM32/multi/RTC/cfg/stm32f746_discovery/mcuconf.h @@ -148,9 +148,14 @@ #define STM32_CRY_USE_HASH1 FALSE #define STM32_CRY_CRYP1_IRQ_PRIORITY 9 #define STM32_CRY_HASH1_IRQ_PRIORITY 9 +#define STM32_CRY_CRYP1_IN_DMA_STREAM STM32_DMA_STREAM_ID(2, 6) +#define STM32_CRY_CRYP1_OUT_DMA_STREAM STM32_DMA_STREAM_ID(2, 5) #define STM32_CRY_HASH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) +#define STM32_CRY_CRYP1_IN_DMA_PRIORITY 0 +#define STM32_CRY_CRYP1_OUT_DMA_PRIORITY 1 #define STM32_CRY_HASH1_DMA_PRIORITY 0 #define STM32_CRY_HASH_SIZE_THRESHOLD 1024 +#define STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") #define STM32_CRY_HASH_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") /* diff --git a/testhal/STM32/multi/UART/cfg/stm32f746_discovery/mcuconf.h b/testhal/STM32/multi/UART/cfg/stm32f746_discovery/mcuconf.h index 63217ec11..f68c554e2 100644 --- a/testhal/STM32/multi/UART/cfg/stm32f746_discovery/mcuconf.h +++ b/testhal/STM32/multi/UART/cfg/stm32f746_discovery/mcuconf.h @@ -148,9 +148,14 @@ #define STM32_CRY_USE_HASH1 FALSE #define STM32_CRY_CRYP1_IRQ_PRIORITY 9 #define STM32_CRY_HASH1_IRQ_PRIORITY 9 +#define STM32_CRY_CRYP1_IN_DMA_STREAM STM32_DMA_STREAM_ID(2, 6) +#define STM32_CRY_CRYP1_OUT_DMA_STREAM STM32_DMA_STREAM_ID(2, 5) #define STM32_CRY_HASH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) +#define STM32_CRY_CRYP1_IN_DMA_PRIORITY 0 +#define STM32_CRY_CRYP1_OUT_DMA_PRIORITY 1 #define STM32_CRY_HASH1_DMA_PRIORITY 0 #define STM32_CRY_HASH_SIZE_THRESHOLD 1024 +#define STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") #define STM32_CRY_HASH_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") /* diff --git a/testhal/STM32/multi/USB_CDC/cfg/stm32f746_discovery/mcuconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32f746_discovery/mcuconf.h index 3f3e4b94d..e1a779771 100644 --- a/testhal/STM32/multi/USB_CDC/cfg/stm32f746_discovery/mcuconf.h +++ b/testhal/STM32/multi/USB_CDC/cfg/stm32f746_discovery/mcuconf.h @@ -148,9 +148,14 @@ #define STM32_CRY_USE_HASH1 FALSE #define STM32_CRY_CRYP1_IRQ_PRIORITY 9 #define STM32_CRY_HASH1_IRQ_PRIORITY 9 +#define STM32_CRY_CRYP1_IN_DMA_STREAM STM32_DMA_STREAM_ID(2, 6) +#define STM32_CRY_CRYP1_OUT_DMA_STREAM STM32_DMA_STREAM_ID(2, 5) #define STM32_CRY_HASH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) +#define STM32_CRY_CRYP1_IN_DMA_PRIORITY 0 +#define STM32_CRY_CRYP1_OUT_DMA_PRIORITY 1 #define STM32_CRY_HASH1_DMA_PRIORITY 0 #define STM32_CRY_HASH_SIZE_THRESHOLD 1024 +#define STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") #define STM32_CRY_HASH_DMA_ERROR_HOOK(cryp) osalSysHalt("DMA failure") /* diff --git a/tools/ftl/processors/conf/mcuconf_stm32f746xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32f746xx/mcuconf.h.ftl index 43715a43b..d140ef34f 100644 --- a/tools/ftl/processors/conf/mcuconf_stm32f746xx/mcuconf.h.ftl +++ b/tools/ftl/processors/conf/mcuconf_stm32f746xx/mcuconf.h.ftl @@ -159,9 +159,14 @@ #define STM32_CRY_USE_HASH1 ${doc.STM32_CRY_USE_HASH1!"FALSE"} #define STM32_CRY_CRYP1_IRQ_PRIORITY ${doc.STM32_CRY_CRYP1_IRQ_PRIORITY!"9"} #define STM32_CRY_HASH1_IRQ_PRIORITY ${doc.STM32_CRY_HASH1_IRQ_PRIORITY!"9"} +#define STM32_CRY_CRYP1_IN_DMA_STREAM ${doc.STM32_CRY_CRYP1_IN_DMA_STREAM!"STM32_DMA_STREAM_ID(2, 6)"} +#define STM32_CRY_CRYP1_OUT_DMA_STREAM ${doc.STM32_CRY_CRYP1_OUT_DMA_STREAM!"STM32_DMA_STREAM_ID(2, 5)"} #define STM32_CRY_HASH1_DMA_STREAM ${doc.STM32_CRY_HASH1_DMA_STREAM!"STM32_DMA_STREAM_ID(2, 7)"} +#define STM32_CRY_CRYP1_IN_DMA_PRIORITY ${doc.STM32_CRY_CRYP1_IN_DMA_PRIORITY!"0"} +#define STM32_CRY_CRYP1_OUT_DMA_PRIORITY ${doc.STM32_CRY_CRYP1_OUT_DMA_PRIORITY!"1"} #define STM32_CRY_HASH1_DMA_PRIORITY ${doc.STM32_CRY_HASH1_DMA_PRIORITY!"0"} #define STM32_CRY_HASH_SIZE_THRESHOLD ${doc.STM32_CRY_HASH_SIZE_THRESHOLD!"1024"} +#define STM32_CRY_CRYP_DMA_ERROR_HOOK(cryp) ${doc.STM32_CRY_CRYP_DMA_ERROR_HOOK!"osalSysHalt(\"DMA failure\")"} #define STM32_CRY_HASH_DMA_ERROR_HOOK(cryp) ${doc.STM32_CRY_HASH_DMA_ERROR_HOOK!"osalSysHalt(\"DMA failure\")"} /*