chore(CMSIS,Examples,PeriphDrivers): Sync latest ME30 changes #1075

sihyung-maxim · 2024-07-08T20:50:28Z

Description

It has been awhile since the last time the feat/ME30 branch was synced up to main (May). Most people should be aware that the feat/ME30 contains the latest files, and the ME30 files in main have been out of date.

Some highlights:

Add I3C, Boost, RSTZ, Frequency Counter, MPC, SPC, and NSPC registers.
Add trustzone support to build system: memory definitions are done by build system.
Initial commit for MPC, SPC, and NSPC drivers (needs more testing).
CMSIS fixes and changes.

Checklist Before Requesting Review

PR Title follows correct guidelines.
Description of changes and all other relevant information.
(Optional) Link any related GitHub issues using a keyword
(Optional) Provide info on any relevant functional testing/validation. For API changes or significant features, this is not optional.

This commit enable MAX32657 zephyr support. Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>

Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>

Co-authored-by: lorne-maxim <lorne-maxim@users.noreply.github.com>

…675 (#1001) Co-authored-by: lorne-maxim <lorne-maxim@users.noreply.github.com> Co-authored-by: Sihyung Woo <75494566+sihyung-maxim@users.noreply.github.com>

These files are exact copy of MAX32655 Files will be updated in next sections, added here to demonstrate delta clearly on next steps Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>

feat(PeriphDrivers): Add max32657 basic files

…t/ME30

ozersa · 2024-07-09T10:08:03Z

Libraries/zephyr/MAX/Source/MAX32657/CMakeLists.txt

@@ -22,6 +22,12 @@ if(NOT TARGET_REV)
  zephyr_compile_definitions(-DTARGET_REV=0x4131)
 endif()

+if(CONFIG_TRUSTED_EXECUTION_SECURE)
+  zephyr_compile_definitions(-DIS_SECURE_ENVIRONMENT=1)


Not essential, just a suggestion,
How about to align msdk and zepyhr flags,
On zephyr side CONFIG_TRUSTED_EXECUTION_SECURE" and CONFIG_TRUSTED_EXECUTION_NONSECURE is used to generate secure, non-secure image.

If you replace IS_SECURE_ENVIRONMENT with CONFIG_TRUSTED_EXECUTION_SECURE in msdk files. MSDK will be align with zephyr.

Sure, sounds good.

Since many members of the roadtest and verification teams are used to the current flags, I'll still leave IS_SECURE_ENVIRONMENT defined, but I'll use the CONFIG_TRUSTED_EXECUTION_* going forward.

Thanks, in that case I can remove conversion in Libraries/zephyr/MAX/Source/MAX32657/CMakeLists.txt.
Let me I apply some test with final status of this branch on zephyr side.

It's removed.

…lign with Zephyr flags

Since all timers are 32bit, max32657 timer wrapper is updated accordingly. Signed-off-by: Anıl Kara <anil.kara@analog.com>

MAX32657 UART interrupt enable register named as inten Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>

ozersa · 2024-07-10T10:51:14Z

MXC_INFO_MEM_BASE not accessible for non-secure mode, so this function shall be enabled only for secure mode?

MSDK team start to use CONFIG_TRUSTED_EXECUTION_SECURE flag instead of IS_SECURE_ENVIRONMENT Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>

…cific)

sihyung-maxim · 2024-07-10T18:33:28Z

MXC_INFO_MEM_BASE not accessible for non-secure mode, so this function shall be enabled only for secure mode?

Yep, nice catch. It's now restricted for secure builds only.

sihyung-maxim · 2024-07-10T18:34:26Z

