samples: net: download: Add nRF7002 DK support

jtguggedal · rlubos · commit 7a153ad4324f · 2023-10-11T11:34:17.000+02:00
Add support for nRF7002 DK, downloading over Wi-Fi.

Signed-off-by: Jan Tore Guggedal &lt;jantore.guggedal@nordicsemi.no&gt;
diff --git a/samples/net/download/README.rst b/samples/net/download/README.rst
@@ -24,12 +24,12 @@ Overview
 
 The sample first initializes the :ref:`nrfxlib:nrf_modem` and AT communications.
 Next, it provisions a certificate to the modem using the :ref:`modem_key_mgmt` library if the :ref:`CONFIG_SAMPLE_SECURE_SOCKET <CONFIG_SAMPLE_SECURE_SOCKET>` option is set.
-The provisioning of the certificates must be done before connecting to the LTE network since the certificates can only be provisioned when the device is not connected.
+When using an nRF91 Series device, the provisioning of the certificates must be done before connecting to the LTE network since the certificates can only be provisioned when the device is not connected.
 The certificate file name and security tag can be configured using the :ref:`CONFIG_SAMPLE_SEC_TAG <CONFIG_SAMPLE_SEC_TAG>` and the :ref:`CONFIG_SAMPLE_CERT_FILE <CONFIG_SAMPLE_CERT_FILE>` options, respectively.
 
 The sample then performs the following actions:
 
-1. Establishes a connection to the LTE network
+1. Establishes a connection to the network
 #. Optionally sets up the secure socket options
 #. Uses the :ref:`lib_download_client` library to download a file from an HTTP server.
 
@@ -42,8 +42,7 @@ To enable CoAP block-wise transfer, it is necessary to enable :ref:`Zephyr's CoA
 Using TLS and DTLS
 ==================
 
-
-When the :ref:`CONFIG_SAMPLE_SECURE_SOCKET <CONFIG_SAMPLE_SECURE_SOCKET>` option is set, the sample provisions the certificate found in the :file:`samples/net/download/cert` folder.
+By default, the :ref:`CONFIG_SAMPLE_SECURE_SOCKET <CONFIG_SAMPLE_SECURE_SOCKET>` option is set, which means that the sample provisions the certificate found in the :file:`samples/net/download/cert` folder.
 The certificate file name is indicated by the :ref:`CONFIG_SAMPLE_CERT_FILE <CONFIG_SAMPLE_CERT_FILE>` option.
 This certificate will work for the default test files.
 If you are using a custom download test file, you must provision the correct certificate for the servers from which the certificates will be downloaded.
@@ -136,7 +135,7 @@ The following output is logged on the terminal when the sample downloads a file
 Dependencies
 ************
 
-This sample uses the following |NCS| libraries:
+This sample uses the following |NCS| libraries when using an nRF91 Series device:
 
 * :ref:`modem_key_mgmt`
 * :ref:`nrf_modem_lib_readme`
diff --git a/samples/net/download/boards/nrf7002dk_nrf5340_cpuapp.conf b/samples/net/download/boards/nrf7002dk_nrf5340_cpuapp.conf
@@ -0,0 +1,62 @@
+#
+# Copyright (c) 2023 Nordic Semiconductor ASA
+#
+# SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
+#
+
+# General
+CONFIG_POSIX_CLOCK=y
+CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
+CONFIG_LOG_BUFFER_SIZE=3072
+CONFIG_HEAP_MEM_POOL_SIZE=153600
+CONFIG_LOG=y
+
+# Zephyr NET Connection Manager connectivity layer.
+CONFIG_L2_WIFI_CONNECTIVITY=y
+CONFIG_L2_WIFI_CONNECTIVITY_AUTO_DOWN=n
+CONFIG_L2_WIFI_CONNECTIVITY_AUTO_CONNECT=n
+CONFIG_MAIN_STACK_SIZE=4096
+
+# Wi-Fi
+CONFIG_WIFI=y
+CONFIG_WIFI_NRF700X=y
+CONFIG_WIFI_LOG_LEVEL_ERR=y
+CONFIG_WIFI_MGMT_EXT=y
+CONFIG_WIFI_CREDENTIALS=y
+CONFIG_WIFI_CREDENTIALS_BACKEND_SETTINGS=y
+CONFIG_WIFI_CREDENTIALS_STATIC=y
+CONFIG_WIFI_CREDENTIALS_STATIC_SSID=""
+CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD=""
+CONFIG_FLASH=y
+CONFIG_FLASH_PAGE_LAYOUT=y
+CONFIG_FLASH_MAP=y
+CONFIG_NVS=y
+CONFIG_SETTINGS=y
+CONFIG_SETTINGS_NVS=y
+
+# WPA
+CONFIG_WPA_SUPP=y
+CONFIG_WPA_SUPP_LOG_LEVEL_ERR=y
+
+# NET sockets
+CONFIG_NET_L2_ETHERNET=y
+CONFIG_NET_TCP_WORKQ_STACK_SIZE=2048
+CONFIG_NET_UDP=y
+CONFIG_NET_DHCPV4=y
+CONFIG_NET_CONTEXT_SNDTIMEO=y
+CONFIG_NET_CONTEXT_RCVTIMEO=y
+CONFIG_NET_MGMT_EVENT_STACK_SIZE=4096
+CONFIG_NET_TCP=y
+CONFIG_NET_NATIVE=y
+
+# DNS
+CONFIG_DNS_RESOLVER=y
+
+# TLS
+CONFIG_NRF_SECURITY=y
+CONFIG_MBEDTLS=y
+CONFIG_MBEDTLS_ENABLE_HEAP=y
+CONFIG_MBEDTLS_HEAP_SIZE=120000
+CONFIG_MBEDTLS_RSA_C=y
+CONFIG_MBEDTLS_SSL_SERVER_NAME_INDICATION=y
+CONFIG_NET_SOCKETS_SOCKOPT_TLS=y
diff --git a/samples/net/download/sample.yaml b/samples/net/download/sample.yaml
@@ -1,15 +1,15 @@
 sample:
   name: Download sample
 tests:
-  sample.net.download.tfm:
+  sample.net.download.tfm.lte:
     build_only: true
     extra_args: OVERLAY_CONFIG="overlay-tfm.conf"
     integration_platforms:
       - nrf9160dk_nrf9160_ns
       - nrf9161dk_nrf9161_ns
     platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns
     tags: ci_build
-  sample.net.download_client:
+  sample.net.download_client.lte:
     build_only: true
     extra_configs:
       - CONFIG_SHELL=y
@@ -21,3 +21,15 @@ tests:
       - nrf9161dk_nrf9161_ns
     platform_allow: nrf9160dk_nrf9160_ns nrf9161dk_nrf9161_ns
     tags: ci_build
+  sample.net.download_client.wifi:
+    build_only: true
+    extra_configs:
+      - CONFIG_SHELL=y
+      - CONFIG_DOWNLOAD_CLIENT_SHELL=y
+      - CONFIG_SAMPLE_COMPUTE_HASH=y
+      - CONFIG_WIFI_CREDENTIALS_STATIC_SSID="test-ssid"
+      - CONFIG_WIFI_CREDENTIALS_STATIC_PASSWORD="test-password"
+    integration_platforms:
+      - nrf7002dk_nrf5340_cpuapp
+    platform_allow: nrf7002dk_nrf5340_cpuapp
+    tags: ci_build
diff --git a/samples/net/download/src/main.c b/samples/net/download/src/main.c
@@ -7,12 +7,15 @@
 #include <string.h>
 #include <stdlib.h>
 #include <zephyr/kernel.h>
+#include <zephyr/net/socket.h>
 #include <zephyr/net/net_if.h>
 #include <zephyr/net/conn_mgr_connectivity.h>
 #include <net/download_client.h>
 
-#if CONFIG_SAMPLE_SECURE_SOCKET
+#if CONFIG_MODEM_KEY_MGMT
 #include <modem/modem_key_mgmt.h>
+#else
+#include <zephyr/net/tls_credentials.h>
 #endif
 
 #define URL CONFIG_SAMPLE_FILE_URL
@@ -45,6 +48,7 @@ static struct download_client_cfg config = {
 #if CONFIG_SAMPLE_SECURE_SOCKET
 	.sec_tag_list = sec_tag_list,
 	.sec_tag_count = ARRAY_SIZE(sec_tag_list),
+	.set_tls_hostname = true,
 #endif
 };
 
@@ -56,10 +60,13 @@ static mbedtls_sha256_context sha256_ctx;
 static int64_t ref_time;
 
 #if CONFIG_SAMPLE_SECURE_SOCKET
-/* Provision certificate to modem */
 static int cert_provision(void)
 {
 	int err;
+
+	printk("Provisioning certificate\n");
+
+#if CONFIG_MODEM_KEY_MGMT
 	bool exists;
 
 	err = modem_key_mgmt_exists(SEC_TAG,
@@ -76,14 +83,14 @@ static int cert_provision(void)
 		err = modem_key_mgmt_cmp(SEC_TAG,
 					 MODEM_KEY_MGMT_CRED_TYPE_CA_CHAIN,
 					 cert, sizeof(cert) - 1);
+
 		printk("%s\n", err ? "mismatch" : "match");
+
 		if (!err) {
 			return 0;
 		}
 	}
 
-	printk("Provisioning certificate\n");
-
 	/*  Provision certificate to the modem */
 	err = modem_key_mgmt_write(SEC_TAG,
 				   MODEM_KEY_MGMT_CRED_TYPE_CA_CHAIN,
@@ -92,6 +99,16 @@ static int cert_provision(void)
 		printk("Failed to provision certificate, err %d\n", err);
 		return err;
 	}
+#else /* CONFIG_MODEM_KEY_MGMT */
+	err = tls_credential_add(SEC_TAG,
+				 TLS_CREDENTIAL_CA_CERTIFICATE,
+				 cert,
+				 sizeof(cert));
+	if (err < 0) {
+		printk("Failed to register CA certificate: %d\n", err);
+		return err;
+	}
+#endif /* !CONFIG_MODEM_KEY_MGMT */
 
 	return 0;
 }
@@ -231,12 +248,6 @@ int main(void)
 
 	printk("Download client sample started\n");
 
-	net_if = net_if_get_default();
-	if (net_if == NULL) {
-		printk("Pointer to network interface is NULL\n");
-		return -ECANCELED;
-	}
-
 	/* Setup handler for Zephyr NET Connection Manager events. */
 	net_mgmt_init_event_callback(&l4_cb, l4_event_handler, L4_EVENT_MASK);
 	net_mgmt_add_event_callback(&l4_cb);
@@ -245,9 +256,9 @@ int main(void)
 	net_mgmt_init_event_callback(&conn_cb, connectivity_event_handler, CONN_LAYER_EVENT_MASK);
 	net_mgmt_add_event_callback(&conn_cb);
 
-	err = net_if_up(net_if);
+	err = conn_mgr_all_if_up(true);
 	if (err) {
-		printk("net_if_up, error: %d\n", err);
+		printk("conn_mgr_all_if_up, error: %d\n", err);
 		return err;
 	}
 
@@ -259,15 +270,11 @@ int main(void)
 	}
 #endif
 
-	/* Add temporary fix to prevent using Wi-Fi before WPA supplicant is ready. */
-	/* Remove this whenever wpa supplicant ready events has been added. */
-	k_sleep(K_SECONDS(1));
-
 	printk("Connecting to network\n");
 
-	err = conn_mgr_if_connect(net_if);
+	err = conn_mgr_all_if_connect(true);
 	if (err) {
-		printk("conn_mgr_if_connect, error: %d\n", err);
+		printk("conn_mgr_all_if_connect, error: %d\n", err);
 		return err;
 	}
 
