Remove dependency on us_ticker HAL apis for non USTICKER targets #10155

mikisch81 · 2019-03-19T11:03:29Z

Description

During #9221 there were difficulties building a secure image without USTICKER and as a workaround a dummy implementation of us_ticker HAL apis was built in the secure image.

#9896 handled part of the problem by calling wait_ns() in wait APIs when there is no USTICKER, but still mbed_us_ticker_api.c defined a static struct of function pointers pointing to the usticker hal APIs and there are multiple places in the tree which call get_us_ticker_data().

So this PR solves these issues by:

Surround mbed_us_ticker_api.c with if DEVICE_USTICKER.
get_us_ticker_data() returns NULL for non-usticker targets.

Fixes #10139

Pull request type

[X] Fix
[ ] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change

Reviewers

@ARMmbed/mbed-os-psa @kjbracey-arm

Release Notes

mikisch81 · 2019-03-20T19:37:44Z

Added USTICKER to ARCH_PRO target, according to 10139#issuecomment if this target uses usticker_api.c it should define DEVICE_USTICKER.
@kjbracey-arm @ARMmbed/team-seeed @maclobdell

mikisch81 · 2019-03-20T21:01:12Z

@cmonr Can we start CI just to check if ARCH_PRO builds and run ok after last commit?

mikisch81 · 2019-03-20T21:01:51Z

Of course pending @ARMmbed/team-seeed review

cmonr · 2019-03-20T21:06:12Z

CI started

mbed-ci · 2019-03-20T22:26:45Z

Test run: FAILED

Summary: 3 of 9 test jobs failed
Build number : 1
Build artifacts

Failed test jobs:

jenkins-ci/mbed-os-ci_build-GCC_ARM
jenkins-ci/mbed-os-ci_build-IAR8
jenkins-ci/mbed-os-ci_build-ARMC6

0xc0170 · 2019-03-21T10:44:19Z

Please review build failures (related to the changes)

0xc0170 · 2019-03-21T12:21:22Z

The failures point to undefined functions from us ticker - looks like their target code is not protected, please review

mikisch81 · 2019-03-21T19:08:38Z

Added USTICKER to these targets:

ARCH_PRO
LPC4088
LPC4088_DM
MAX32600MBED
NCS36510
WIZWIKI_W7500
WIZWIKI_W7500ECO
WIZWIKI_W7500P

All of these targets had us_ticker.c in their compilation but didn't have "device_has": "USTICKER" in target.json

@ARMmbed/team-nxp @ARMmbed/team-seeed please review changes to your targets

@ARMmbed/mbed-os-maintainers @maclobdell can you add more partners according to the affected targets?

mikisch81 · 2019-03-21T19:43:25Z

@cmonr can we run CI to check if last commit helped?

0xc0170 · 2019-03-22T05:48:38Z

All of these targets had us_ticker.c in their compilation but didn't have "device_has": "USTICKER" in target.json

👍 I would not expect to have this not being defined.

We will start CI later today, when rc4 jobs go through

mikisch81 · 2019-03-22T19:50:56Z

@ARMmbed/team-seeed @ARMmbed/team-nxp ping

NirSonnenschein · 2019-03-24T14:54:26Z

Started CI

mbed-ci · 2019-03-24T16:21:06Z

Test run: FAILED

Summary: 3 of 9 test jobs failed
Build number : 2
Build artifacts

Failed test jobs:

jenkins-ci/mbed-os-ci_build-IAR8
jenkins-ci/mbed-os-ci_build-GCC_ARM
jenkins-ci/mbed-os-ci_build-ARMC6

mikisch81 · 2019-03-24T16:35:44Z

@cmonr @NirSonnenschein @0xc0170 Why does astyle suddently looks into files inside targets/?

mikisch81 · 2019-03-24T16:46:26Z

@cmonr @NirSonnenschein @0xc0170 Why does astyle suddently looks into files inside targets/?

@cmonr @NirSonnenschein @0xc0170 can we start CI while the astyle issue is being queried?

mikisch81 · 2019-03-24T16:46:51Z

@mmahadevan108 Can you review last commit?

NirSonnenschein · 2019-03-25T07:09:07Z

restarting CI to verify latest fix pending a-style issue fix

mbed-ci · 2019-03-25T09:50:30Z

Test run: FAILED

Summary: 2 of 13 test jobs failed
Build number : 3
Build artifacts

Failed test jobs:

jenkins-ci/mbed-os-ci_dynamic-memory-usage
jenkins-ci/mbed-os-ci_exporter

alekla01 · 2019-03-25T09:53:30Z

restarted failed jenkins jobs

mikisch81 · 2019-03-25T13:56:50Z

@mmahadevan108 Can you review last commit?

@mmahadevan108

mikisch81 · 2019-03-25T13:57:23Z

@ARMmbed/mbed-os-maintainers Any updates regarding the astyle issue?

mikisch81 · 2019-03-25T16:28:04Z

@ARMmbed/mbed-os-maintainers Is this PR ready for merge once the astyle issue is handled?

cmonr · 2019-03-25T18:55:12Z

@mikisch81 I believe so.

Bringing in the fix here: #10221

I think once the PR is merged, kicking off Travis CI again for this PR should make everything green (I suspect after the merge, the ref/pull/10155/merge reference is regenerated). If not, we can restart CI post-haste.

mikisch81 · 2019-03-25T20:27:03Z

@ARMmbed/team-nxp can you look at the last commit?

cmonr · 2019-03-26T01:46:01Z

Local testing with the last astyle missed a single character. Should be good once #10222 comes in.

- Surround mbed_us_ticker_api.c with if DEVICE_USTICKER - get_us_ticker_data() returns NULL for non-usticker targets.

- LPC4088 - LPC4088_DM - MAX32600MBED - NCS36510 - WIZWIKI_W7500 - WIZWIKI_W7500ECO - WIZWIKI_W7500P

mikisch81 · 2019-03-26T07:53:48Z

Rebased after #10222 was merged

NirSonnenschein · 2019-03-26T08:13:47Z

restarting CI after rebase for astyle fix

mbed-ci · 2019-03-26T10:41:01Z

Test run: SUCCESS

Summary: 13 of 13 test jobs passed
Build number : 4
Build artifacts

mikisch81 · 2019-03-26T11:23:06Z

@ARMmbed/mbed-os-maintainers Any more stuff is needed for this PR?

NirSonnenschein · 2019-03-26T12:22:22Z

@ARMmbed/team-seeed would you like to review this before it is merged? please review or indicate that you don't intend to.

Remove dependency on us_ticker HAL apis for non USTICKER targets

mikisch81 mentioned this pull request Mar 19, 2019

USTICKER still can not be removed from compilation #10139

Closed

kjbracey approved these changes Mar 19, 2019

View reviewed changes

mikisch81 mentioned this pull request Mar 19, 2019

Add ARM_MUSCA_A1 target #9221

Merged

0xc0170 approved these changes Mar 19, 2019

View reviewed changes

0xc0170 added needs: CI release-version: 5.12.1 labels Mar 19, 2019

0xc0170 added needs: work and removed needs: CI labels Mar 21, 2019

0xc0170 requested a review from a team March 21, 2019 12:18

0xc0170 requested review from a team March 22, 2019 05:46

0xc0170 added needs: CI and removed needs: work labels Mar 22, 2019

mmahadevan108 approved these changes Mar 23, 2019

View reviewed changes

andrewc-arm approved these changes Mar 26, 2019

View reviewed changes

cmonr added the needs: preceding PR label Mar 26, 2019

Michael Schwarcz and others added 4 commits March 26, 2019 09:52

Remove dependency on us_ticker HAL apis for non USTICKER targets

568feaf

- Surround mbed_us_ticker_api.c with if DEVICE_USTICKER - get_us_ticker_data() returns NULL for non-usticker targets.

Add USTICKER to ARCH_PRO target

3ea2161

Add USTICKER to more targets

0e73a83

- LPC4088 - LPC4088_DM - MAX32600MBED - NCS36510 - WIZWIKI_W7500 - WIZWIKI_W7500ECO - WIZWIKI_W7500P

LPC targets: Compile us_ticker.c only if USTICKER defined

a91f17e

cmonr added ready for merge and removed needs: CI needs: preceding PR labels Mar 26, 2019

cmonr pushed a commit to cmonr/mbed-os that referenced this pull request Mar 26, 2019

Merge pull request ARMmbed#10155 from kfnta/us_ticker

1adbc26

Remove dependency on us_ticker HAL apis for non USTICKER targets

cmonr merged commit fcf4999 into ARMmbed:master Mar 27, 2019

cmonr removed the ready for merge label Mar 27, 2019

mikisch81 deleted the us_ticker branch March 27, 2019 07:19

Remove dependency on us_ticker HAL apis for non USTICKER targets #10155

Remove dependency on us_ticker HAL apis for non USTICKER targets #10155

Uh oh!

Conversation

mikisch81 commented Mar 19, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Pull request type

Reviewers

Release Notes

Uh oh!

mikisch81 commented Mar 20, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mikisch81 commented Mar 20, 2019

Uh oh!

mikisch81 commented Mar 20, 2019

Uh oh!

cmonr commented Mar 20, 2019

Uh oh!

mbed-ci commented Mar 20, 2019

Test run: FAILED

Uh oh!

0xc0170 commented Mar 21, 2019

Uh oh!

0xc0170 commented Mar 21, 2019

Uh oh!

mikisch81 commented Mar 21, 2019

Uh oh!

mikisch81 commented Mar 21, 2019

Uh oh!

0xc0170 commented Mar 22, 2019

Uh oh!

mikisch81 commented Mar 22, 2019

Uh oh!

NirSonnenschein commented Mar 24, 2019

Uh oh!

mbed-ci commented Mar 24, 2019

Test run: FAILED

Uh oh!

mikisch81 commented Mar 24, 2019

Uh oh!

mikisch81 commented Mar 24, 2019

Uh oh!

mikisch81 commented Mar 24, 2019

Uh oh!

NirSonnenschein commented Mar 25, 2019

Uh oh!

mbed-ci commented Mar 25, 2019

Test run: FAILED

Uh oh!

alekla01 commented Mar 25, 2019

Uh oh!

mikisch81 commented Mar 25, 2019

Uh oh!

mikisch81 commented Mar 25, 2019

Uh oh!

mikisch81 commented Mar 25, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cmonr commented Mar 25, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mikisch81 commented Mar 25, 2019

Uh oh!

cmonr commented Mar 26, 2019

Uh oh!

mikisch81 commented Mar 26, 2019

Uh oh!

NirSonnenschein commented Mar 26, 2019

Uh oh!

mbed-ci commented Mar 26, 2019

Test run: SUCCESS

Uh oh!

mikisch81 commented Mar 26, 2019

Uh oh!

NirSonnenschein commented Mar 26, 2019

Uh oh!

Uh oh!

mikisch81 commented Mar 19, 2019 •

edited

Loading

mikisch81 commented Mar 20, 2019 •

edited

Loading

mikisch81 commented Mar 25, 2019 •

edited

Loading

cmonr commented Mar 25, 2019 •

edited

Loading