@ozersa Also not sure how you want to handle the merge conflict. (I'm assuming the current file in the branch is what we want merged in, but I will let you confirm).

Signed-off-by: Tahsin Mutlugun <Tahsin.Mutlugun@analog.com>

…t/ME30

Jake-Carter · 2024-07-16T00:49:17Z

Libraries/CMSIS/Device/Maxim/GCC/gcc.mk

+# Generate an object file with empty definitions of the secure image symbols at the correct locations.
+# The object file needs to be linked with the non-secure image.
+ifeq ($(GEN_CMSE_IMPLIB_OBJ),1)
+PROJ_LDFLAGS := -Xlinker --cmse-implib -Xlinker --out-implib=$(CURDIR)/build/build_s/secure_implib.o


Use += instead of := so you don't erase previous values in PROJ_LDFLAGS here

Jake-Carter · 2024-07-16T00:50:23Z

Examples/MAX32657/Hello_World_TZ/Secure/project.mk

+
+################################################################################
+#
+#	If 'USE_CUSTOM_MEMORY_SETTINGS = 1':


Suggest an actual conditional here

ifeq "$(USE_CUSTOM_MEMORY_SETTINGS)" "1" # ... endif

Jake-Carter · 2024-07-16T00:53:37Z

Libraries/CMSIS/Device/Maxim/MAX32657/Source/GCC/max32657.mk

+ifeq ($(USE_CUSTOM_MEMORY_SETTINGS),1)
+
+ifeq "$(MSECURITY_MODE)" "SECURE"
+LINKERFILE=$(abspath ${SECURE_CODE_DIR})/$(TARGET_LC)_s.ld


If custom memory settings are used the linkerfile needs to be local inside the project?

Jake-Carter · 2024-07-16T00:55:21Z

Libraries/CMSIS/Device/Maxim/MAX32657/Source/GCC/max32657.mk

+ifeq "$(MSECURITY_MODE)" "SECURE"
+LINKERFILE=$(CMSIS_ROOT)/Device/Maxim/$(TARGET_UC)/Source/GCC/$(TARGET_LC)_s.ld
+else # MSECURITY_MODE=NONSECURE
+LINKERFILE=$(CMSIS_ROOT)/Device/Maxim/$(TARGET_UC)/Source/GCC/$(TARGET_LC)_ns.ld


Suggest defining all LINKERFILEs with ?= so that user overrides still behave as expected

Jake-Carter · 2024-07-16T01:14:44Z

Libraries/CMSIS/Device/Maxim/MAX32657/Source/GCC/max32657.mk

+# Project-owner must set these variables in project.mk
+#	Absolute paths will be used when these are used.
+NONSECURE_CODE_DIR ?= $(CMSIS_ROOT)/../../Examples/$(TARGET_UC)/Hello_World_TZ/NonSecure
+SECURE_CODE_DIR ?= $(CMSIS_ROOT)/../../Examples/$(TARGET_UC)/Hello_World_TZ/Secure


I suggest defining these defaults as

NONSECURE_CODE_DIR ?= $(abspath $(dir $(PROJECTMK))/NonSecure) SECURE_CODE_DIR ?= $(abspath $(dir $(PROJECTMK)))

which will set them relative to the project.mk file, and makes the secure project the "root" project.

Hello_World_TZ .vscode main.c project.mk Makefile /NonSecure .vscode main.c Makefile project.mk

It's a pain to develop in two island folders, especially if one of them isn't intended to be built by itself. Nested is more friendly

Jake-Carter · 2024-07-16T01:55:47Z

Libraries/CMSIS/Device/Maxim/MAX32657/Source/GCC/max32657_memory.mk

+endif # USE_CUSTOM_MEMORY_SETTINGS
+
+# Prepare definitions to store in PROJ_CFLAGS.
+S_FLASH_START := $(shell printf "0x%x" $(S_FLASH_START))


Same for calls to printf. We can't directly depend on OS-specific utilities unless you want to wrap inside of an OS-enforced boundary which I would leave as a very last resort.

Jake-Carter · 2024-07-16T01:56:48Z

Libraries/CMSIS/Device/Maxim/MAX32657/Source/GCC/max32657_memory.mk

+
+# Should only be run from the host "Secure" project
+.PHONY: debug_tz_mem_from_host_proj
+debug_tz_mem_from_host_proj:


Wrap this rule definition in a check for the right variable definitions to enforce it

Jake-Carter · 2024-07-16T01:59:35Z

Libraries/CMSIS/Device/Maxim/MAX32657/Source/GCC/setup_memory_tz.py

+    # Add more if needed.
+}
+
+def string_to_integer_bytes(string_hex_or_units):


