michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: hwinfo: fix endianness for sam0 and nrf

Browse source 
HWINFO drivers should be responsible for ensuring that
the data structure is a sequence of bytes. That is not
what the current sam0 and nordic drivers do. The drivers
read the data as u32_t and then memcpy the data to a
buffer. This ensures the data has the endianness of the
underlying MCU, which in this case is Cortex M0 which
is little endian.

This commit fixes the endianness so the data can be
interpreted as a "left to right sequence of bytes".

This commit updates the API doc to provide clarification
of the data structure.
Add to 2.3 release notes.

Fixes #23444, #24103

Signed-off-by: Steven Slupsky <sslupsky@gmail.com>
This commit is contained in:
Steven Slupsky 2020-04-08 12:23:10 -06:00 • committed by Carles Cufí
commit c54f7ec1fc
4 changed files with 31 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

5
drivers/hwinfo/hwinfo_nrf.c
View file

@ -8,6 +8,7 @@
#include <drivers/hwinfo.h>
#include <string.h>
#include <hal/nrf_ficr.h>
#include <sys/byteorder.h>
struct nrf_uid {
u32_t id[2];
@ -17,8 +18,8 @@ ssize_t z_impl_hwinfo_get_device_id(u8_t *buffer, size_t length)
{
struct nrf_uid dev_id;
dev_id.id[0] = nrf_ficr_deviceid_get(NRF_FICR, 0);
dev_id.id[1] = nrf_ficr_deviceid_get(NRF_FICR, 1);
dev_id.id[0] = sys_cpu_to_be32(nrf_ficr_deviceid_get(NRF_FICR, 1));
dev_id.id[1] = sys_cpu_to_be32(nrf_ficr_deviceid_get(NRF_FICR, 0));
if (length > sizeof(dev_id.id)) {
length = sizeof(dev_id.id);

13
drivers/hwinfo/hwinfo_sam0.c
View file

@ -9,6 +9,7 @@
#include <soc.h>
#include <drivers/hwinfo.h>
#include <string.h>
#include <sys/byteorder.h>
struct sam0_uid {
u32_t id[4];
@ -18,10 +19,14 @@ ssize_t z_impl_hwinfo_get_device_id(u8_t *buffer, size_t length)
{
struct sam0_uid dev_id;
dev_id.id[0] = *(const u32_t *) DT_INST_REG_ADDR_BY_IDX(0, 0);
dev_id.id[1] = *(const u32_t *) DT_INST_REG_ADDR_BY_IDX(0, 1);
dev_id.id[2] = *(const u32_t *) DT_INST_REG_ADDR_BY_IDX(0, 2);
dev_id.id[3] = *(const u32_t *) DT_INST_REG_ADDR_BY_IDX(0, 3);
dev_id.id[0] = sys_cpu_to_be32(*(const u32_t *)
DT_INST_REG_ADDR_BY_IDX(0, 0));
dev_id.id[1] = sys_cpu_to_be32(*(const u32_t *)
DT_INST_REG_ADDR_BY_IDX(0, 1));
dev_id.id[2] = sys_cpu_to_be32(*(const u32_t *)
DT_INST_REG_ADDR_BY_IDX(0, 2));
dev_id.id[3] = sys_cpu_to_be32(*(const u32_t *)
DT_INST_REG_ADDR_BY_IDX(0, 3));
if (length > sizeof(dev_id.id)) {
length = sizeof(dev_id.id);