From 7ca5c7dcb60993310316224725e3812d6b55bc1f Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Wed, 16 Oct 2024 23:39:40 +0530 Subject: [PATCH 1/8] [nrf fromtree] drivers: nrfwifi: Fix regulatory domain regression Recent WPA supplicant changes have broken nRF regulatory support, implement the new set/get country WPA supplicant ops. WPA supplicant: Regulatory SET through WPA supplicant, GET is direct to the driver Scan only: SET and GET direct calls to the driver Fixes #79916. Signed-off-by: Chaitanya Tata (cherry picked from commit 2ea25ea238e0cdb2d948f59bf24fa3a26bfd7f4b) (cherry picked from commit 50ee9cb026be0c60e16e2edafdf8fd1ed2a95d70) --- drivers/wifi/nrfwifi/inc/wpa_supp_if.h | 2 + drivers/wifi/nrfwifi/src/fmac_main.c | 77 +++++++++++--------------- drivers/wifi/nrfwifi/src/wpa_supp_if.c | 73 ++++++++++++++++++++++++ 3 files changed, 106 insertions(+), 46 deletions(-) diff --git a/drivers/wifi/nrfwifi/inc/wpa_supp_if.h b/drivers/wifi/nrfwifi/inc/wpa_supp_if.h index 06a13261a70..c543644e312 100644 --- a/drivers/wifi/nrfwifi/inc/wpa_supp_if.h +++ b/drivers/wifi/nrfwifi/inc/wpa_supp_if.h @@ -123,6 +123,8 @@ int nrf_wifi_supp_get_conn_info(void *if_priv, struct wpa_conn_info *info); void nrf_wifi_supp_event_proc_get_conn_info(void *os_vif_ctx, struct nrf_wifi_umac_event_conn_info *info, unsigned int event_len); +int nrf_wifi_supp_set_country(void *if_priv, const char *alpha2); +int nrf_wifi_supp_get_country(void *if_priv, char *alpha2); #endif /* CONFIG_NRF70_STA_MODE */ #ifdef CONFIG_NRF70_AP_MODE diff --git a/drivers/wifi/nrfwifi/src/fmac_main.c b/drivers/wifi/nrfwifi/src/fmac_main.c index f2f7ba41340..eb67e156800 100644 --- a/drivers/wifi/nrfwifi/src/fmac_main.c +++ b/drivers/wifi/nrfwifi/src/fmac_main.c @@ -343,28 +343,8 @@ int nrf_wifi_reg_domain(const struct device *dev, struct wifi_reg_domain *reg_do goto err; } +#ifdef CONFIG_NRF70_SCAN_ONLY if (reg_domain->oper == WIFI_MGMT_SET) { -#ifndef CONFIG_NRF70_RADIO_TEST -#ifdef CONFIG_NRF70_STA_MODE - /* Need to check if WPA supplicant is initialized or not. - * Must be checked when CONFIG_WIFI_NM_WPA_SUPPLICANT is enabled. - * Not applicable for RADIO_TEST or when - * CONFIG_WIFI_NM_WPA_SUPPLICANT is not enabled. - */ - /* It is possbile that during supplicant initialization driver may - * get the command. lock will try to ensure that supplicant - * initialization is complete. - */ - k_mutex_lock(&vif_ctx_zep->vif_lock, K_FOREVER); - if ((!vif_ctx_zep->supp_drv_if_ctx) || - (!wifi_nm_get_instance_iface(vif_ctx_zep->zep_net_if_ctx))) { - LOG_ERR("%s: WPA supplicant initialization not complete yet", __func__); - k_mutex_unlock(&vif_ctx_zep->vif_lock); - goto err; - } - k_mutex_unlock(&vif_ctx_zep->vif_lock); -#endif /* CONFIG_NRF70_STA_MODE */ -#endif /* !CONFIG_NRF70_RADIO_TEST */ memcpy(reg_domain_info.alpha2, reg_domain->country_code, WIFI_COUNTRY_CODE_LEN); reg_domain_info.force = reg_domain->force; @@ -374,36 +354,39 @@ int nrf_wifi_reg_domain(const struct device *dev, struct wifi_reg_domain *reg_do LOG_ERR("%s: Failed to set regulatory domain", __func__); goto err; } - } else if (reg_domain->oper == WIFI_MGMT_GET) { - if (!reg_domain->chan_info) { - LOG_ERR("%s: Invalid regulatory info (NULL)\n", __func__); - goto err; - } + goto err; + } +#endif + if (reg_domain->oper != WIFI_MGMT_GET) { + LOG_ERR("%s: Invalid operation: %d", __func__, reg_domain->oper); + goto err; + } - status = nrf_wifi_fmac_get_reg(fmac_dev_ctx, ®_domain_info); - if (status != NRF_WIFI_STATUS_SUCCESS) { - LOG_ERR("%s: Failed to get regulatory domain", __func__); - goto err; - } + if (!reg_domain->chan_info) { + LOG_ERR("%s: Invalid regulatory info (NULL)\n", __func__); + goto err; + } - memcpy(reg_domain->country_code, reg_domain_info.alpha2, WIFI_COUNTRY_CODE_LEN); - reg_domain->num_channels = reg_domain_info.reg_chan_count; - - for (chan_idx = 0; chan_idx < reg_domain_info.reg_chan_count; chan_idx++) { - chan_info = &(reg_domain->chan_info[chan_idx]); - reg_domain_chan_info = &(reg_domain_info.reg_chan_info[chan_idx]); - chan_info->center_frequency = reg_domain_chan_info->center_frequency; - chan_info->dfs = !!reg_domain_chan_info->dfs; - chan_info->max_power = reg_domain_chan_info->max_power; - chan_info->passive_only = !!reg_domain_chan_info->passive_channel; - chan_info->supported = !!reg_domain_chan_info->supported; - } - } else { - LOG_ERR("%s: Invalid operation: %d", __func__, reg_domain->oper); + status = nrf_wifi_fmac_get_reg(fmac_dev_ctx, ®_domain_info); + if (status != NRF_WIFI_STATUS_SUCCESS) { + LOG_ERR("%s: Failed to get regulatory domain", __func__); goto err; } + memcpy(reg_domain->country_code, reg_domain_info.alpha2, WIFI_COUNTRY_CODE_LEN); + reg_domain->num_channels = reg_domain_info.reg_chan_count; + + for (chan_idx = 0; chan_idx < reg_domain_info.reg_chan_count; chan_idx++) { + chan_info = &(reg_domain->chan_info[chan_idx]); + reg_domain_chan_info = &(reg_domain_info.reg_chan_info[chan_idx]); + chan_info->center_frequency = reg_domain_chan_info->center_frequency; + chan_info->dfs = !!reg_domain_chan_info->dfs; + chan_info->max_power = reg_domain_chan_info->max_power; + chan_info->passive_only = !!reg_domain_chan_info->passive_channel; + chan_info->supported = !!reg_domain_chan_info->supported; + } + ret = 0; err: k_mutex_unlock(®_lock); @@ -850,7 +833,7 @@ static struct wifi_mgmt_ops nrf_wifi_mgmt_ops = { .get_power_save_config = nrf_wifi_get_power_save_config, .set_rts_threshold = nrf_wifi_set_rts_threshold, .get_rts_threshold = nrf_wifi_get_rts_threshold, -#endif /* CONFIG_NRF70_STA_MODE */ +#endif #ifdef CONFIG_NRF70_SYSTEM_WITH_RAW_MODES .mode = nrf_wifi_mode, #endif @@ -883,6 +866,8 @@ static struct zep_wpa_supp_dev_ops wpa_supp_ops = { .register_frame = nrf_wifi_supp_register_frame, .get_capa = nrf_wifi_supp_get_capa, .get_conn_info = nrf_wifi_supp_get_conn_info, + .set_country = nrf_wifi_supp_set_country, + .get_country = nrf_wifi_supp_get_country, #ifdef CONFIG_NRF70_AP_MODE .init_ap = nrf_wifi_wpa_supp_init_ap, .start_ap = nrf_wifi_wpa_supp_start_ap, diff --git a/drivers/wifi/nrfwifi/src/wpa_supp_if.c b/drivers/wifi/nrfwifi/src/wpa_supp_if.c index b022c8d5af1..292c1b9117a 100644 --- a/drivers/wifi/nrfwifi/src/wpa_supp_if.c +++ b/drivers/wifi/nrfwifi/src/wpa_supp_if.c @@ -1861,6 +1861,79 @@ int nrf_wifi_supp_get_conn_info(void *if_priv, struct wpa_conn_info *info) return ret; } +int nrf_wifi_supp_set_country(void *if_priv, const char *alpha2) +{ + struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL; + struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL; + enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL; + struct nrf_wifi_fmac_reg_info reg_domain_info = {0}; + + if (!if_priv || !alpha2) { + LOG_ERR("%s: Invalid params", __func__); + return -1; + } + + vif_ctx_zep = if_priv; + rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep; + if (!rpu_ctx_zep) { + LOG_ERR("%s: rpu_ctx_zep is NULL", __func__); + return -1; + } + + k_mutex_lock(&vif_ctx_zep->vif_lock, K_FOREVER); + if (!rpu_ctx_zep->rpu_ctx) { + LOG_DBG("%s: RPU context not initialized", __func__); + goto out; + } + + memcpy(reg_domain_info.alpha2, alpha2, NRF_WIFI_COUNTRY_CODE_LEN); + + status = nrf_wifi_fmac_set_reg(rpu_ctx_zep->rpu_ctx, ®_domain_info); + if (status != NRF_WIFI_STATUS_SUCCESS) { + LOG_ERR("%s: nrf_wifi_fmac_set_reg failed", __func__); + goto out; + } +out: + k_mutex_unlock(&vif_ctx_zep->vif_lock); + return status; +} + +int nrf_wifi_supp_get_country(void *if_priv, char *alpha2) +{ + struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL; + struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL; + enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL; + struct nrf_wifi_fmac_reg_info reg_domain_info = {0}; + + if (!if_priv || !alpha2) { + LOG_ERR("%s: Invalid params", __func__); + return -1; + } + + vif_ctx_zep = if_priv; + rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep; + if (!rpu_ctx_zep) { + LOG_ERR("%s: rpu_ctx_zep is NULL", __func__); + return -1; + } + + k_mutex_lock(&vif_ctx_zep->vif_lock, K_FOREVER); + if (!rpu_ctx_zep->rpu_ctx) { + LOG_DBG("%s: RPU context not initialized", __func__); + goto out; + } + + status = nrf_wifi_fmac_get_reg(rpu_ctx_zep->rpu_ctx, ®_domain_info); + if (status != NRF_WIFI_STATUS_SUCCESS) { + LOG_ERR("%s: nrf_wifi_fmac_get_reg failed", __func__); + goto out; + } + + memcpy(alpha2, reg_domain_info.alpha2, NRF_WIFI_COUNTRY_CODE_LEN); +out: + k_mutex_unlock(&vif_ctx_zep->vif_lock); + return status; +} void nrf_wifi_supp_event_proc_get_conn_info(void *if_priv, struct nrf_wifi_umac_event_conn_info *info, From b7ce06fa4560e89a8b9740988d0d55e58c119a61 Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Thu, 17 Oct 2024 00:34:21 +0530 Subject: [PATCH 2/8] [nrf fromtree] drivers: nrfwifi: Fix label name The label is used for both positive and negative cases, so, should be called "out". Signed-off-by: Chaitanya Tata (cherry picked from commit 7d696f5b69f02909337699ac3828a2fbe4571923) (cherry picked from commit d0acfbdb4165a0755a5958d6f2f06752a67ee59e) --- drivers/wifi/nrfwifi/src/fmac_main.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/wifi/nrfwifi/src/fmac_main.c b/drivers/wifi/nrfwifi/src/fmac_main.c index eb67e156800..470be6c8055 100644 --- a/drivers/wifi/nrfwifi/src/fmac_main.c +++ b/drivers/wifi/nrfwifi/src/fmac_main.c @@ -320,27 +320,27 @@ int nrf_wifi_reg_domain(const struct device *dev, struct wifi_reg_domain *reg_do k_mutex_lock(®_lock, K_FOREVER); if (!dev || !reg_domain) { - goto err; + goto out; } vif_ctx_zep = dev->data; if (!vif_ctx_zep) { LOG_ERR("%s: vif_ctx_zep is NULL", __func__); - goto err; + goto out; } rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep; if (!rpu_ctx_zep) { LOG_ERR("%s: rpu_ctx_zep is NULL", __func__); - goto err; + goto out; } fmac_dev_ctx = rpu_ctx_zep->rpu_ctx; if (!fmac_dev_ctx) { LOG_ERR("%s: fmac_dev_ctx is NULL", __func__); - goto err; + goto out; } #ifdef CONFIG_NRF70_SCAN_ONLY @@ -352,26 +352,26 @@ int nrf_wifi_reg_domain(const struct device *dev, struct wifi_reg_domain *reg_do status = nrf_wifi_fmac_set_reg(fmac_dev_ctx, ®_domain_info); if (status != NRF_WIFI_STATUS_SUCCESS) { LOG_ERR("%s: Failed to set regulatory domain", __func__); - goto err; + goto out; } - goto err; + goto out; } #endif if (reg_domain->oper != WIFI_MGMT_GET) { LOG_ERR("%s: Invalid operation: %d", __func__, reg_domain->oper); - goto err; + goto out; } if (!reg_domain->chan_info) { LOG_ERR("%s: Invalid regulatory info (NULL)\n", __func__); - goto err; + goto out; } status = nrf_wifi_fmac_get_reg(fmac_dev_ctx, ®_domain_info); if (status != NRF_WIFI_STATUS_SUCCESS) { LOG_ERR("%s: Failed to get regulatory domain", __func__); - goto err; + goto out; } memcpy(reg_domain->country_code, reg_domain_info.alpha2, WIFI_COUNTRY_CODE_LEN); @@ -388,7 +388,7 @@ int nrf_wifi_reg_domain(const struct device *dev, struct wifi_reg_domain *reg_do } ret = 0; -err: +out: k_mutex_unlock(®_lock); return ret; } From 654c98f8ad1210c5ce9f8682e5f42ce8417228a1 Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Fri, 1 Nov 2024 19:33:32 +0530 Subject: [PATCH 3/8] Revert "[nrf fromlist] manifest: hal_nordic: Pull doxygen build fixes" This reverts commit 10633e9124bec37bb025e3c92746efecd529a86c. Signed-off-by: Chaitanya Tata (cherry picked from commit ac03a2bf70502681885433e26bc8bd2519b5fff3) --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index 1116a94ec3b..f2a65b025c9 100644 --- a/west.yml +++ b/west.yml @@ -188,7 +188,7 @@ manifest: groups: - hal - name: hal_nordic - revision: c1c448df1b751c1c03229a447a2216f29e6aaf99 + revision: cb7600a1be4c8b177867e6d463729c07dd3f6d73 path: modules/hal/nordic groups: - hal From 1b3e64d2cfa302b2938ea42793435cc32d9bb21a Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Wed, 30 Oct 2024 01:38:47 +0530 Subject: [PATCH 4/8] [nrf fromlist] drivers: nrfwifi: Fix passing of RAW scan results flag The CONFIG_ prefix should be removed when passing to OSAL code. Upstream PR #: 80583 Signed-off-by: Chaitanya Tata (cherry picked from commit a5eb5528da848f9ceeb3015bda7148c836ba8114) --- drivers/wifi/nrfwifi/CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/wifi/nrfwifi/CMakeLists.txt b/drivers/wifi/nrfwifi/CMakeLists.txt index 026363083ac..c274809f0e1 100644 --- a/drivers/wifi/nrfwifi/CMakeLists.txt +++ b/drivers/wifi/nrfwifi/CMakeLists.txt @@ -301,6 +301,10 @@ zephyr_compile_definitions_ifdef(CONFIG_NRF_WIFI_FEAT_KEEPALIVE -DNRF_WIFI_KEEPALIVE_PERIOD_S=${CONFIG_NRF_WIFI_KEEPALIVE_PERIOD_S} ) +zephyr_compile_definitions_ifdef(CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS + -DWIFI_MGMT_RAW_SCAN_RESULTS=${CONFIG_WIFI_MGMT_RAW_SCAN_RESULTS} +) + zephyr_compile_definitions( -DNRF70_RX_NUM_BUFS=${CONFIG_NRF70_RX_NUM_BUFS} -DNRF70_MAX_TX_TOKENS=${CONFIG_NRF70_MAX_TX_TOKENS} From 2694b7666c6f64ca1bdf2905446ad48974110f93 Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Wed, 30 Oct 2024 01:39:30 +0530 Subject: [PATCH 5/8] [nrf fromlist] manifest: hal_nordic: Pull RX processing fixes Fixes for processing RX events. Upstream PR #: 80583 Signed-off-by: Chaitanya Tata (cherry picked from commit a3a28dbbfc25e86e0b71aa5bc188bc399894f5f9) --- west.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/west.yml b/west.yml index f2a65b025c9..ccc137c1079 100644 --- a/west.yml +++ b/west.yml @@ -188,7 +188,7 @@ manifest: groups: - hal - name: hal_nordic - revision: cb7600a1be4c8b177867e6d463729c07dd3f6d73 + revision: 0a753f99ea4899cfbb56e29ae40b4ded95a3ab77 path: modules/hal/nordic groups: - hal From bae62d573d467c61377b0c2c3843bddbfc7d72ea Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Fri, 1 Nov 2024 21:03:32 +0530 Subject: [PATCH 6/8] [nrf fromlist] boards: thingy53: Fix missing GPIOs Status and request GPIOs are missing from the edge connector, add those to fix Thingy53 + nRF7002EB build. Upstream PR #: 80748 Signed-off-by: Chaitanya Tata (cherry picked from commit b1c242fe3c04dd21186eb0181a957a3cbc80acae) --- boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts b/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts index aa4d4df909c..3003d4924ce 100644 --- a/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts +++ b/boards/nordic/thingy53/thingy53_nrf5340_cpunet.dts @@ -72,7 +72,9 @@ #gpio-cells = <2>; gpio-map-mask = <0xffffffff 0xffffffc0>; gpio-map-pass-thru = <0 0x3f>; - gpio-map = <8 0 &gpio0 5 0>, /* P8, P0.05/AIN1 */ + gpio-map = <5 0 &gpio1 1 0>, /* P5, P1.01/GRANT */ + <6 0 &gpio1 0 0>, /* P6, P1.00/REQ */ + <8 0 &gpio0 5 0>, /* P8, P0.05/AIN1 */ <9 0 &gpio0 4 0>, /* P9, P0.04/AIN0 */ <15 0 &gpio0 8 0>, /* P15, P0.08/TRACEDATA3 */ <16 0 &gpio0 9 0>, /* P16, P0.09/TRACEDATA2 */ From 96e24cae86b5231fbd148f124b79f3e2c927f25d Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Sat, 2 Nov 2024 17:14:23 +0530 Subject: [PATCH 7/8] [nrf fromlist] drivers: nrfwifi: Fix the undefined macro usage This works because undefined macro in conditional is treated as zero, but could end up choosing the wrong divider. Fix the macro with the new name. Upstream PR #: 80780 Signed-off-by: Chaitanya Tata (cherry picked from commit 4250055bbbb735bf09439b517df9fdc58f968e4d) --- drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c b/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c index 26d9249248c..46c92def8f7 100644 --- a/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c +++ b/drivers/wifi/nrfwifi/src/qspi/src/qspi_if.c @@ -85,7 +85,7 @@ BUILD_ASSERT(QSPI_IF_DEVICE_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 16), * PCLK192M frequency"), but after that operation is complete, the default * divider needs to be restored to avoid increased current consumption. */ -#if (INST_0_SCK_FREQUENCY >= NRF_QSPI_BASE_CLOCK_FREQ) +#if (QSPI_IF_DEVICE_FREQUENCY >= NRF_QSPI_BASE_CLOCK_FREQ) /* For requested SCK >= 96 MHz, use HFCLK192M / 1 / (2*1) = 96 MHz */ #define BASE_CLOCK_DIV NRF_CLOCK_HFCLK_DIV_1 #define INST_0_SCK_CFG NRF_QSPI_FREQ_DIV1 @@ -93,12 +93,12 @@ BUILD_ASSERT(QSPI_IF_DEVICE_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 16), #elif NRF53_ERRATA_159_ENABLE_WORKAROUND #define BASE_CLOCK_DIV NRF_CLOCK_HFCLK_DIV_1 #define INST_0_SCK_CFG (DIV_ROUND_UP(NRF_QSPI_BASE_CLOCK_FREQ, \ - INST_0_SCK_FREQUENCY) - 1) -#elif (INST_0_SCK_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 2)) + QSPI_IF_DEVICE_FREQUENCY) - 1) +#elif (QSPI_IF_DEVICE_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 2)) /* For 96 MHz > SCK >= 48 MHz, use HFCLK192M / 2 / (2*1) = 48 MHz */ #define BASE_CLOCK_DIV NRF_CLOCK_HFCLK_DIV_2 #define INST_0_SCK_CFG NRF_QSPI_FREQ_DIV1 -#elif (INST_0_SCK_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 3)) +#elif (QSPI_IF_DEVICE_FREQUENCY >= (NRF_QSPI_BASE_CLOCK_FREQ / 3)) /* For 48 MHz > SCK >= 32 MHz, use HFCLK192M / 1 / (2*3) = 32 MHz */ #define BASE_CLOCK_DIV NRF_CLOCK_HFCLK_DIV_1 #define INST_0_SCK_CFG NRF_QSPI_FREQ_DIV3 From f83685753f297d52a3c56de6e603b686e6a5f897 Mon Sep 17 00:00:00 2001 From: Chaitanya Tata Date: Fri, 1 Nov 2024 20:13:49 +0530 Subject: [PATCH 8/8] [nrf noup] hostap: Fix PSA config Wi-Fi PSA currently doesn't support Enterprise mode, so, remove Enterprise configs, even if this is added, these are already part of Enterprise configuration. Signed-off-by: Chaitanya Tata (cherry picked from commit 86bff0f8539ae0fc7154bac0ccd889b4133cc298) --- modules/hostap/CMakeLists.txt | 2 +- modules/hostap/Kconfig | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/modules/hostap/CMakeLists.txt b/modules/hostap/CMakeLists.txt index 1a97360b48e..7ad0d22bb6a 100644 --- a/modules/hostap/CMakeLists.txt +++ b/modules/hostap/CMakeLists.txt @@ -668,9 +668,9 @@ zephyr_library_sources( ${HOSTAP_SRC_BASE}/crypto/aes-internal-enc.c ${HOSTAP_SRC_BASE}/crypto/rc4.c ${HOSTAP_SRC_BASE}/crypto/crypto_mbedtls_alt.c - ${HOSTAP_SRC_BASE}/crypto/tls_mbedtls_alt.c ${HOSTAP_SRC_BASE}/crypto/sha256-kdf.c ${HOSTAP_BASE}/port/mbedtls/supp_psa_api.c + ${HOSTAP_SRC_BASE}/crypto/tls_none.c ) endif() diff --git a/modules/hostap/Kconfig b/modules/hostap/Kconfig index f6c75f1a46c..300a61e5cd6 100644 --- a/modules/hostap/Kconfig +++ b/modules/hostap/Kconfig @@ -257,12 +257,9 @@ config WIFI_NM_WPA_SUPPLICANT_CRYPTO_ALT_NCS_PSA select MBEDTLS select NRF_SECURITY select PSA_WANT_GENERATE_RANDOM - select MBEDTLS_TLS_LIBRARY select MBEDTLS_PK_C + select MBEDTLS_MD_C select MBEDTLS_PK_WRITE_C - select MBEDTLS_X509_LIBRARY - select MBEDTLS_X509_CRT_PARSE_C - select MBEDTLS_SSL_TLS_C select MBEDTLS_ENABLE_HEAP select MBEDTLS_PSA_CRYPTO_C select MBEDTLS_USE_PSA_CRYPTO