I can kind of guess what the input to this function is but a comment explaining what it does would be helpful

Jake-Carter · 2024-07-16T02:04:20Z

Libraries/CMSIS/Device/Maxim/MAX32657/Source/GCC/setup_memory_tz.py

+program_description = '''Generates the linker scripts and partiton_{device}.h with
+project-defined memory settings. 
+
+NOTE: This script uses binary prefix notation for units when not used by build system


Confused about what this means

Jake-Carter · 2024-07-16T02:05:37Z

Libraries/CMSIS/Device/Maxim/MAX32657/Source/GCC/setup_memory_tz.py

+NOTE: This script uses binary prefix notation for units when not used by build system
+For example: Kilobytes (KB) will be treated as Kibibytes (KiB).
+
+Note: All these arguments will be set with default values according to the {device}.mk file.


Only because the build system calls this script though, right? This could be misleading since it doesn't parse the makefile

Jake-Carter · 2024-07-16T02:27:22Z

Build errors. Auto-tester is not triggering on this for some reason.

- CC /home/jhcarter/repos/msdk/Libraries/CMSIS/../PeriphDrivers/Source/FLC/flc_me30.c
/home/jhcarter/repos/msdk/Libraries/CMSIS/../PeriphDrivers/Source/FLC/flc_me30.c: In function 'MXC_FLC_GetWELR':
/home/jhcarter/repos/msdk/Libraries/CMSIS/../PeriphDrivers/Source/FLC/flc_me30.c:266:25: error: 'mxc_flc_regs_t' has no member named 'welr0'
  266 |         return &(MXC_FLC->welr0);
      |                         ^~
/home/jhcarter/repos/msdk/Libraries/CMSIS/../PeriphDrivers/Source/FLC/flc_me30.c:268:25: error: 'mxc_flc_regs_t' has no member named 'welr1'
  268 |         return &(MXC_FLC->welr1);
      |                         ^~
/home/jhcarter/repos/msdk/Libraries/CMSIS/../PeriphDrivers/Source/FLC/flc_me30.c: In function 'MXC_FLC_GetRLR':
/home/jhcarter/repos/msdk/Libraries/CMSIS/../PeriphDrivers/Source/FLC/flc_me30.c:286:25: error: 'mxc_flc_regs_t' has no member named 'rlr0'
  286 |         return &(MXC_FLC->rlr0);
      |                         ^~
/home/jhcarter/repos/msdk/Libraries/CMSIS/../PeriphDrivers/Source/FLC/flc_me30.c:288:25: error: 'mxc_flc_regs_t' has no member named 'rlr1'
  288 |         return &(MXC_FLC->rlr1);
      |                         ^~
make[1]: *** [/home/jhcarter/repos/msdk/Libraries/CMSIS/Device/Maxim/GCC/gcc.mk:538: /home/jhcarter/repos/msdk/Libraries/PeriphDrivers/bin/MAX32657/spi-v1_softfp/flc_me30.o] Error 1
make[1]: Leaving directory '/home/jhcarter/repos/msdk/Examples/MAX32657/Hello_World_TZ/Secure'
make: *** [/home/jhcarter/repos/msdk/Libraries/PeriphDrivers/periphdriver.mk:102: /home/jhcarter/repos/msdk/Libraries/PeriphDrivers/bin/MAX32657/spi-v1_softfp/libPeriphDriver_spi-v1_softfp.a] Error 2

ozersa · 2024-07-17T19:48:00Z

Libraries/PeriphDrivers/Source/FLC/flc_me30.c

 {
    if ((addr >= MXC_FLASH_MEM_BASE) && (addr < (MXC_FLASH_MEM_BASE + MXC_FLASH_MEM_SIZE))) {
        *result = addr & (MXC_FLASH_MEM_SIZE - 1);
+#if CONFIG_TRUSTED_EXECUTION_SECURE


Flash controller only available for secure mode, flc_me30.c functions shall handle this.

These parameters require to be defined in bare metal drivers Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>

ozersa · 2024-07-29T10:54:00Z

Libraries/PeriphDrivers/Source/FLC/flc_reva.c

@@ -405,10 +407,12 @@ int MXC_FLC_RevA_ClearFlags(uint32_t mask)
 //******************************************************************************
 int MXC_FLC_RevA_UnlockInfoBlock(mxc_flc_reva_regs_t *flc, uint32_t address)
 {
+#if !defined(CONFIG_TRUSTED_EXECUTION_SECURE) || (CONFIG_TRUSTED_EXECUTION_SECURE != 0) || (TARGET_NUM != 32657) 


Exclamation mark need to be removed.

The logic might be simplified too.

ozersa · 2024-07-29T10:54:10Z

Libraries/PeriphDrivers/Source/FLC/flc_reva.c

@@ -424,10 +428,12 @@ int MXC_FLC_RevA_UnlockInfoBlock(mxc_flc_reva_regs_t *flc, uint32_t address)
 //******************************************************************************
 int MXC_FLC_RevA_LockInfoBlock(mxc_flc_reva_regs_t *flc, uint32_t address)
 {
+#if !defined(CONFIG_TRUSTED_EXECUTION_SECURE) || (CONFIG_TRUSTED_EXECUTION_SECURE != 0) || (TARGET_NUM != 32657) 


Exclamation mark need to be removed.

The logic might be simplified too.

ozersa

Exclamation mark need to be removed.

Remove application flash section restriction from flash driver Some section of flash can be used for storage purpose Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>

Jake-Carter and others added 30 commits April 18, 2024 16:03

Allow configuration of -mcpu for different archs

c691d2b

Add starter/placeholder ME30 files

5061c3b

Initial commit for updated ME30 register files

98bc66d

Update copyrights

3befb13

Update LPCMP names

319d6dc

Initial passthrough for max32657.h

b2d3100

Update IVT for max32657.h

2cd2bb9

Fix TMR registers

4b81357

Fix copyright names and add SPC

64f15d3

Remove unsuppored peripherals from CMSIS

9417f4e

Merge remote-tracking branch 'remotes/upstream/main' into feat/ME30

7ac0d96

Add MAX32657 in zephyr build system

609b7b7

This commit enable MAX32657 zephyr support. Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>

Update wrappers to cover MAX32657

5d26d28

Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>

feat(PeriphDrivers): Add PinMux tool supporting functions (#997)

b87895f

Co-authored-by: lorne-maxim <lorne-maxim@users.noreply.github.com>

fix(Tools): Update Keil support for ECC enabled versions of the MAX32…

47408bb

…675 (#1001) Co-authored-by: lorne-maxim <lorne-maxim@users.noreply.github.com> Co-authored-by: Sihyung Woo <75494566+sihyung-maxim@users.noreply.github.com>

Add MAX32657 peripheral interface files

3678f41

These files are exact copy of MAX32655 Files will be updated in next sections, added here to demonstrate delta clearly on next steps Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>

Add MAX32657 peripheral source files

12429e5

These files are exact copy of MAX32655 Files will be updated in next sections, added here to demonstrate delta clearly on next steps Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>

Merge pull request #996 from analogdevicesinc/feat/add-MAX32657-Build

81d42d9

feat(PeriphDrivers): Add max32657 basic files

Set FPU 'fpv5-sp-d16' for ME30

c3a5362

Update register files to match appropriate IP

03a5c6a

Merge branch 'feat/ME30' of github.com:analogdevicesinc/msdk into fea…

189acd0

…t/ME30

Re-add files that were accidentally removed

326905c

Remove ISO clock and set IPO to 50MHz

471a09c

Fix for linter

03b7c75

Fix copyright

77ce4ed

Update ICC, SPI, and remove unsupported register files

3927d4f

Remove unneeded SVD files

6b34f93

Fix INRO clock freq and move SPC into SYS

3b029ab

Add NSPC register

aa238cc

Remove inclusion of lpgcr regs

01cda58

Add copyright

3132dbe

ozersa reviewed Jul 9, 2024

View reviewed changes

sihyung-maxim and others added 5 commits July 9, 2024 10:08

Fix AES Secure mapping

1f6ff68

Replace IS_SECURE_ENVIRONMENT to CONFIG_TRUSTED_EXECUTION_SECURE to a…

b14c3b5

…lign with Zephyr flags

Add new flag to align with zephyr

9bd0c32

MAX: Include: Update max32657 tmr wrapper

a92abb6

Since all timers are 32bit, max32657 timer wrapper is updated accordingly. Signed-off-by: Anıl Kara <anil.kara@analog.com>

MAX32657 uart int enable register is inten

462c4e4

MAX32657 UART interrupt enable register named as inten Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>

ozersa and others added 5 commits July 10, 2024 13:57

Remove redundant convertion

9a34a18

MSDK team start to use CONFIG_TRUSTED_EXECUTION_SECURE flag instead of IS_SECURE_ENVIRONMENT Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>

Remove BBFCR. Remove partiton_max32657.h from CMSIS (it's project spe…

49bc0e4

…cific)

Remove test code

286ad6c

Fix UART clock sources

af5dff8

Remove unsupported Flash lock registers

1d20702

ttmut and others added 6 commits July 10, 2024 13:35

feat(PeriphDrivers): Add MAX32657 I3C driver (#1026)

0a9575b

Signed-off-by: Tahsin Mutlugun <Tahsin.Mutlugun@analog.com>

Fix RSTZ_NS definition

070a3c0

Merge branch 'feat/ME30' of github.com:analogdevicesinc/msdk into fea…

a1e5fd2

…t/ME30

Fix comments (region vs block) in MPC drivers

dfb0b67

Merge branch 'feat/ME30' of github.com:analogdevicesinc/msdk into fea…

a0b1d00

…t/ME30

Fix MCR_CTRL ERTCO enable bits

945b9f8

Jake-Carter requested changes Jul 16, 2024

View reviewed changes

Fix FLC build errors

67895f5

ozersa reviewed Jul 17, 2024

View reviewed changes

Set flash and ram base and size

285d6ab

These parameters require to be defined in bare metal drivers Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>

ozersa reviewed Jul 29, 2024

View reviewed changes

ozersa requested changes Jul 29, 2024

View reviewed changes

To flash section can be used

b3e8539

Remove application flash section restriction from flash driver Some section of flash can be used for storage purpose Signed-off-by: Sadik Ozer <sadik.ozer@analog.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(CMSIS,Examples,PeriphDrivers): Sync latest ME30 changes #1075

chore(CMSIS,Examples,PeriphDrivers): Sync latest ME30 changes #1075

sihyung-maxim commented Jul 8, 2024

ozersa Jul 9, 2024

sihyung-maxim Jul 9, 2024

sihyung-maxim Jul 9, 2024

ozersa Jul 10, 2024

ozersa Jul 10, 2024

ozersa commented Jul 10, 2024

sihyung-maxim commented Jul 10, 2024

sihyung-maxim commented Jul 10, 2024

Jake-Carter Jul 16, 2024

Jake-Carter Jul 16, 2024

Jake-Carter Jul 16, 2024

Jake-Carter Jul 16, 2024

Jake-Carter Jul 16, 2024

Jake-Carter Jul 16, 2024

Jake-Carter Jul 16, 2024

Jake-Carter Jul 16, 2024

Jake-Carter Jul 16, 2024 •

edited

Loading

Jake-Carter Jul 16, 2024

Jake-Carter commented Jul 16, 2024

ozersa Jul 17, 2024

ozersa Jul 29, 2024

ozersa Jul 29, 2024

ozersa left a comment

chore(CMSIS,Examples,PeriphDrivers): Sync latest ME30 changes #1075

Are you sure you want to change the base?

chore(CMSIS,Examples,PeriphDrivers): Sync latest ME30 changes #1075

Conversation

sihyung-maxim commented Jul 8, 2024

Description

Checklist Before Requesting Review

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ozersa commented Jul 10, 2024

sihyung-maxim commented Jul 10, 2024

sihyung-maxim commented Jul 10, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Jake-Carter Jul 16, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Jake-Carter commented Jul 16, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ozersa left a comment

Choose a reason for hiding this comment

Jake-Carter Jul 16, 2024 •

edited

Loading