From c32e2c262a280ca215d10e7525fdac2150537d0b Mon Sep 17 00:00:00 2001 From: kl-cruz Date: Tue, 28 Mar 2017 13:52:13 +0200 Subject: [PATCH 1/4] [nRF52840] added trng implementation for nrf52840 --- targets/TARGET_NORDIC/TARGET_NRF5/objects.h | 4 ++ targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c | 72 ++++++++++++++++++++ targets/targets.json | 2 +- 3 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/objects.h b/targets/TARGET_NORDIC/TARGET_NRF5/objects.h index 01dd5f8090..c626bc20bc 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5/objects.h +++ b/targets/TARGET_NORDIC/TARGET_NRF5/objects.h @@ -85,6 +85,10 @@ struct flash_s { uint32_t placeholder; }; +struct trng_s { + uint32_t placeholder; +}; + #include "gpio_object.h" #ifdef __cplusplus diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c b/targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c new file mode 100644 index 0000000000..ca94a0aec5 --- /dev/null +++ b/targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c @@ -0,0 +1,72 @@ +/* + * Copyright (c) 2017 Nordic Semiconductor ASA + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list + * of conditions and the following disclaimer. + * + * 2. Redistributions in binary form, except as embedded into a Nordic Semiconductor ASA + * integrated circuit in a product or a software update for such product, must reproduce + * the above copyright notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the distribution. + * + * 3. Neither the name of Nordic Semiconductor ASA nor the names of its contributors may be + * used to endorse or promote products derived from this software without specific prior + * written permission. + * + * 4. This software, with or without modification, must only be used with a + * Nordic Semiconductor ASA integrated circuit. + * + * 5. Any software provided in binary or object form under this license must not be reverse + * engineered, decompiled, modified and/or disassembled. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + */ + +#if defined(DEVICE_TRNG) +#include "trng_api.h" +#include "nrf_drv_rng.h" + +void trng_init(trng_t *obj) +{ + (void)nrf_drv_rng_init(NULL); +} + +void trng_free(trng_t *obj) +{ + nrf_drv_rng_uninit(); +} + +int trng_get_bytes(trng_t *obj, uint8_t *output, size_t length, size_t *output_length) +{ +#ifdef NRF_RNG_NON_BLOCKING + uint8_t bytes_available; + nrf_drv_rng_bytes_available(&bytes_available); + if ((bytes_available < length) || (nrf_drv_rng_rand(output, length) == NRF_ERROR_NOT_FOUND)) + { + return -1; + } + else + { + *output_length = length; + } +#else + nrf_drv_rng_block_rand(output, length); +#endif + return 0; +} + +#endif diff --git a/targets/targets.json b/targets/targets.json index b16f2329d2..c74e39f9b1 100644 --- a/targets/targets.json +++ b/targets/targets.json @@ -2804,7 +2804,7 @@ "supported_form_factors": ["ARDUINO"], "inherits": ["MCU_NRF52840"], "macros_add": ["BOARD_PCA10056", "CONFIG_GPIO_AS_PINRESET", "SWI_DISABLE0", "NRF52_ERRATA_20"], - "device_has": ["FLASH", "ANALOGIN", "ERROR_PATTERN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE"], + "device_has": ["FLASH", "ANALOGIN", "ERROR_PATTERN", "I2C", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPI_ASYNCH", "SPISLAVE", "TRNG"], "release_versions": ["2", "5"], "device_name": "nRF52840_xxAA" }, From 8698756c63c629eabf2983c6e108ffa25b1becb2 Mon Sep 17 00:00:00 2001 From: kl-cruz Date: Tue, 28 Mar 2017 15:52:13 +0200 Subject: [PATCH 2/4] [nRF52840] Fixed length in trng in every mode --- targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c b/targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c index ca94a0aec5..19d7b271a0 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c +++ b/targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c @@ -60,12 +60,12 @@ int trng_get_bytes(trng_t *obj, uint8_t *output, size_t length, size_t *output_l return -1; } else - { - *output_length = length; - } #else nrf_drv_rng_block_rand(output, length); #endif + { + *output_length = length; + } return 0; } From 8edac29db8ea4526b06e87c01163917fa778eabe Mon Sep 17 00:00:00 2001 From: Andrzej Puzdrowski Date: Wed, 29 Mar 2017 13:30:52 +0200 Subject: [PATCH 3/4] [NRF52840]: fix non-blocking mode of TRNG driver improve coding style. --- targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c b/targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c index 19d7b271a0..334d132d41 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c +++ b/targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c @@ -54,18 +54,18 @@ int trng_get_bytes(trng_t *obj, uint8_t *output, size_t length, size_t *output_l { #ifdef NRF_RNG_NON_BLOCKING uint8_t bytes_available; + nrf_drv_rng_bytes_available(&bytes_available); - if ((bytes_available < length) || (nrf_drv_rng_rand(output, length) == NRF_ERROR_NOT_FOUND)) - { + + if ((bytes_available < length) || (nrf_drv_rng_rand(output, length) == NRF_ERROR_NOT_FOUND)) { + *output_length = 0; return -1; } - else -#else - nrf_drv_rng_block_rand(output, length); #endif - { - *output_length = length; - } + nrf_drv_rng_block_rand(output, length); + + *output_length = length; + return 0; } From 3dc3329d13bec3663a7394f1dff770ded5554d4c Mon Sep 17 00:00:00 2001 From: Andrzej Puzdrowski Date: Wed, 5 Apr 2017 10:49:53 +0200 Subject: [PATCH 4/4] [NRF5840] change: trng_get_bytes returns at last one random byte. --- targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c | 40 ++++++++++++++------ 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c b/targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c index 334d132d41..829dac5184 100644 --- a/targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c +++ b/targets/TARGET_NORDIC/TARGET_NRF5/trng_api.c @@ -42,29 +42,47 @@ void trng_init(trng_t *obj) { + (void) obj; + (void)nrf_drv_rng_init(NULL); } void trng_free(trng_t *obj) { + (void) obj; + nrf_drv_rng_uninit(); } +/* Get random data from NRF5x TRNG peripheral. + * + * This implementation returns num of random bytes in range <1, length>. + * For parameters description see trng_api.h file. + */ int trng_get_bytes(trng_t *obj, uint8_t *output, size_t length, size_t *output_length) { -#ifdef NRF_RNG_NON_BLOCKING uint8_t bytes_available; - - nrf_drv_rng_bytes_available(&bytes_available); - - if ((bytes_available < length) || (nrf_drv_rng_rand(output, length) == NRF_ERROR_NOT_FOUND)) { - *output_length = 0; - return -1; - } -#endif - nrf_drv_rng_block_rand(output, length); - *output_length = length; + (void) obj; + + nrf_drv_rng_bytes_available(&bytes_available); + + if (bytes_available == 0) { + nrf_drv_rng_block_rand(output, 1); + *output_length = 1; + } else { + + if (bytes_available > length) { + bytes_available = length; + } + + if (nrf_drv_rng_rand(output, bytes_available) != NRF_SUCCESS) { + *output_length = 0; + return -1; + } else { + *output_length = bytes_available; + } + } return 0; }