Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[sam] Read unique ID correctly for SAMG55 #824

Merged
merged 2 commits into from
Feb 8, 2022
Merged

[sam] Read unique ID correctly for SAMG55 #824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e6efd55
[sam] Read unique ID correctly for SAMG55
mcbridejc Feb 7, 2022
845840e
[architecture] include noinline in modm_fastcode attribute
mcbridejc Feb 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ext/hathach/module.lb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def prepare(module, options):

module.add_submodule(TinyUsbDeviceModule())
module.add_submodule(TinyUsbHostModule())
module.depends(":cmsis:device", ":architecture:interrupt", ":platform:usb")
module.depends(":cmsis:device", ":architecture:atomic", ":architecture:interrupt", ":platform:usb")
return True


Expand Down
50 changes: 41 additions & 9 deletions ext/hathach/tusb_port.cpp.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#include <modm/platform/device.hpp>
#include <modm/architecture/interface/interrupt.hpp>
#include <modm/architecture/interface/atomic_lock.hpp>
salkinium marked this conversation as resolved.
Show resolved Hide resolved
#include "tusb.h"

%% for irq in irqs | sort
Expand All @@ -21,37 +22,68 @@ MODM_ISR({{irq}})
}
%% endfor

%% if "samg55" in target.string

// Read unique ID using the flash controller
// This function is placed in RAM, because code cannot be fetched from flash
// while reading the unique ID.
modm_ramcode void read_efc_uid(uint32_t *uid)
{
// Disable interrupts -- we can't fetch code
// This function was measured to take 660ns on a SAMG55 running at 100MHz
modm::atomic::Lock lck;

// Issue Start Read Unique Identifier command
EFC->EEFC_FCR = EEFC_FCR_FCMD_STUI | EEFC_FCR_FKEY_PASSWD;
// Wait for flash controller ready bit to go low
while(EFC->EEFC_FSR & EEFC_FSR_FRDY) {};

for(uint32_t i=0; i<4; i++) {
uid[i] = *(uint32_t*)(IFLASH_ADDR + i * 4);
}

// Issue Stop Read Unique Identifier command
EFC->EEFC_FCR = EEFC_FCR_FCMD_SPUI | EEFC_FCR_FKEY_PASSWD;
// Wait for flash controller ready bit to go high
while(!(EFC->EEFC_FSR & EEFC_FSR_FRDY)) {};
}

%% endif

extern "C" uint8_t
tusb_get_device_serial(uint16_t *serial_str)
{
constexpr uint8_t SERIAL_BYTE_LEN = 16;
uint8_t raw_id[SERIAL_BYTE_LEN];

%% if "samg55" in target.string
read_efc_uid((uint32_t*)raw_id);
%% else

uint32_t *id_addresses[4] =
{
%% if target.platform in ["stm32"]
%% if target.platform in ["stm32"]
((uint32_t *) UID_BASE), ((uint32_t *) UID_BASE) + 1,
((uint32_t *) UID_BASE) + 2, ((uint32_t *) UID_BASE) + 3
%% elif target.platform in ["sam"]
%% if "samd51" in target.string
%% elif target.platform in ["sam"]
%% if "samd51" in target.string
(uint32_t *)0x008061FC, (uint32_t *)0x00806010,
(uint32_t *)0x00806014, (uint32_t *)0x00806018
%% else
%% else
(uint32_t *)0x0080A00C, (uint32_t *)0x0080A040,
(uint32_t *)0x0080A044, (uint32_t *)0x0080A048
%% endif
%% elif target.platform in ["rp"]
%% endif
%% elif target.platform in ["rp"]
/* sysinfo CHIP_ID and GIT_REV */
((uint32_t *)0x40000000),((uint32_t *)0x40000040),
((uint32_t *)0x40000000),((uint32_t *)0x40000040),
%% endif
%% endif
};

uint8_t raw_id[SERIAL_BYTE_LEN];

for (int i = 0; i < 4; i++)
for (int k = 0; k < 4; k++)
raw_id[4 * i + (3 - k)] = (*(id_addresses[i]) >> k * 8) & 0xff;
%% endif

const auto fn_nibble = [](uint8_t nibble)
{
Expand Down
6 changes: 5 additions & 1 deletion src/modm/architecture/utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@
*/
#define modm_always_inline

/// Specifies that a function should never be inlined
#define modm_noinline

/// Attached to a variable or a function this means that it is meant to be possibly unused.
#define modm_unused

Expand Down Expand Up @@ -125,6 +128,7 @@
#define MODM_ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))

#define modm_always_inline inline __attribute__((always_inline))
#define modm_noinline __attribute__((noinline))
#define modm_unused __attribute__((unused))
#define modm_aligned(n) __attribute__((aligned(n)))
#define modm_packed __attribute__((packed))
Expand Down Expand Up @@ -155,7 +159,7 @@
# define modm_fastdata
# define modm_faststack
#else
# define modm_fastcode modm_section(".fastcode")
# define modm_fastcode modm_section(".fastcode") modm_noinline
# define modm_ramcode modm_fastcode
# define modm_fastdata modm_section(".fastdata")
# define modm_faststack modm_section(".faststack")
Expand Down