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

Wi-Fi upmerge for 2.8.0 #2142

Merged
merged 124 commits into from
Oct 25, 2024
Merged

Wi-Fi upmerge for 2.8.0 #2142

merged 124 commits into from
Oct 25, 2024

Conversation

krish2718
Copy link
Contributor

This cherry-picks all Wi-Fi fixes (Boards, drivers and hostap) for 2.8.0 release.

@NordicBuilder
Copy link
Contributor

NordicBuilder commented Oct 21, 2024

The following west manifest projects have been modified in this Pull Request:

Name Old Revision New Revision Diff
hal_nordic zephyrproject-rtos/hal_nordic@bc25c09 zephyrproject-rtos/hal_nordic@cb7600a (master) zephyrproject-rtos/hal_nordic@bc25c094..cb7600a1
hostap zephyrproject-rtos/hostap@9896a2e zephyrproject-rtos/hostap@4428531 zephyrproject-rtos/hostap@9896a2ea..44285310

Note: This message is automatically posted and updated by the Manifest GitHub Action.

jukkar and others added 12 commits October 24, 2024 22:13
If CONFIG_WIFI_NM_WPA_SUPPLICANT_CRYPTO_NONE is enabled, there
are lot of missing functions reported during linking.
Add missing C files to the compilation to fix this.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 980a352)
Both the supplicant_set_btwt() and supplicant_ap_bandwidth() are
not found in Zephyr sources so remove them.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 6ac4e9c)
The "enum wpa_msg_type" was not found by default so add needed
include files to get the definitions.

modules/hostap/src/supp_main.h:61:57: warning: ‘enum wpa_msg_type’
   declared inside parameter list will not be visible outside of
   this definition or declaration
   61 | void wpa_supplicant_msg_send(void *ctx, int level,
                                     enum wpa_msg_type type,
                                     const char *txt,

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit c9b8365)
Even if the enum contains the same values, the values might
change if the wpa_supplicant sources change or Zephyr values
change. In order to avoid weird errors later and prevent the
following warning, add a conversion functions for the enums.

modules/hostap/src/supp_api.c:1172:23: warning: implicit conversion
from enumeration type 'enum mfp_options' to different enumeration
type 'enum wifi_mfp_options' [-Wenum-conversion]
                status->mfp = ssid->ieee80211w; /* Same mapping */

modules/hostap/src/supp_api.c:1190:30: warning: implicit conversion
from enumeration type 'enum wpas_mode' to different enumeration
type 'enum wifi_iface_mode' [-Wenum-conversion]
                status->iface_mode = ssid->mode;

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit ec21dab)
…mbinations

Try to compile test wifi with various configuration combinations.
This is trying to catch simple compilation issues in the PRs.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 3f8828d)
This is related to work on #79973 which creates build tests
for hostap with different configurations.

Signed-off-by: Jukka Rissanen <jukka.rissanen@nordicsemi.no>
(cherry picked from commit 3cf8b09)
…imeout

WPA control interface timeout is hardcoded to 10s, add a configuration
option to remove the hardcode, this is needed sometimes as a workaround
e.g., crypto taking too long to complete the request.

Work around for #79834, increase the default from 10 to 15s, in positive
case this will have no impact.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 78f5821)
Execute certificate headers creation rules only if Wi-Fi Enterprise mode
is enabled.

Upstream PR: zephyrproject-rtos/zephyr#80212

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
Few build errors due to bugs in previous commits.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit f6b60bd)
The defines should explicitly be passed to nordic HAL as they dont' use
the CONFIG_ prefix.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit 3098c48)
Missed adding CONFIG_ to the configuration option.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
(cherry picked from commit f840f66)
When debug is disabled, seeing a build error for unused variable.

Upstream PR: zephyrproject-rtos/zephyr#80315

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
@krish2718 krish2718 force-pushed the wifi_upmerge branch 2 times, most recently from 1c70ed9 to 8a44627 Compare October 24, 2024 17:05
rado17 and others added 9 commits October 25, 2024 01:30
Support Wi-Fi enterprise mode with NRF_SECURITY.

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
Enable wifi sample to connect in EAP-TLS mode. Create sample
certificates.

Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
This brings in PSA Kconfig and CMakelist.txt changes to NCS.
Currently, it contains known PSA configurations and source files
that are needed or will be needed in the future. WPA3 and
Enterprise is currently disabled with this setting.

Signed-off-by: Vivekananda Uppunda <vivekananda.uppunda@nordicsemi.no>
Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Make sure Wi-Fi driver is enabled when sysbuild is used. For shields we
cannot automate this, as sysbuild doesn't recognize shields, so, Wi-Fi
has to be explicitly enabled, this is done for twister.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Build throw macro redefined error as it's already defined by the nRF
security module.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
The file has been removed upstream, but as upstream doesn't have NS
support, this need to be fixed explicitly.

Upstream PR: zephyrproject-rtos/zephyr#79606

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
NS builds need to use PSA for entropy same as 54L.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Upstream certificates are RSA3K + Suite-B, they are not support yet on
nRF boards, so, generate a new certificate for both phase1 and phase2
and use them.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
Signed-off-by: Ravi Dondaputi <ravi.dondaputi@nordicsemi.no>
For 54H Legacy mode is broken, so, enable PSA at the cost of supporting
WPA2 only.

Signed-off-by: Chaitanya Tata <Chaitanya.Tata@nordicsemi.no>
@rlubos rlubos force-pushed the wifi_upmerge branch 2 times, most recently from 999f721 to d8ba4d2 Compare October 25, 2024 11:38
@krish2718 krish2718 added the backport v3.7.99-ncs1-branch Relates to NCS v2.8-branch label Oct 25, 2024
@rlubos rlubos merged commit 33919fc into nrfconnect:main Oct 25, 2024
35 checks passed
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.