adopt zperf example

Author: rgrr

doc/connectivity/usb/device_next/usb_device.rst

@@ -53,5 +53,7 @@ Zephyr network support.
 
 See :zephyr:code-sample:`zperf` for reference.
 To build the sample for the new device support, set the configuration overlay file
-``-DDEXTRA_CONF_FILE=overlay-usbd_next_ecm.conf`` and devicetree overlay file
-``-DDTC_OVERLAY_FILE="usbd_next_ecm.overlay`` either directly or via ``west``.
+``-DDEXTRA_CONF_FILE=overlay-usbd_next.conf`` and devicetree overlay file
+``-DDTC_OVERLAY_FILE="usbd_next_ecm.overlay`` for ECM either directly or via ``west``.
+To build with NCM, set the configuration overlay file as above and the devicetree overlay
+file to ``-DDTC_OVERLAY_FILE="usbd_next_ncm.overlay``.

samples/net/zperf/overlay-netusb.conf

@@ -1,6 +1,12 @@
 # USB Device Settings
 CONFIG_USB_DEVICE_STACK=y
 
+CONFIG_NET_PKT_RX_COUNT=14
+CONFIG_NET_PKT_TX_COUNT=14
+CONFIG_NET_BUF_RX_COUNT=28
+CONFIG_NET_BUF_TX_COUNT=28
+CONFIG_NET_BUF_DATA_SIZE=1500
+
 # Select USB Configurations
 CONFIG_USB_DEVICE_NETWORK_ECM=y
 CONFIG_USB_DEVICE_INITIALIZE_AT_BOOT=n

samples/net/zperf/overlay-usbd_next.conf

@@ -0,0 +1,10 @@
+CONFIG_USB_DEVICE_STACK_NEXT=y
+
+# next-ncm does not work well with the static-size buffers
+CONFIG_NET_PKT_BUF_RX_DATA_POOL_SIZE=10000
+CONFIG_NET_PKT_BUF_TX_DATA_POOL_SIZE=10000
+CONFIG_NET_BUF_VARIABLE_DATA_SIZE=y
+
+CONFIG_LOG=y
+CONFIG_USBD_LOG_LEVEL_WRN=y
+CONFIG_UDC_DRIVER_LOG_LEVEL_WRN=y

samples/net/zperf/overlay-usbd_next_ecm.conf

@@ -8,11 +8,6 @@ CONFIG_NET_UDP=y
 CONFIG_NET_TCP=y
 CONFIG_NET_STATISTICS=y
 
-CONFIG_NET_PKT_RX_COUNT=14
-CONFIG_NET_PKT_TX_COUNT=14
-CONFIG_NET_BUF_RX_COUNT=28
-CONFIG_NET_BUF_TX_COUNT=28
-CONFIG_NET_BUF_DATA_SIZE=1500
 CONFIG_NET_IF_UNICAST_IPV6_ADDR_COUNT=4
 CONFIG_NET_IF_MCAST_IPV6_ADDR_COUNT=5
 CONFIG_NET_IF_UNICAST_IPV4_ADDR_COUNT=1

samples/net/zperf/prj.conf

@@ -48,14 +48,14 @@ tests:
       - native_posix/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_ecm.conf"
+    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