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.

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

RTX changes pulled in from d20b8aa #6045

Merged
merged 2 commits into from Feb 16, 2018

Conversation

Projects
None yet
5 participants
@deepikabhavnani
Contributor

deepikabhavnani commented Feb 8, 2018

Secure functions were not accessible from Timer/Idle thread this PR should fix that with changes from CMSIS and config options in mbed-os

Pulling in ARM-software/CMSIS_5@d20b8aa#diff-7467c87f859f0e1a8e5f93ef0c118c43

Resolves: ARM-software/CMSIS_5#252

@bulislaw - I am not sure if we should add conf options (MBED_CONF_APP_IDLE_THREAD_TZ_MOD_ID / MBED_CONF_APP_TIMER_THREAD_TZ_MOD_ID) or simply set OS_TIMER_THREAD_TZ_MOD_ID /
OS_IDLE_THREAD_TZ_MOD_ID as 1.

RTX changes pulled in from d20b8aa
RTX5: Added TrustZone Module Identifier configuration for Idle and Timer Thread

@0xc0170 0xc0170 requested a review from bulislaw Feb 9, 2018

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Feb 9, 2018

Pulling in ARM-software/CMSIS_5@d20b8aa#diff-7467c87f859f0e1a8e5f93ef0c118c43

Is this pulling just one change, should not we update the RTX from upstream ?

@deepikabhavnani

This comment has been minimized.

Contributor

deepikabhavnani commented Feb 9, 2018

RTX update will take time, and this was requires for cortex-m23/m33 devices.

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Feb 9, 2018

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Feb 9, 2018

Build : SUCCESS

Build number : 1102
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6045/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build

@mbed-ci

This comment has been minimized.

@mbed-ci

This comment has been minimized.

@bulislaw

This comment has been minimized.

Member

bulislaw commented Feb 9, 2018

I am not sure if we should add conf options (MBED_CONF_APP_IDLE_THREAD_TZ_MOD_ID / MBED_CONF_APP_TIMER_THREAD_TZ_MOD_ID) or simply set OS_TIMER_THREAD_TZ_MOD_ID /
OS_IDLE_THREAD_TZ_MOD_ID as 1.

Are these config options expected to be changed by the APP?

Also Mbed OS won't be run in secure mode, so I'm not 100% sure why do we need that change.

@deepikabhavnani

This comment has been minimized.

Contributor

deepikabhavnani commented Feb 9, 2018

These config options are not app based, but target based. If timer module / access to sleep mode is set as secure then non-secure mbed-os should set it to 1 to access secure modules.

@bulislaw

This comment has been minimized.

Member

bulislaw commented Feb 9, 2018

If it's target specific we shouldn't use the mbed config system, but just wrap the RTX config in #ifndef.

Default values for Trustzone Idle/Timer thread updated
Default value for timer/idle thread trustzone identifier is 0, updated
it to 1 to allow threads to access secure functions when timer is secure device.

@deepikabhavnani deepikabhavnani force-pushed the deepikabhavnani:thread_tzoption branch from 6028e48 to 9fa0a52 Feb 12, 2018

@deepikabhavnani

This comment has been minimized.

Contributor

deepikabhavnani commented Feb 12, 2018

@bulislaw - Removed the conf option

@deepikabhavnani

This comment has been minimized.

Contributor

deepikabhavnani commented Feb 13, 2018

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Feb 13, 2018

Build : SUCCESS

Build number : 1131
Build artifacts/logs : http://mbed-os.s3-website-eu-west-1.amazonaws.com/?prefix=builds/6045/

Triggering tests

/morph test
/morph uvisor-test
/morph export-build

@mbed-ci

This comment has been minimized.

@mbed-ci

This comment has been minimized.

@cmonr cmonr merged commit 342e3ca into ARMmbed:master Feb 16, 2018

17 checks passed

AWS-CI uVisor Build & Test Success
Details
ci-morph-build build completed
Details
ci-morph-exporter build completed
Details
ci-morph-test test completed
Details
continuous-integration/jenkins/pr-head This commit looks good
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
mbed-ci-generic Build finished.
Details
travis-ci/docs/ Local docs testing has passed
Details
travis-ci/events/ Local events testing has passed
Details
travis-ci/littlefs/ Local littlefs testing has passed
Details
travis-ci/mbed2-ATMEL/ Local mbed2-ATMEL testing has passed
Details
travis-ci/mbed2-MAXIM/ Local mbed2-MAXIM testing has passed
Details
travis-ci/mbed2-NORDIC/ Local mbed2-NORDIC testing has passed
Details
travis-ci/mbed2-NUVOTON/ Local mbed2-NUVOTON testing has passed
Details
travis-ci/mbed2-NXP/ Local mbed2-NXP testing has passed
Details
travis-ci/mbed2-SILICON_LABS/ Local mbed2-SILICON_LABS testing has passed
Details
travis-ci/mbed2-STM/ Local mbed2-STM testing has passed
Details

@deepikabhavnani deepikabhavnani deleted the deepikabhavnani:thread_tzoption branch Feb 16, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment