samples: net: zperf: Add USB CDC NCM support

Add support for USB cdc_ncm to zperf application.

Signed-off-by: Jukka Rissanen <[email protected]>

Author: jukkar

samples/net/zperf/CMakeLists.txt

@@ -22,3 +22,7 @@ if (CONFIG_NET_L2_ETHERNET)
     LOCATION "${CONFIG_NET_SAMPLE_CODE_RAM_NAME}_TEXT" NOKEEP)
 endif()
 endif()
+
+if (CONFIG_USB_DEVICE_STACK_NEXT)
+  include(${ZEPHYR_BASE}/samples/subsys/usb/common/common.cmake)
+endif()

samples/net/zperf/Kconfig

@@ -20,3 +20,10 @@ config NET_SAMPLE_CODE_RAM_NAME
 	  Region to relocate networking code to
 
 endif # NET_SAMPLE_CODE_RELOCATE
+
+if USB_DEVICE_STACK_NEXT
+# Source common USB sample options used to initialize new experimental USB
+# device stack. The scope of these options is limited to USB samples in project
+# tree, you cannot use them in your own application.
+source "samples/subsys/usb/common/Kconfig.sample_usbd"
+endif

…les/net/zperf/overlay-usbd_next_ecm.conf samples/net/zperf/overlay-usbd_next.confsamples/net/zperf/overlay-usbd_next_ecm.conf renamed to samples/net/zperf/overlay-usbd_next.conf samples/net/zperf/overlay-usbd_next_ecm.conf renamed to samples/net/zperf/overlay-usbd_next.conf

@@ -46,11 +46,18 @@ tests:
       - native_sim/native/64
   sample.net.zperf.device_next_ecm:
     harness: net
-    extra_args: OVERLAY_CONFIG="overlay-usbd_next_ecm.conf"
+    extra_args: OVERLAY_CONFIG="overlay-usbd_next.conf"
                 DTC_OVERLAY_FILE="usbd_next_ecm.overlay"
     platform_allow: nrf52840dk/nrf52840 frdm_k64f
     tags: usb net zperf
     depends_on: usb_device
+  sample.net.zperf.device_next_ncm:
+    harness: net
+    extra_args: OVERLAY_CONFIG="overlay-usbd_next.conf"
+                DTC_OVERLAY_FILE="usbd_next_ncm.overlay"
+    platform_allow: nrf52840dk/nrf52840 frdm_k64f
+    tags: usb net zperf
+    depends_on: usb_device
   sample.net.zperf.netusb_eem:
     harness: net
     extra_args: OVERLAY_CONFIG="overlay-netusb.conf"

samples/net/zperf/sample.yaml

@@ -9,11 +9,36 @@
  * @brief Zperf sample.
  */
 #include <zephyr/usb/usb_device.h>
+#include <zephyr/usb/usbd.h>
 #include <zephyr/net/net_config.h>
 
 #ifdef CONFIG_NET_LOOPBACK_SIMULATE_PACKET_DROP
 #include <zephyr/net/loopback.h>
 #endif
+
+#if defined(CONFIG_USB_DEVICE_STACK_NEXT)
+#include <sample_usbd.h>
+
+static struct usbd_context *sample_usbd;
+
+static int enable_usb_device_next(void)
+{
+        int err;
+
+        sample_usbd = sample_usbd_init_device(NULL);
+        if (sample_usbd == NULL) {
+                return -ENODEV;
+        }
+
+        err = usbd_enable(sample_usbd);
+        if (err) {
+                return err;
+        }
+
+        return 0;
+}
+#endif /* CONFIG_USB_DEVICE_STACK_NEXT */
+
 int main(void)
 {
 #if defined(CONFIG_USB_DEVICE_STACK)
@@ -26,6 +51,13 @@ int main(void)
 
 	(void)net_config_init_app(NULL, "Initializing network");
 #endif /* CONFIG_USB_DEVICE_STACK */
+
+#if defined(CONFIG_USB_DEVICE_STACK_NEXT)
+        if (enable_usb_device_next()) {
+                return 0;
+        }
+#endif /* CONFIG_USB_DEVICE_STACK_NEXT */
+
 #ifdef CONFIG_NET_LOOPBACK_SIMULATE_PACKET_DROP
 	loopback_set_packet_drop_ratio(1);
 #endif

samples/net/zperf/src/main.c

@@ -0,0 +1,12 @@
+/*
+ * Copyright (c) 2024 Nordic Semiconductor ASA
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/ {
+	cdc_ncm_eth0: cdc_ncm_eth0 {
+		compatible = "zephyr,cdc-ncm-ethernet";
+		remote-mac-address = "00005E005301";
+	};
+};