Update mbed to mbed-os-5.4.0-rc1-15711-g869942da3c

Author: facchinm

cores/arduino/mbed/TESTS/mbed_drivers/timeout/timeout_tests.h

@@ -313,9 +313,9 @@ void test_deepsleep(void)
 
      * This should be replaced with a better function that checks if the
      * hardware buffers are empty. However, such an API does not exist now,
-     * so we'll use the wait_ms() function for now.
+     * so we'll use the ThisThread::sleep_for() function for now.
      */
-    wait_ms(20);
+    ThisThread::sleep_for(20);
 
     timer.start();
     timeout.attach_callback(mbed::callback(sem_callback, &sem), delay_us);

cores/arduino/mbed/UNITTESTS/target_h/rtos/Mutex.h

@@ -18,7 +18,8 @@
 #define __MUTEX_H__
 
 #include <inttypes.h>
-#include "cmsis_os2.h"
+#include "mbed_rtos_types.h"
+#include "mbed_rtos1_types.h"
 
 namespace rtos {
 

cores/arduino/mbed/UNITTESTS/target_h/mbed_rtos1_types.h renamed to cores/arduino/mbed/UNITTESTS/target_h/rtos/mbed_rtos1_types.h

@@ -54,7 +54,7 @@ extern "C" {
  * \retval      PSA_ERROR_GENERIC_ERROR         The operation failed because of an unspecified internal failure
  */
 psa_status_t psa_ps_set(psa_storage_uid_t uid,
-                        uint32_t data_length,
+                        size_t data_length,
                         const void *p_data,
                         psa_storage_create_flags_t create_flags);
 
@@ -65,22 +65,24 @@ psa_status_t psa_ps_set(psa_storage_uid_t uid,
  * \param[in] data_offset       The offset within the data associated with the `uid` to start retrieving data
  * \param[in] data_length       The amount of data to read (and the minimum allocated size of the `p_data` buffer)
  * \param[out] p_data           The buffer where the data will be placed upon successful completion
+ * \param[out] p_data_length    The actual amount of data returned
  *
  * \return      A status indicating the success/failure of the operation
  *
  * \retval      PSA_SUCCESS                  The operation completed successfully
  * \retval      PSA_ERROR_INVALID_ARGUMENT   The operation failed because one or more of the given arguments were invalid (null pointer, wrong flags etc.)
  * \retval      PSA_ERROR_DOES_NOT_EXIST     The operation failed because the provided uid value was not found in the storage
- * \retval      PSA_ERROR_BUFFER_TOO_SMALL   The operation failed because the data associated with provided uid is not the same size as `data_size`
+ * \retval      PSA_ERROR_BUFFER_TOO_SMALL   The operation failed because the data associated with provided uid does not fit `data_size`
  * \retval      PSA_ERROR_STORAGE_FAILURE    The operation failed because the physical storage has failed (Fatal error)
  * \retval      PSA_ERROR_GENERIC_ERROR      The operation failed because of an unspecified internal failure
  * \retval      PSA_ERROR_DATA_CORRUPT       The operation failed because of an authentication failure when attempting to get the key
  * \retval      PSA_ERROR_INVALID_SIGNATURE  The operation failed because the data associated with the UID failed authentication
  */
 psa_status_t psa_ps_get(psa_storage_uid_t uid,
-                        uint32_t data_offset,
-                        uint32_t data_length,
-                        void *p_data);
+                        size_t data_offset,
+                        size_t data_length,
+                        void *p_data,
+                        size_t *p_data_length);
 
 /**
  * \brief Retrieve the metadata about the provided uid
@@ -149,7 +151,7 @@ psa_status_t psa_ps_remove(psa_storage_uid_t uid);
  * \retval PSA_ERROR_GENERIC_ERROR          The operation has failed due to an unspecified error
  */
 psa_status_t psa_ps_create(psa_storage_uid_t uid,
-                           uint32_t size,
+                           size_t size,
                            psa_storage_create_flags_t create_flags);
 
 /**
@@ -179,8 +181,8 @@ psa_status_t psa_ps_create(psa_storage_uid_t uid,
  * \retval PSA_ERROR_INVALID_SIGNATURE      The operation failed because the existing data failed authentication (MAC check failed)
  */
 psa_status_t psa_ps_set_extended(psa_storage_uid_t uid,
-                                 uint32_t data_offset,
-                                 uint32_t data_length,
+                                 size_t data_offset,
+                                 size_t data_length,
                                  const void *p_data);
 
 /**

cores/arduino/mbed/UNITTESTS/target_h/mbed_rtos_storage.h renamed to cores/arduino/mbed/UNITTESTS/target_h/rtos/mbed_rtos_storage.h

@@ -33,8 +33,10 @@ extern "C" {
  */
 typedef uint32_t psa_storage_create_flags_t;
 
-#define PSA_STORAGE_FLAG_NONE        0         /**< No flags to pass */
-#define PSA_STORAGE_FLAG_WRITE_ONCE (1 << 0) /**< The data associated with the uid will not be able to be modified or deleted. Intended to be used to set bits in `psa_storage_create_flags_t`*/
+#define PSA_STORAGE_FLAG_NONE                 0         /**< No flags to pass */
+#define PSA_STORAGE_FLAG_WRITE_ONCE           (1 << 0)  /**< The data associated with the uid will not be able to be modified or deleted. Intended to be used to set bits in `psa_storage_create_flags_t`*/
+#define PSA_STORAGE_FLAG_NO_CONFIDENTIALITY   (1 << 1)  /**< The data associated with the uid is public and therefore does not require confidentiality. It therefore only needs to be integrity protected */
+#define PSA_STORAGE_FLAG_NO_REPLAY_PROTECTION (1 << 2)  /**< The data associated with the uid does not require replay protection. This may permit faster storage - but it permits an attecker with physical access to revert to an earlier version of the data.   */
 
 /** \brief A type for UIDs used for identifying data
  */
@@ -44,7 +46,8 @@ typedef uint64_t psa_storage_uid_t;
  * \brief A container for metadata associated with a specific uid
  */
 struct psa_storage_info_t {
-    uint32_t size;                  /**< The size of the data associated with a uid **/
+    size_t capacity;              /**< The allocated capacity of the storage associated with a UID **/
+    size_t size;                  /**< The size of the data associated with a uid **/
     psa_storage_create_flags_t flags;    /**< The flags set when the uid was created **/
 };
 

cores/arduino/mbed/UNITTESTS/target_h/rtos.h renamed to cores/arduino/mbed/UNITTESTS/target_h/rtos/rtos.h

@@ -36,9 +36,9 @@ typedef psa_status_t (*migrate_func_t)(mbed::KVStore *kvstore, const psa_storage
 
 void psa_storage_handle_version(mbed::KVStore *kvstore, const char *version_key, const psa_storage_version_t *version,
                                 migrate_func_t migrate_func);
-psa_status_t psa_storage_set_impl(mbed::KVStore *kvstore, int32_t pid, psa_storage_uid_t uid, uint32_t data_length, const void *p_data, uint32_t kv_create_flags);
-psa_status_t psa_storage_get_impl(mbed::KVStore *kvstore, int32_t pid, psa_storage_uid_t uid, uint32_t data_offset, uint32_t data_length, void *p_data);
-psa_status_t psa_storage_get_info_impl(mbed::KVStore *kvstore, int32_t pid, psa_storage_uid_t uid, struct psa_storage_info_t *p_info);
+psa_status_t psa_storage_set_impl(mbed::KVStore *kvstore, int32_t pid, psa_storage_uid_t uid, size_t data_length, const void *p_data, uint32_t kv_create_flags);
+psa_status_t psa_storage_get_impl(mbed::KVStore *kvstore, int32_t pid, psa_storage_uid_t uid, size_t data_offset, size_t data_length, void *p_data, size_t *p_data_length);
+psa_status_t psa_storage_get_info_impl(mbed::KVStore *kvstore, int32_t pid, psa_storage_uid_t uid, struct psa_storage_info_t *p_info, uint32_t *kv_get_flags);
 psa_status_t psa_storage_remove_impl(mbed::KVStore *kvstore, int32_t pid, psa_storage_uid_t uid);
 psa_status_t psa_storage_reset_impl(mbed::KVStore *kvstore);
 

cores/arduino/mbed/components/TARGET_PSA/inc/psa/protected_storage.h

@@ -26,8 +26,8 @@ extern "C"
 {
 #endif
 
-psa_status_t psa_its_set_impl(int32_t pid, psa_storage_uid_t uid, uint32_t data_length, const void *p_data, psa_storage_create_flags_t create_flags);
-psa_status_t psa_its_get_impl(int32_t pid, psa_storage_uid_t uid, uint32_t data_offset, uint32_t data_length, void *p_data);
+psa_status_t psa_its_set_impl(int32_t pid, psa_storage_uid_t uid, size_t data_length, const void *p_data, psa_storage_create_flags_t create_flags);
+psa_status_t psa_its_get_impl(int32_t pid, psa_storage_uid_t uid, size_t data_offset, size_t data_length, void *p_data, size_t *p_data_length);
 psa_status_t psa_its_get_info_impl(int32_t pid, psa_storage_uid_t uid, struct psa_storage_info_t *p_info);
 psa_status_t psa_its_remove_impl(int32_t pid, psa_storage_uid_t uid);
 psa_status_t psa_its_reset_impl();

cores/arduino/mbed/components/TARGET_PSA/inc/psa/storage_common.h

@@ -97,7 +97,7 @@ MBED_DEPRECATED("PS specific types should not be used")
  *                                               is invalid, for example is `NULL` or references memory the caller cannot access
  */
 psa_status_t psa_its_set(psa_storage_uid_t uid,
-                         uint32_t data_length,
+                         size_t data_length,
                          const void *p_data,
                          psa_storage_create_flags_t create_flags);
 
@@ -108,6 +108,7 @@ psa_status_t psa_its_set(psa_storage_uid_t uid,
  * \param[in] data_offset       The starting offset of the data requested
  * \param[in] data_length       the amount of data requested (and the minimum allocated size of the `p_data` buffer)
  * \param[out] p_data           The buffer where the data will be placed upon successful completion
+ * \param[out] p_data_length    The actual amount of data returned
 
  *
  * \return      A status indicating the success/failure of the operation
@@ -120,9 +121,10 @@ psa_status_t psa_its_set(psa_storage_uid_t uid,
  *                                           is invalid. For example is `NULL` or references memory the caller cannot access
  */
 psa_status_t psa_its_get(psa_storage_uid_t uid,
-                         uint32_t data_offset,
-                         uint32_t data_length,
-                         void *p_data);
+                         size_t data_offset,
+                         size_t data_length,
+                         void *p_data,
+                         size_t *p_data_length);
 
 /**
  * \brief Retrieve the metadata about the provided uid

cores/arduino/mbed/components/TARGET_PSA/services/storage/common/psa_storage_common_impl.h

@@ -115,6 +115,11 @@ void find_ports(std::list<PortType> &matched_ports, std::list<PortType> &not_mat
                              FormFactorType::pin_to_string(port.pins[i]), port.pins[i]);
                 continue;
             }
+            if (pinmap_list_has_peripheral(pinmap_restricted_peripherals(), port.peripheral)) {
+                utest_printf("Skipping %s peripheral %i with pin %s (%i)\r\n", pin_type,
+                             port.peripheral, FormFactorType::pin_to_string(port.pins[i]), port.pins[i]);
+                continue;
+            }
             // skipp pin searching if single pin port type
             if (PortType::pin_count > 1) {
                 find_port_pins<PortType, FormFactorType>(port);

cores/arduino/mbed/components/TARGET_PSA/services/storage/its/COMPONENT_PSA_SRV_IMPL/pits_impl.h

@@ -345,15 +345,21 @@ class SPI : private NonCopyable<SPI> {
     enum SPIName { GlobalSPI };
 #endif
 
+    // All members of spi_peripheral_s must be initialized to make the structure
+    // constant-initialized, and hence able to be omitted by the linker,
+    // as SingletonPtr now relies on C++ constant-initialization. (Previously it
+    // worked through C++ zero-initialization). And all the constants should be zero
+    // to ensure it stays in the actual zero-init part of the image if used, avoiding
+    // an initialized-data cost.
     struct spi_peripheral_s {
         /* Internal SPI name identifying the resources. */
-        SPIName name;
+        SPIName name = SPIName(0);
         /* Internal SPI object handling the resources' state. */
-        spi_t spi;
+        spi_t spi{};
         /* Used by lock and unlock for thread safety */
         SingletonPtr<PlatformMutex> mutex;
         /* Current user of the SPI */
-        SPI *owner;
+        SPI *owner = nullptr;
 #if DEVICE_SPI_ASYNCH && TRANSACTION_QUEUE_SIZE_SPI
         /* Queue of pending transfers */
         SingletonPtr<CircularBuffer<Transaction<SPI>, TRANSACTION_QUEUE_SIZE_SPI> > transaction_buffer;

cores/arduino/mbed/components/TARGET_PSA/services/storage/its/psa_prot_internal_storage.h

@@ -255,8 +255,6 @@ class UARTSerial : private SerialBase, public FileHandle, private NonCopyable<UA
 
 private:
 
-    void wait_ms(uint32_t millisec);
-
     /** SerialBase lock override */
     virtual void lock(void);
 

cores/arduino/mbed/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/test_utils.h

@@ -26,6 +26,7 @@ extern "C" {
 #endif
 
 #include <stdbool.h>
+#include <stdint.h>
 
 // Currently supported platforms
 //
@@ -63,6 +64,7 @@ extern "C" {
 // limited by the accuracy of this tick.
 //
 // Must intentionally overflow to 0 after 2^32-1
+void equeue_tick_init(void);
 unsigned equeue_tick(void);
 
 
@@ -114,13 +116,19 @@ typedef struct equeue_sema {
     pthread_cond_t cond;
     bool signal;
 } equeue_sema_t;
-#elif defined(EQUEUE_PLATFORM_MBED) && defined(MBED_CONF_RTOS_PRESENT)
+#elif defined(EQUEUE_PLATFORM_MBED) && MBED_CONF_RTOS_API_PRESENT
 typedef struct equeue_sema {
-    osEventFlagsId_t id;
-    mbed_rtos_storage_event_flags_t mem;
+    // We will actually store a C++ rtos:EventQueue in here;
+    // attempt to match layout for storage, and assert size in equeue_mbed.cpp
+#if MBED_CONF_RTOS_PRESENT
+    osEventFlagsId_t                _id;
+    mbed_rtos_storage_event_flags_t _obj_mem;
+#else
+    uint32_t _flags;
+#endif
 } equeue_sema_t;
 #elif defined(EQUEUE_PLATFORM_MBED)
-typedef volatile int equeue_sema_t;
+typedef int equeue_sema_t;
 #endif
 
 // Platform semaphore operations

cores/arduino/mbed/drivers/SPIMaster.h

@@ -19,7 +19,7 @@
 
 #include "AT_CellularStack.h"
 #include "CellularUtil.h"
-#include "mbed_wait_api.h"
+#include "rtos/ThisThread.h"
 #include "drivers/Timer.h"
 
 

cores/arduino/mbed/drivers/UARTSerial.h

@@ -256,6 +256,7 @@ int mbedtls_platform_set_snprintf( int (*snprintf_func)( char * s, size_t n,
  *   the destination buffer is too short.
  */
 #if defined(MBEDTLS_PLATFORM_HAS_NON_CONFORMING_VSNPRINTF)
+#include <stdarg.h>
 /* For Older Windows (inc. MSYS2), we provide our own fixed implementation */
 int mbedtls_platform_win32_vsnprintf( char *s, size_t n, const char *fmt, va_list arg );
 #endif

cores/arduino/mbed/events/equeue/equeue_platform.h

@@ -39,17 +39,17 @@
  * Major, Minor, Patchlevel
  */
 #define MBEDTLS_VERSION_MAJOR  2
-#define MBEDTLS_VERSION_MINOR  17
+#define MBEDTLS_VERSION_MINOR  18
 #define MBEDTLS_VERSION_PATCH  0
 
 /**
  * The single version number has the following structure:
  *    MMNNPP00
  *    Major version | Minor version | Patch version
  */
-#define MBEDTLS_VERSION_NUMBER         0x02110000
-#define MBEDTLS_VERSION_STRING         "2.17.0"
-#define MBEDTLS_VERSION_STRING_FULL    "mbed TLS 2.17.0"
+#define MBEDTLS_VERSION_NUMBER         0x02120000
+#define MBEDTLS_VERSION_STRING         "2.18.0"
+#define MBEDTLS_VERSION_STRING_FULL    "mbed TLS 2.18.0"
 
 #if defined(MBEDTLS_VERSION_C)
 

cores/arduino/mbed/features/cellular/framework/targets/UBLOX/AT/UBLOX_AT_CellularStack.h

@@ -106,7 +106,8 @@ psa_status_t psa_its_set(psa_storage_uid_t uid,
 psa_status_t psa_its_get(psa_storage_uid_t uid,
                          uint32_t data_offset,
                          uint32_t data_length,
-                         void *p_data);
+                         void *p_data,
+                         size_t *p_data_length);
 
 /**
  * \brief Retrieve the metadata about the provided uid

cores/arduino/mbed/features/mbedtls/inc/mbedtls/platform.h

@@ -22,6 +22,7 @@
 
 #include <stdint.h>
 #include "device.h"
+#include "pinmap.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -135,6 +136,18 @@ void gpio_init_out_ex(gpio_t *gpio, PinName pin, int value);
  */
 void gpio_init_inout(gpio_t *gpio, PinName pin, PinDirection direction, PinMode mode, int value);
 
+/** Get the pins that support all GPIO tests
+ *
+ * Return a PinMap array of pins that support GPIO. The
+ * array is terminated with {NC, NC, 0}.
+ *
+ * Targets should override the weak implementation of this
+ * function to provide the actual pinmap for GPIO testing.
+ *
+ * @return PinMap array
+ */
+const PinMap *gpio_pinmap(void);
+
 /**@}*/
 
 #ifdef __cplusplus

cores/arduino/mbed/features/mbedtls/inc/mbedtls/version.h

@@ -38,6 +38,11 @@ typedef struct {
     const PinName *pins;
 } PinList;
 
+typedef struct {
+    uint32_t count;
+    const int *peripheral;
+} PeripheralList;
+
 void pin_function(PinName pin, int function);
 void pin_mode(PinName pin, PinMode mode);
 
@@ -123,6 +128,15 @@ bool pinmap_find_peripheral_pins(const PinList *whitelist, const PinList *blackl
  */
 bool pinmap_list_has_pin(const PinList *list, PinName pin);
 
+/**
+ * Check if the peripheral is in the list
+ *
+ * @param list peripheral list to check
+ * @param peripheral peripheral to check for in the list
+ * @return true if the peripheral is in the list, false otherwise
+ */
+bool pinmap_list_has_peripheral(const PeripheralList *list, int peripheral);
+
 /**
  * Get the pin list of pins to avoid during testing
  *
@@ -139,6 +153,31 @@ bool pinmap_list_has_pin(const PinList *list, PinName pin);
  */
 const PinList *pinmap_restricted_pins(void);
 
+/**
+ * Get the pin list of peripherals to avoid during testing
+ *
+ * The restricted peripheral list is used to indicate to testing
+ * that a peripheral should be skipped due to some caveat about it.
+ * For example, using the USB serial port during tests will interfere
+ * with the test runner and should be avoided.
+ *
+ * Targets should override the weak implementation of this
+ * function if they have peripherals which should be
+ * skipped during testing.
+ *
+ * @note Some targets use the same value for multiple
+ * different types of peripherals. For example SPI 0
+ * and UART 0 may both be identified by the peripheral
+ * value 0. If your target does this then do not
+ * use this function to skip peripherals, as this will
+ * unintentionally cause all peripherals with that value
+ * to be skipped. Instead these entries should be removed
+ * from the peripheral PinMap itself.
+ *
+ * @return Pointer to a peripheral list of peripheral to avoid
+ */
+const PeripheralList *pinmap_restricted_peripherals(void);
+
 #ifdef TARGET_FF_ARDUINO
 
 /**

cores/arduino/mbed/features/mbedtls/mbed-crypto/platform/COMPONENT_PSA_SRV_IMPL/psa_crypto_its.h

@@ -19,7 +19,7 @@
 #include "platform/mbed_version.h"
 #include "mbed_config.h"
 
-#if MBED_CONF_RTOS_PRESENT
+#if MBED_CONF_RTOS_API_PRESENT
 #include "rtos/rtos.h"
 #endif
 
@@ -88,8 +88,9 @@
 #include "platform/LocalFileSystem.h"
 #include "drivers/InterruptIn.h"
 #include "platform/mbed_wait_api.h"
+#include "platform/mbed_thread.h"
 #include "hal/sleep_api.h"
-#include "platform/Atomic.h"
+#include "platform/mbed_atomic.h"
 #include "platform/mbed_power_mgmt.h"
 #include "platform/mbed_rtc_time.h"
 #include "platform/mbed_poll.h"