Merge feature-emac branch into master #6847

kjbracey · 2018-05-09T07:26:27Z

Description

Bring in the new EMAC network driver subsystem from the feature-emac branch. Primary PRs for work on that branch were #5558 and #5750.

Aside from EMAC-related work, also incorporates Non-blocking DNS (#6751) and default network interface support (#6855).

Full list of PRs on that branch: https://github.com/ARMmbed/mbed-os/pulls?q=is%3Apr+base%3Afeature-emac+is%3Aclosed

When this is merged, support for existing native lwIP and old-style emac drivers will be lost - only updated drivers will remain supported. Platforms losing existing drivers are:

ARM_CM3DS_MPS2
LPCTarget (LPC1768 family)
* RZ_A1XX

Some test reconfiguration will be required to get this all green, both to adjust setup and in case any platforms losing Ethernet support due to lack of driver update.

Pull request type

[ ] Fix
[X] Refactor
[ ] New target
[ ] Feature
[ ] Breaking change

cmonr · 2018-05-14T16:10:41Z

@kjbracey-arm Is the goal to bring this in for 5.9?

kjbracey · 2018-05-15T07:22:36Z

@cmonr - yes, the aim is to get this in this week for 5.9

kjbracey · 2018-05-17T07:51:50Z

/morph build

mbed-ci · 2018-05-17T09:41:07Z

Build : SUCCESS

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

Triggering tests

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

mbed-ci · 2018-05-17T10:57:56Z

Test : FAILURE

Build number : 1855
Test logs :http://mbed-os-logs.s3-website-us-west-1.amazonaws.com/?prefix=logs/6847/1855

mbed-ci · 2018-05-17T12:01:30Z

Exporter Build : FAILURE

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

cmonr · 2018-05-17T15:14:48Z

Making a note here that this will need a PR for its example as well as a handbook PR for documentation, if not already available.

geky · 2018-05-21T16:10:47Z

@kjbracey-arm, it looks like the mbed 2 compilation test in events is trying to compile the features/network folder without the tracing folder. Should this list be updated?
https://github.com/ARMmbed/mbed-os/blob/master/.travis.yml#L153

Can we just remove the entire features folder for the test?

cmonr · 2018-05-21T16:17:34Z

@kjbracey-arm Also, take a look at the pr-head build. If you don't have access or need help navigating the Jenkins links, let us know.

The error(s):

[UBLOX_EVK_ODIN_W2_arm-none-eabi-gcc_wlan0] ./mbed-os/targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F439xI/TARGET_MODULE_UBLOX_ODIN_W2/sdk/TOOLCHAIN_GCC_ARM/libublox-odin-w2-driver.a(OdinWiFiInterface.o):(.rodata._ZTC17OdinWiFiInterface4_13EMACInterface+0x110): undefined reference to virtual thunk to EMACInterface::get_mac_address()

kegilbert · 2018-05-21T20:54:36Z

Besides the current merge conflicts/CI errors was there anything in particular you'd like me to review? A (very) quick skim from a code perspective looks good to me.

Initial work by Bartek Szatkowski in #4079, reworked following review of #5202 to transform the entire system into C++, retaining the basic functionality. Bartek's summary: * Porting ethernet to EMAC * Updating EMAC to enable multiple interfaces * Untangling networking classes, making the abstractions a bit clearer to follow, etc * General refactoring * Removal of DEVICE_EMAC flag and introducing DEVICE_ETH and DEVICE_WIFI Revisions since initial branch: * Remove lwip depencies * Correct doxygen warnings * Remove emac_api.h, replace with C++ EMAC abstract class. * Create OnboardNetworkInterface, and LWIP implementation. * Mappings since #4079 lwip-interface/nsapi_stack_lwip.c -> LWIPStack.cpp lwip-interface/ipstack_lwip.c -> LWIPInterface.cpp netsocket/mbed_ipstack.h -> OnboardNetworkStack.h hal/emac_api.h -> EMAC.h * Reinstate use of EthInterface abstraction * Correct and clarify HW address EMAC ops * Restore MBED_MAC_ADDR implementation * Integrate PPP support with LWIP::Interface. * Convert K64F lwIP driver to K64F_EMAC. To do: * Convert emac_stack_mem.h to follow this pattern. * Figure out DEVICE_ETH/EMAC * Update all drivers to use EMAC

Rather than let "EthernetInterface" be the base EMAC NetworkInterface, insert an "EMACInterface" class. EthernetInterface then derives from EMACInterface and EthInterface. A Wi-Fi driver can derive from EMACInterface and WiFiInterface - this will be more logical than deriving from EthernetInterface and WiFiInterface. This does mean adding a couple of virtual inheritances to avoid duplicate NetworkInterfaces: NetworkInterface / \ virtual / \ virtual / \ EMACInterface WiFiInterface \ / \ / \ / MyCustomWiFiInterface

This has been superceded by CellularBase. Name change occurred late in review of #4119 and original unused CellularInterface was left behind.

kjbracey · 2018-05-22T08:48:05Z

GitHub display went weird - rebased feature-emac to clear it up. Shouldn't cause a problem, as no open PRs to it.

hasnainvirk · 2018-05-22T10:10:22Z

features/netsocket/mbed_lib.json

-        "present": 1
+        "present": 1,
+        "default-stack": "LWIP",
+        "default-interface-type": {


This shouldn't be here. Seemingly, its added to targets.json already.

cmonr · 2018-05-23T14:59:10Z

Restarting pr-head. License checkout issue.

mbed-ci · 2018-05-23T15:23:06Z

Build : FAILURE

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

cmonr · 2018-05-23T15:27:41Z

@kjbracey-arm

"/tmp/d2gAAH", line 124 (column 3): Warning: L6312W: Empty Execution region description for region RW_IRAM1
Error: L6218E: Undefined symbol OnboardNetworkStack::get_default_instance() (referred from BUILD/K64F/ARM/mbed-os/features/netsocket/EthernetInterface.o).
Finished: 0 information, 3 warning and 1 error messages.

This is with the K64F nanostack-border-router example

kjbracey · 2018-05-23T15:37:37Z

Okay, just going to have to kill the border router test again. Root cause here is that you can't have DEVICE_EMAC enabled on an ARMCC build if you don't have a default network stack.

Border router app is not touching the network stack setting, so it's LWIP, but it's removing FEATURE_LWIP, so left with no default stack. We can't fix this up until after the PR is merged, when it can switch the default network stack to Nanostack.

Remove check for LWIP - check target flagging for EMAC drivers. Should still be DEVICE_EMAC, but tooling doesn't support that.

kjbracey · 2018-05-23T15:43:18Z

/morph build

mbed-ci · 2018-05-23T17:49:44Z

Build : SUCCESS

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

Triggering tests

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

mbed-ci · 2018-05-23T21:04:36Z

Test : FAILURE

Build number : 1920
Test logs :http://mbed-os-logs.s3-website-us-west-1.amazonaws.com/?prefix=logs/6847/1920

mbed-ci · 2018-05-23T23:36:27Z

Exporter Build : SUCCESS

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

cmonr · 2018-05-24T01:02:57Z

@kjbracey-arm Good news and bad news.

The bad news is that this hit a test issue that is in the process of being resolved here: #6993

The good news is that after a rebase once that PR is in, it looks like CI should pass!

0xc0170 · 2018-05-24T07:47:44Z

/morph build

mbed-ci · 2018-05-24T08:56:11Z

Build : SUCCESS

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

Triggering tests

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

mbed-ci · 2018-05-24T12:22:56Z

Test : SUCCESS

Build number : 1930
Test logs :http://mbed-os-logs.s3-website-us-west-1.amazonaws.com/?prefix=logs/6847/1930

mbed-ci · 2018-05-24T13:38:38Z

Exporter Build : SUCCESS

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

mbed-ci · 2018-05-25T12:57:38Z

Exporter Build : FAILURE

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

kjbracey added do not merge needs: work labels May 9, 2018

kjbracey added the release-version: 5.9.0-rc1 label May 15, 2018

cmonr added the needs: preceding PR label May 17, 2018

cmonr requested review from kegilbert and hasnainvirk May 21, 2018 16:04

SeppoTakalo previously approved these changes May 22, 2018

View reviewed changes

kjbracey added needs: review and removed do not merge needs: preceding PR needs: work labels May 22, 2018

kjbracey requested review from geky, AnttiKauppila and 0xc0170 May 22, 2018 08:37

kjbracey added 3 commits May 22, 2018 11:44

Remove CellularInterface

6dffe6e

This has been superceded by CellularBase. Name change occurred late in review of #4119 and original unused CellularInterface was left behind.

kjbracey force-pushed the feature-emac branch from 5e68b15 to 3eb270b Compare May 22, 2018 08:46

hasnainvirk reviewed May 22, 2018

View reviewed changes

Refill example lists - all current Ethernet boards

ff32b28

Remove check for LWIP - check target flagging for EMAC drivers. Should still be DEVICE_EMAC, but tooling doesn't support that.

kjbracey force-pushed the feature-emac branch from 27605d3 to ff32b28 Compare May 23, 2018 15:40

SeppoTakalo approved these changes May 23, 2018

View reviewed changes

cmonr added needs: CI and removed needs: review labels May 23, 2018

cmonr mentioned this pull request May 23, 2018

CPU Statistics #6857

Merged

AnttiKauppila approved these changes May 24, 2018

View reviewed changes

hasnainvirk approved these changes May 24, 2018

View reviewed changes

SeppoTakalo approved these changes May 24, 2018

View reviewed changes

0xc0170 approved these changes May 24, 2018

View reviewed changes

0xc0170 added ready for merge and removed needs: CI labels May 24, 2018

kjbracey merged commit 13dcef6 into master May 24, 2018

sg- removed the ready for merge label May 24, 2018

kjbracey deleted the feature-emac branch May 24, 2018 13:47

mikaleppanen mentioned this pull request May 25, 2018

Corrected asynchronous DNS functionality #7016

Merged

Merge feature-emac branch into master #6847

Merge feature-emac branch into master #6847

Uh oh!

Conversation

kjbracey commented May 9, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Pull request type

Uh oh!

cmonr commented May 14, 2018

Uh oh!

kjbracey commented May 15, 2018

Uh oh!

kjbracey commented May 17, 2018

Uh oh!

mbed-ci commented May 17, 2018

Triggering tests

Uh oh!

mbed-ci commented May 17, 2018

Uh oh!

mbed-ci commented May 17, 2018

Uh oh!

cmonr commented May 17, 2018

Uh oh!

geky commented May 21, 2018

Uh oh!

cmonr commented May 21, 2018

Uh oh!

kegilbert commented May 21, 2018

Uh oh!

kjbracey commented May 22, 2018

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cmonr commented May 23, 2018

Uh oh!

mbed-ci commented May 23, 2018

Uh oh!

cmonr commented May 23, 2018

Uh oh!

kjbracey commented May 23, 2018

Uh oh!

kjbracey commented May 23, 2018

Uh oh!

mbed-ci commented May 23, 2018

Triggering tests

Uh oh!

mbed-ci commented May 23, 2018

Uh oh!

mbed-ci commented May 23, 2018

Uh oh!

cmonr commented May 24, 2018

Uh oh!

0xc0170 commented May 24, 2018

Uh oh!

mbed-ci commented May 24, 2018

Triggering tests

Uh oh!

mbed-ci commented May 24, 2018

Uh oh!

mbed-ci commented May 24, 2018

Uh oh!

mbed-ci commented May 25, 2018

Uh oh!

Uh oh!

kjbracey commented May 9, 2018 •

edited

Loading