From b0ed92eae8efe67c416adc8f3376068f0ff373f2 Mon Sep 17 00:00:00 2001 From: Ryan Thompson Date: Mon, 29 Jul 2024 14:23:05 -0500 Subject: [PATCH] fx3_firmware: increase DMA buffer sizes for USB throughput bottleneck $ make test_hdl [----------] Global test environment tear-down [==========] 63 tests from 2 test suites ran. (381209 ms total) [ PASSED ] 63 tests. [100%] Built target test_hdl --- fx3_firmware/src/rf.c | 4 ++-- hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif_p.vhd | 4 ++-- host/libraries/libbladeRF/src/backend/usb/usb.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fx3_firmware/src/rf.c b/fx3_firmware/src/rf.c index ba992402..a50a9f56 100644 --- a/fx3_firmware/src/rf.c +++ b/fx3_firmware/src/rf.c @@ -290,8 +290,8 @@ static void NuandRFLinkStart(void) } CyU3PMemSet((uint8_t *)&dmaCfg, 0, sizeof(dmaCfg)); - dmaCfg.size = size * 2; - dmaCfg.count = 22; + dmaCfg.size = size * 8; + dmaCfg.count = 11; dmaCfg.prodSckId = BLADE_RF_SAMPLE_EP_PRODUCER_USB_SOCKET; dmaCfg.consSckId = CY_U3P_PIB_SOCKET_3; dmaCfg.dmaMode = CY_U3P_DMA_MODE_BYTE; diff --git a/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif_p.vhd b/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif_p.vhd index 43d7673c..f9c64182 100644 --- a/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif_p.vhd +++ b/hdl/fpga/platforms/common/bladerf/vhdl/fx3_gpif_p.vhd @@ -22,6 +22,6 @@ use ieee.std_logic_1164.all; package fx3_gpif_p is -- GPIF buf sizes for USB high-speed and super-speed - constant GPIF_BUF_SIZE_HS : natural := 256; - constant GPIF_BUF_SIZE_SS : natural := 512; + constant GPIF_BUF_SIZE_HS : natural := 1024; + constant GPIF_BUF_SIZE_SS : natural := 2048; end package fx3_gpif_p; diff --git a/host/libraries/libbladeRF/src/backend/usb/usb.h b/host/libraries/libbladeRF/src/backend/usb/usb.h index 644ed7a3..80e9b7a3 100644 --- a/host/libraries/libbladeRF/src/backend/usb/usb.h +++ b/host/libraries/libbladeRF/src/backend/usb/usb.h @@ -61,8 +61,8 @@ extern bool bladerf_usb_reset_device_on_open; #endif /* Size of a host<->FPGA message in BYTES */ -#define USB_MSG_SIZE_SS 2048 -#define USB_MSG_SIZE_HS 1024 +#define USB_MSG_SIZE_SS 8192 +#define USB_MSG_SIZE_HS 4096 typedef enum { USB_TARGET_DEVICE,