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

Update CMSIS to 5.4.0 #7875

Merged
merged 17 commits into from Aug 31, 2018

Conversation

Projects
None yet
7 participants
@c1728p9
Contributor

c1728p9 commented Aug 23, 2018

Description

Pull in the newest version of CMSIS - 5.4.0.

In specific this patch does the following:

  • Preparation for importing
    • Remove use of uVisor hooks
    • Move Cortex A customization out for RTX and into mbed
    • Update importer docs and cmsis_importer.json in prep for update
  • Run importer.py to pull in the updated version of RTX/CMSIS_5
  • Add additional RTX fixes
    • CMSIS/RTX: Conditionally enable TZ CMSIS/RTX: Patch to conditionally compile
    • CMSIS/RTX: Remove the file os_tick_gtim.c
    • Fix define around EvrRtxKernelInitialized (Upstreamed into CMSIS_5)

Pull request type

[ ] Fix
[ ] Refactor
[ ] Target update
[ ] Functionality change
[ ] Breaking change
[x] CMSIS update
@cmonr

This comment has been minimized.

Contributor

cmonr commented Aug 23, 2018

Testing.

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Aug 23, 2018

@0xc0170 0xc0170 requested review from donatieng and bulislaw and removed request for bulislaw Aug 24, 2018

@0xc0170 0xc0170 added needs: work and removed needs: review labels Aug 24, 2018

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Aug 24, 2018

There are linker failures (does this change any API? I found at least one there: signalSet/wait in the CI logs).

@donatieng

Looks like TCP/UDP tests use CMSIS-OS v1 APIs which are implemented in rtos/TARGET_CORTEX/rtx4/cmsis_os1.c which has been removed. Otherwise looks good :).

@c1728p9 c1728p9 force-pushed the c1728p9:feature_CMSIS_5_0b521765 branch from 46fb5c3 to 6d637c6 Aug 24, 2018

@c1728p9

This comment has been minimized.

Contributor

c1728p9 commented Aug 24, 2018

I made the following changes:

  • updated cmsis_importer.json to include cmsis_os1.c
  • re-ran importer.py to pull in the updated version of RTX/CMSIS_5
@deepikabhavnani

This comment has been minimized.

Contributor

deepikabhavnani commented Aug 24, 2018

@ARMmbed/mbed-os-maintainers - Please note this PR will remove uVisor changes done on top of CMSIS, hence and should be merged after #7592

@cmonr

This comment has been minimized.

Contributor

cmonr commented Aug 24, 2018

@donatieng Mind taking an updated look?

Running CI to check if PR has improved.
/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Aug 24, 2018

@c1728p9

This comment has been minimized.

Contributor

c1728p9 commented Aug 25, 2018

Updated this PR to fix IAR compilation.

@cmonr

This comment has been minimized.

Contributor

cmonr commented Aug 25, 2018

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Aug 25, 2018

@cmonr

This comment has been minimized.

Contributor

cmonr commented Aug 25, 2018

Single failure, but unable to determine why...
/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Aug 25, 2018

@c1728p9 c1728p9 force-pushed the c1728p9:feature_CMSIS_5_0b521765 branch from 7635c45 to f6ae178 Aug 25, 2018

@c1728p9

This comment has been minimized.

Contributor

c1728p9 commented Aug 25, 2018

Replaced the commit "CMSIS/RTX: Conditionally enable TZ" with @deepikabhavnani 's
commit "CMSIS/RTX: Patch to conditionally compile" to fix TZ builds
on the NUMAKER_PFM_M2351.

@cmonr

This comment has been minimized.

Contributor

cmonr commented Aug 25, 2018

/morph build

@c1728p9

This comment has been minimized.

Contributor

c1728p9 commented Aug 26, 2018

Remove the double free RTOS tests since this was never defined behavior of CMSIS-RTOS. This allows testing to pass.

The RTX commit which caused this test to start failing is:
ARM-software/CMSIS_5@c3b123e
RTX5: updated MemoryPoolFree (removed count check) [SDCMSIS-801]

Note - Double freeing an element from a memory pool was never safe. The error return value when double freeing was misleading since memory corruption may still be occurring in that case. For more information on this see SDCMSIS-801.

CC @RobertRostohar

@c1728p9

This comment has been minimized.

Contributor

c1728p9 commented Aug 27, 2018

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Aug 27, 2018

@cmonr

This comment has been minimized.

Contributor

cmonr commented Aug 27, 2018

The prep step got stuck somehow.

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Aug 27, 2018

Build : SUCCESS

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

Triggering tests

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

@mbed-ci

This comment has been minimized.

@mbed-ci

This comment has been minimized.

@cmonr

This comment has been minimized.

Contributor

cmonr commented Aug 27, 2018

Unclear if test failure was caused by PR or not.

/morph test

@cmonr cmonr added needs: review and removed needs: work labels Aug 27, 2018

@cmonr

This comment has been minimized.

Contributor

cmonr commented Aug 27, 2018

@c1728p9 Would you be able to take a look at @donatieng comment? Is the file still not in the PR?

@mbed-ci

This comment has been minimized.

@c1728p9

This comment has been minimized.

Contributor

c1728p9 commented Aug 27, 2018

Hi @cmonr I added cmsis_os1.c back to this PR earlier, so this should be good to go.

@cmonr

This comment has been minimized.

Contributor

cmonr commented Aug 27, 2018

@donatieng Mind re-reviewing? This PR should be good to go otherwise.

@cmonr cmonr closed this Aug 27, 2018

@0xc0170 0xc0170 removed the needs: review label Aug 27, 2018

@cmonr cmonr reopened this Aug 30, 2018

@cmonr

This comment has been minimized.

Contributor

cmonr commented Aug 30, 2018

@donatieng Mind re-reviewing/OKing?

@cmonr cmonr added the needs: CI label Aug 30, 2018

@mbed-ci

This comment has been minimized.

mbed-ci commented Aug 30, 2018

Build : SUCCESS

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

Triggering tests

/morph test
/morph export-build
/morph mbed2-build

@mbed-ci

This comment has been minimized.

@mbed-ci

This comment has been minimized.

@mbed-ci

This comment has been minimized.

@donatieng

Looks good! Thanks @c1728p9

@0xc0170 0xc0170 added ready for merge and removed needs: CI labels Aug 31, 2018

@cmonr cmonr merged commit 00b7700 into ARMmbed:master Aug 31, 2018

15 checks passed

AWS-CI uVisor Build & Test Success
Details
ci-morph-build build completed
Details
ci-morph-exporter build completed
Details
ci-morph-mbed2-build 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
jenkins-ci/cloud_client_smoke_test Test job: successful
Details
travis-ci/astyle Passed, 563 files
Details
travis-ci/docs Local docs testing has passed
Details
travis-ci/events Passed, runtime is 9202 cycles (+79 cycles)
Details
travis-ci/gitattributestest Local gitattributestest testing has passed
Details
travis-ci/licence_check Local licence_check testing has passed
Details
travis-ci/littlefs Passed, code size is 8372B (+0.00%)
Details
travis-ci/tools-py2.7 Local tools-py2.7 testing has passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment