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

Reregistration GR-PEACH as mbed support board #5628

Merged
merged 17 commits into from Dec 28, 2017

Conversation

Projects
None yet
@TomoYamanaka
Contributor

TomoYamanaka commented Dec 1, 2017

Description

By #5342, since Cortex-A was supported wtih updating CMSIS/RTX, I request that GR-PEACH is registed as mbed board again.

I've closed #5530, because I removed my commits accidently. So, I made this PR again.

The main changes is the below.

  • Changes to PEACH code (4 commits)
  • Changes to Mbed OS including to reverting "disabling the Cortex-A" (5 commits)
  • Cherry-picked changes from CMSIS/RTX repo (3 commits)
  • New changes to CMSIS/RTX (3 commits)

Request

  • I strongly desire to be included in the shortest release package after completing the merge of this PR.

@toyowata
Please help me to go ahead with the above.

@0xc0170 0xc0170 requested a review from bulislaw Dec 1, 2017

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Dec 1, 2017

I looked at the changes (changes to target code looks fine to me). Got question regarding changes to CMSIS/RTX.

The last 3 commits - are they going also upstream (are there pull requests or issues reported) ?

3 commits that are being cherry-picked from CMSIS repository, they are already released (what version), or develop branch ? To be aware, what update do we need to get these in.

@bulislaw

This comment has been minimized.

Member

bulislaw commented Dec 1, 2017

@JonatanAntoni could you review this 3 commits, as if they would be submitted to CMSIS_5 repo:
c6fa97c
c91b39a
aaad6c1

cmsis/TARGET_CORTEX_A/core_ca.h Outdated
@@ -1788,6 +1788,20 @@ typedef struct RegionStruct {
region.sh_t = NON_SHARED; \
MMU_GetSectionDescriptor(&descriptor_l1, region);
#define section_normal_nc(descriptor_l1, region) region.rg_t = SECTION; \

This comment has been minimized.

@bulislaw

bulislaw Dec 1, 2017

Member

Just looking at the different macros this one is missing documentation

@TomoYamanaka

This comment has been minimized.

Contributor

TomoYamanaka commented Dec 8, 2017

@bulislaw @JonatanAntoni
For merge the changes(0421868, fefec98, e2acfc1) of CMSIS/RTX, I has been promoted discussion by giving three PR to CMSIS_5 repo.
Currently, one of three(#286) was merged in CMSIS repo, but rest requests(#287, #288) do not be still merged and discussion is continuing. It seems that the cause and my changing contents obtained a certain understanding, now discussion focus on permanent fix. I think that permanent fix is needed, however, I strongly desire to merge this PR to Mbed OS 5.7 that will mention "cortex-A suppport" as official.

Therefore, Could you please merge my changes of CMSIS/RTX as tentative?
Of course, if permanent fix was completed in CMSIS_5 repo, I will cherry-pick them.

@toyowata
Please help me to go ahead with the above.

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Dec 8, 2017

For merge the changes(0421868, fefec98, e2acfc1) of CMSIS/RTX, I has been promoted discussion by giving three PR to CMSIS_5 repo.

Thank you 👍

Currently, one of three(#286) was merged in CMSIS repo, but rest requests(#287, #288) do not be still merged and discussion is continuing. It seems that the cause and my changing contents obtained a certain understanding, now discussion focus on permanent fix. I think that permanent fix is needed, however, I strongly desire to merge this PR to Mbed OS 5.7 that will mention "cortex-A suppport" as official.

Based on the review for those opened 2 PR, and discussion with @JonatanAntoni. There's only one left, 288 was fixed , so that could be done here the same (cosmetic change there the functionality the same). Thus only 287 needs further validation. Please help there to validate.

Thus only one remaining, that is not blocking this PR to my understanding.

What I would like to have one documentation improvement, New changes to CMSIS/RTX (No 1 of total 3 commits) The headline for each commit should provide meaningful information to a reader within 50 characters. If you could rework the commit messages it would be helpful. For instance: New changes to CMSIS/RTX (No 1 of total 3 commits) this could be CMSIS: add section_normal_nc impl or similar then the paragraph below is good as you have it 👍 The rest should follow. Once this is done, let us know

@TomoYamanaka TomoYamanaka force-pushed the TomoYamanaka:master branch from e2acfc1 to 1da2941 Dec 11, 2017

@TomoYamanaka

This comment has been minimized.

Contributor

TomoYamanaka commented Dec 11, 2017

@0xc0170
Thank you for your comments.
I rebased those commits in the form of changing commit message.

Based on the review for those opened 2 PR, and discussion with @JonatanAntoni. There's only one left, 288 was fixed , so that could be done here the same (cosmetic change there the functionality the same). Thus only 287 needs further validation. Please help there to validate.

286 and 288 were fixed in CMSIS_5 repo so that I cherry-picked those two commits(5f850a2 , 839e4a5).
Also since only 287 needs further validation, I didn't cherry-pick, and changed only the commit message.

Please let me know if there is anything you are unclear.

@toyowata

This comment has been minimized.

Contributor

toyowata commented Dec 13, 2017

@0xc0170 Any additional step required for this PR?

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Dec 13, 2017

@TomoYamanaka If you can please rebase, we will trigger tests

@bulislaw Please review

@TomoYamanaka TomoYamanaka force-pushed the TomoYamanaka:master branch from 1da2941 to b97a43c Dec 14, 2017

@TomoYamanaka

This comment has been minimized.

Contributor

TomoYamanaka commented Dec 14, 2017

@0xc0170 @toyowata

I rebased those commits.

@TomoYamanaka

This comment has been minimized.

Contributor

TomoYamanaka commented Dec 18, 2017

How is going? Is there anything else to do?

@0xc0170

The only commit I do not fully understand is c6827c8 - changing linker script files, not enough information in the commit msg to understand why bss section was changed and other sections there

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Dec 18, 2017

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Dec 18, 2017

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Dec 18, 2017

It seems our CI got a license problem (only some devices, seems like CI networking failure rather), will investigate

cc @studavekar @kegilbert

@TomoYamanaka

This comment has been minimized.

Contributor

TomoYamanaka commented Dec 18, 2017

@0xc0170
I changed the linker script files to implement the dynamic HEAP the same as Cortex-M targets.
Since GR-PEACH's HEAP was a fixed area, I changed the label name(ZI_DATA to RW_IRAM1) and replaced the allocation of STACK/HEAP.

Do you know what I mean?
If there is no problem in this description, I will update the commit message soon.

@TomoYamanaka TomoYamanaka force-pushed the TomoYamanaka:master branch from b97a43c to 4d85759 Dec 18, 2017

@TomoYamanaka

This comment has been minimized.

Contributor

TomoYamanaka commented Dec 18, 2017

@0xc0170
Thank you. I updated the commit msg.

@bulislaw

This comment has been minimized.

Member

bulislaw commented Dec 19, 2017

@TomoYamanaka we still have two commits touching CMSIS/RTX code:
a888ca5
4d85759

Where are we with pushing them to the original CMSIS/RTX repo?

@TomoYamanaka

This comment has been minimized.

Contributor

TomoYamanaka commented Dec 19, 2017

@bulislaw

  • a888ca5
    I cherry-picked this commit from CMSIS_5 repo.

  • 4d85759
    I don't cherry-pick this commit from CMSIS_5 repo.
    I aim to merge this PR to Mbed OS 5.7, so I discussed with Arm Mbed team member on the thread and agreed with them to merge this commit as a tentative.

@JonatanAntoni

This comment has been minimized.

Member

JonatanAntoni commented Dec 19, 2017

@TomoYamanaka,

4d85759 should have been superseded by 17b53ef2, bd0db8d and d43938f.

Cheers,
Jonatan

@TomoYamanaka TomoYamanaka force-pushed the TomoYamanaka:master branch from 4d85759 to 1dda366 Dec 19, 2017

@TomoYamanaka

This comment has been minimized.

Contributor

TomoYamanaka commented Dec 19, 2017

@JonatanAntoni

I rebased the commit 4d85759 by cherry-pick those commits(17b53ef2 , d43938f).

@bulislaw

This comment has been minimized.

Member

bulislaw commented Dec 19, 2017

@TomoYamanaka

4d85759
I don't cherry-pick this commit from CMSIS_5 repo.
I aim to merge this PR to Mbed OS 5.7, so I discussed with Arm Mbed team member on the thread and agreed with them to merge this commit as a tentative.

Could you point me to the comment?

JonatanAntoni added some commits Dec 11, 2017

Core(A): Refactored L1 Cache maintenance to be compiler agnostic.
- Added L1 Cache test cases to CoreValidation.
- Adopted FVP Cortex-A configs to simulate cache states.
Core(A): Changed macro __DEPRECATED to CMSIS_DEPRECATED. (Issue #287)
__DEPRECATED conflicts with a predefined macro in GCC C++ mode.

@TomoYamanaka TomoYamanaka force-pushed the TomoYamanaka:master branch from 1dda366 to 063717d Dec 21, 2017

@TomoYamanaka

This comment has been minimized.

Contributor

TomoYamanaka commented Dec 21, 2017

@0xc0170
I rebased those commits. Is this ok with you?

@bulislaw

This comment has been minimized.

Member

bulislaw commented Dec 21, 2017

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Dec 21, 2017

@bulislaw

This comment has been minimized.

Member

bulislaw commented Dec 22, 2017

Arm compiler licence issues - retry.

/morph build

@mbed-ci

This comment has been minimized.

mbed-ci commented Dec 22, 2017

Build : SUCCESS

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

Triggering tests

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

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Dec 22, 2017

Restarted uvisor job (flash failure). mbed-os-generic-context - to be resolved, should not be here

@mbed-ci

This comment has been minimized.

@mbed-ci

This comment has been minimized.

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Dec 22, 2017

@orenc17A Can you help resolving an error in uvisor CI?

@orenc17

This comment has been minimized.

Contributor

orenc17 commented Dec 23, 2017

/morph uvisor-test

@toyowata

This comment has been minimized.

Contributor

toyowata commented Dec 27, 2017

@0xc0170 Can you merge this please?

@bulislaw

This comment has been minimized.

Member

bulislaw commented Dec 27, 2017

@cmonr cmonr merged commit 2b718fe into ARMmbed:master Dec 28, 2017

18 checks passed

AWS-CI uVisor Build & Test Verification build successful.
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-os-generic-context
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
travis-ci/tools Local tools testing has passed
Details
@adbridge

This comment has been minimized.

Contributor

adbridge commented Dec 29, 2017

This relies on previous changes targeted for 5.8 so should also go to that minor release.

@0xc0170

This comment has been minimized.

Member

0xc0170 commented Jan 2, 2018

This relies on previous changes targeted for 5.8 so should also go to that minor release.

Please provide reference of offending dependencies.

@adbridge

This comment has been minimized.

Contributor

adbridge commented Jan 2, 2018

Having done a re-run this is now patching across ok. Not sure why it was failing before unless it was conflicting with another PR which may have also been removed!

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