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.

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
Merged

Update CMSIS to 5.4.0 #7875

merged 17 commits into from
Aug 31, 2018

Conversation

c1728p9
Copy link
Contributor

@c1728p9 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
Copy link
Contributor

cmonr commented Aug 23, 2018

Testing.

/morph build

@mbed-ci
Copy link

mbed-ci commented Aug 23, 2018

Build : FAILURE

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

@0xc0170
Copy link
Contributor

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).

Copy link
Contributor

@donatieng donatieng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Contributor Author

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
Copy link

@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
Copy link
Contributor

cmonr commented Aug 24, 2018

@donatieng Mind taking an updated look?

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

@mbed-ci
Copy link

mbed-ci commented Aug 24, 2018

Build : FAILURE

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

@c1728p9
Copy link
Contributor Author

c1728p9 commented Aug 25, 2018

Updated this PR to fix IAR compilation.

@cmonr
Copy link
Contributor

cmonr commented Aug 25, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Aug 25, 2018

Build : FAILURE

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

@cmonr
Copy link
Contributor

cmonr commented Aug 25, 2018

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

@mbed-ci
Copy link

mbed-ci commented Aug 25, 2018

Build : FAILURE

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

@c1728p9
Copy link
Contributor Author

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
Copy link
Contributor

cmonr commented Aug 25, 2018

/morph build

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:
c3b123ef4256f65537e2597af475fc20ec9a383e
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.
@c1728p9
Copy link
Contributor Author

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
Copy link
Contributor Author

c1728p9 commented Aug 27, 2018

/morph build

@mbed-ci
Copy link

mbed-ci commented Aug 27, 2018

Build : FAILURE

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

@cmonr
Copy link
Contributor

cmonr commented Aug 27, 2018

The prep step got stuck somehow.

/morph build

@mbed-ci
Copy link

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
Copy link

mbed-ci commented Aug 27, 2018

@mbed-ci
Copy link

mbed-ci commented Aug 27, 2018

@cmonr
Copy link
Contributor

cmonr commented Aug 27, 2018

Unclear if test failure was caused by PR or not.

/morph test

@cmonr
Copy link
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
Copy link

mbed-ci commented Aug 27, 2018

@c1728p9
Copy link
Contributor Author

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
Copy link
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
@cmonr cmonr reopened this Aug 30, 2018
@cmonr
Copy link
Contributor

cmonr commented Aug 30, 2018

@donatieng Mind re-reviewing/OKing?

@mbed-ci
Copy link

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
Copy link

mbed-ci commented Aug 30, 2018

@mbed-ci
Copy link

mbed-ci commented Aug 30, 2018

@mbed-ci
Copy link

mbed-ci commented Aug 31, 2018

Copy link
Contributor

@donatieng donatieng left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Thanks @c1728p9

@cmonr cmonr merged commit 00b7700 into ARMmbed:master Aug 31, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants