COMPONENT_WHD: make reusable code available for other targets #14471

pennam · 2021-03-25T11:14:50Z

Summary of changes

PORTENTA_H7 makes use of COMPONENT_WHD for Wi-Fi implementation, so instead of duplicating the code inside our target we propose to make reusable code available for the other. Big part of the changes are folder movements and CMake paths fix.

All commits containing code changes are prefixed with Patch.

Resuming the changes of this pr:
Moved connectivity/drivers/emac/TARGET_Cypress/COMPONENT_WHD to connectivity/drivers/emac/COMPONENT_WHD
Moved targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD to
connectivity/drivers/wifi/COMPONENT_WHD
Moved targets/TARGET_Cypress/TARGET_PSOC6/common/COMPONENT_WHD to connectivity/drivers/wifi/COMPONENT_WHD/common
Split connectivity/drivers/wifi/COMPONENT_WHD/resources/firmware and connectivity/drivers/wifi/COMPONENT_WHD/resources/nvram for TARGET_Cypress and TARGET_STM
Add the interface and porting layer for PORTENTA_H7 into targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/COMPONENT_WHD

The code inside targets/TARGET_STM/TARGET_STM32H7/TARGET_STM32H747xI/TARGET_PORTENTA_H7/COMPONENT_WHD/interface is Cypress code without changes, but i didn't find a better place to move it; theoretically it can also be shared and not duplicated.

/cc @facchinm

Impact of changes

All Cypress targets using COMPONENT_WHD and PORTENTA_H7_M7

Migration actions required

Documentation

Pull request type

[x] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results

Attached test results for PORTENTA_H7_M7 target
all-test-whd.txt
wifi.txt

CMake build of mbed-os-example-blinky for PORTENTA_H7_M7 and CY8CPROTO_062_4343W
mbed-os-example-blinky-cmake-portenta.txt
mbed-os-example-blinky-cmake-cy8.txt

[] No Tests required for this change (E.g docs only update)
[] Covered by existing mbed-os tests (Greentea or Unittest)
[x] Tests / results supplied as part of this PR

Reviewers

ciarmcom · 2021-03-25T11:30:22Z

@pennam, thank you for your changes.
@ARMmbed/mbed-os-maintainers please review.

connectivity/drivers/wifi/COMPONENT_WHD/CMakeLists.txt

...ifi/COMPONENT_WHD/resources/nvram/TARGET_Cypress/TARGET_CY8CKIT_062_4343W/wifi_nvram_image.h

.../drivers/wifi/COMPONENT_WHD/resources/nvram/TARGET_STM/TARGET_PORTENTA_H7/wifi_nvram_image.h

connectivity/drivers/wifi/COMPONENT_WHD/resources/resource_imp/whd_resources.cpp

Pull request has been modified.

pennam · 2021-04-07T06:40:37Z

@ifyall I've a more general question about this pull request since 30f6f23 is not the only change we have made to files inside COMPONENT_WHD.

Is it ok the idea to move COMPONENT_WHD folder outside TARGET_Cypress to let other target reuse it?
none of the files inside COMPONENT_WHD can be changed? To have an idea of the other changes we have made, please have a look at this commits: 30ab61c 2c438da 62d05bb cb2dc79 ad81bac a97889f 3c8e8a1

ifyall · 2021-04-12T18:00:46Z

@pennam,

Files in targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD come from releases of https://github.com/cypresssemiconductorco/wifi-host-driver without modification. Any changes made in targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD will get overridden the next time a wifi-host-driver release is integrated.

The following commits are OK because they are making changes outside of TARGET_PSOC6, specifically in connectivity/drivers/emac/COMPONENT_WHD/:
30ab61c
62d05bb

The NVRAM change that I originally commented on and the rest of the commits you highlighted are changes in the wifi-host-driver and will not be compatible with future releases.

Ian

pennam · 2021-04-13T07:15:41Z

@ifyall Thanks for your clarification.

What about splitting the the content of targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD in two parts leaving the resource subfolder in it and moving the src and inc subfolders into connectivity/drivers/wifi/COMPONENT_WHD without any change?

This will let use completely reuse the code inside this folder and automatically benefit of the future updates of the WHD leaving the possibility to integrate newer versions of the WHD without changing the code.

Doing this all this patches will be moved into our target folder: 54d519b ec277fe 3c8e8a1 a97889f ad81bac 2c438da

This will be fixed restoring the original resource content: 30f6f23

One last question about cb2dc79 and f2e2a15 It seems that the content of targets/TARGET_Cypress/TARGET_PSOC6/common/COMPONENT_WHD is not coming from here https://github.com/cypresssemiconductorco/wifi-host-driver. I can revert this two changes leaving the code as is, but i want to make sure is it ok to move also this folder into connectivity/drivers/wifi/COMPONENT_WHD/common

mergify · 2021-05-04T09:05:53Z

This PR cannot be merged due to conflicts. Please rebase to resolve them.

pennam · 2021-05-04T09:31:26Z

@ifyall i've reworked the pr.

Now the only changes to the source code are the one already approved. See abb6dc2 and 323b3d6. As mentioned in my previous comment i've splitted the COMPONENT_WHD folder in two parts inc and src folders were moved into connectivity/drivers/wifi/COMPONENT_WHD and resource folder stays in targets/TARGET_Cypress/COMPONENT_WHD.

To update to a new version of WHD drivers there is no need to apply any patch, only the destination folder is different.

I've also moved the targets/TARGET_Cypress/TARGET_PSOC6/common/COMPONENT_WHD folder into connectivity/drivers/wifi/COMPONENT_WHD/network

ifyall · 2021-05-06T00:18:40Z

@pennam,

Thank you for continuing the work. Regarding the changes, you are still breaking apart the COMPONENT_WHD, leaving some pieces of it in one directory and other pieces in another. We can't break that apart, because the directories/files under https://github.com/ARMmbed/mbed-os/tree/master/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD come from https://github.com/cypresssemiconductorco/wifi-host-driver/tree/master/WiFi_Host_Driver.

Can you just move https://github.com/ARMmbed/mbed-os/tree/master/targets/TARGET_Cypress/TARGET_PSOC6/COMPONENT_WHD to connectivity/drivers/wifi/COMPONENT_WHD/ without modification?

Addition of the network contents would be optional, but OK.

Ian

…nectivity/drivers/wifi/COMPONENT_WHD/network

pennam · 2021-05-18T15:48:21Z

Thanks for the hint @0xc0170 , i wasn't aware of the .codecheckignore file

ciarmcom · 2021-05-21T15:51:15Z

This pull request has automatically been marked as stale because it has had no recent activity. @ARMmbed/Team-Cypress, please complete review of the changes to move the PR forward. Thank you for your contributions.

ifyall

Now that the COMPONENT_WHD directory is common between master and this PR (with the exception of the network/ directory), I am OK approving this.

ciarmcom · 2021-05-27T23:51:30Z

This pull request has automatically been marked as stale because it has had no recent activity. , please complete review of the changes to move the PR forward. Thank you for your contributions.

0xc0170 · 2021-05-31T12:31:16Z

CI started

mbed-ci · 2021-05-31T13:12:28Z

Jenkins CI Test : ✔️ SUCCESS

Build Number: 1 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs	Status
jenkins-ci/mbed-os-ci_unittests	✔️
jenkins-ci/mbed-os-ci_build-cloud-example-ARM	✔️
jenkins-ci/mbed-os-ci_cmake-cloud-example-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_build-cloud-example-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_build-greentea-ARM	✔️
jenkins-ci/mbed-os-ci_cmake-example-ARM	✔️
jenkins-ci/mbed-os-ci_cmake-cloud-example-ARM	✔️
jenkins-ci/mbed-os-ci_cmake-example-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_build-greentea-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_build-example-GCC_ARM	✔️
jenkins-ci/mbed-os-ci_build-example-ARM	✔️
jenkins-ci/mbed-os-ci_greentea-test	✔️

ciarmcom added the release-type: patch Indentifies a PR as containing just a patch label Mar 25, 2021

ciarmcom requested a review from a team March 25, 2021 11:30

ciarmcom added needs: review component: connectivity devices: st devices: cypress labels Mar 25, 2021

0xc0170 requested a review from a team April 6, 2021 12:50

0xc0170 previously requested changes Apr 6, 2021

View reviewed changes

mergify bot added needs: work and removed needs: review labels Apr 6, 2021

pennam force-pushed the whd_patch branch from 4e96735 to f4e2697 Compare May 4, 2021 09:05

pennam force-pushed the whd_patch branch from f4e2697 to 323b3d6 Compare May 4, 2021 09:06

facchinm and others added 5 commits May 6, 2021 14:44

WHD EMAC moved out of TARGET_Cypress

ead29d6

CMake add COMPONENT_WHD in emac

0db6218

CMake remove COMPONENT_WHD from emac/TARGET_Cypress

7cdf974

Patch add rtos namespace

ebbbcab

Patch add #include "cy_utlis.h"

9686fb6

pennam force-pushed the whd_patch branch from 323b3d6 to c9ff6ee Compare May 6, 2021 13:37

pennam added 4 commits May 6, 2021 15:39

COMPONENT_WHD moved into connectivity/drivers/wifi

a29ca07

CMake add COMPONENT_WHD folder

6a4fd9d

CMake remove COMPONENT_WHD from TARGET_Cypress

f26771f

Moved targets/TARGET_Cypress/TARGET_PSOC6/common/COMPONENT_WHD in con…

665c83b

…nectivity/drivers/wifi/COMPONENT_WHD/network

0xc0170 added the needs: review label May 18, 2021

Add connectivity/drivers/wifi/COMPONENT_WHD to ignore list

f36c404

ciarmcom added the stale Stale Pull Request label May 21, 2021

ciarmcom added stale Stale Pull Request and removed stale Stale Pull Request labels May 21, 2021

ifyall approved these changes May 24, 2021

View reviewed changes

ciarmcom added stale Stale Pull Request and removed stale Stale Pull Request labels May 24, 2021

ciarmcom added stale Stale Pull Request and removed stale Stale Pull Request labels May 28, 2021

0xc0170 removed the stale Stale Pull Request label May 31, 2021

0xc0170 self-requested a review May 31, 2021 12:23

0xc0170 approved these changes May 31, 2021

View reviewed changes

mergify bot added needs: CI and removed needs: review labels May 31, 2021

mergify bot added ready for merge and removed needs: CI labels May 31, 2021

0xc0170 merged commit bfedc39 into ARMmbed:master May 31, 2021

mergify bot removed the ready for merge label May 31, 2021

dustin-crossman mentioned this pull request Jun 17, 2021

Cypress Asset Update #14787

Merged

mbedmain added release-version: 6.12.0 Release-pending and removed release-type: patch Indentifies a PR as containing just a patch Release-pending labels Jun 18, 2021

pennam mentioned this pull request Nov 9, 2021

PORTENTA_H7: CYW4343X add WHD driver arduino/mbed-os#8

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

COMPONENT_WHD: make reusable code available for other targets #14471

COMPONENT_WHD: make reusable code available for other targets #14471

pennam commented Mar 25, 2021

ciarmcom commented Mar 25, 2021

pennam commented Apr 7, 2021

ifyall commented Apr 12, 2021

pennam commented Apr 13, 2021

mergify bot commented May 4, 2021

pennam commented May 4, 2021

ifyall commented May 6, 2021

pennam commented May 18, 2021

ciarmcom commented May 21, 2021

ifyall left a comment

ciarmcom commented May 27, 2021

0xc0170 commented May 31, 2021

mbed-ci commented May 31, 2021

COMPONENT_WHD: make reusable code available for other targets #14471

COMPONENT_WHD: make reusable code available for other targets #14471

Conversation

pennam commented Mar 25, 2021

Summary of changes

Impact of changes

Migration actions required

Documentation

Pull request type

Test results

Reviewers

ciarmcom commented Mar 25, 2021

pennam commented Apr 7, 2021

ifyall commented Apr 12, 2021

pennam commented Apr 13, 2021

mergify bot commented May 4, 2021

pennam commented May 4, 2021

ifyall commented May 6, 2021

pennam commented May 18, 2021

ciarmcom commented May 21, 2021

ifyall left a comment

Choose a reason for hiding this comment

ciarmcom commented May 27, 2021

0xc0170 commented May 31, 2021

mbed-ci commented May 31, 2021

Jenkins CI Test : ✔️ SUCCESS

Build Number: 1 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts