make DMA selectable via makefile in tests, add github action

Author: bigbrett

.github/workflows/build-and-test.yml

@@ -32,22 +32,26 @@ jobs:
     # Build and test standard build
     - name: Build and test
       run: cd test && make clean && make WOLFSSL_DIR=../wolfssl run
+    
+    # Build and test standard build, with DMA and ASAN enabled
+    - name: Build and test DMA ASAN
+      run: cd test && make clean && make DMA=1 ASAN=1 WOLFSSL_DIR=../wolfssl run
 
     # Build and test ASAN build, with wolfCrypt tests enabled.
     - name: Build and test ASAN TESTWOLFCRYPT
       run: cd test && make clean && make ASAN=1 TESTWOLFCRYPT=1 WOLFSSL_DIR=../wolfssl run
 
     # Build and test ASAN build, with wolfCrypt tests enabled and using the DMA devId.
     - name: Build and test ASAN TESTWOLFCRYPT TESTWOLFCRYPT_DMA
-      run: cd test && make clean && make ASAN=1 TESTWOLFCRYPT=1 TESTWOLFCRYPT_DMA=1 WOLFSSL_DIR=../wolfssl run
+      run: cd test && make clean && make ASAN=1 TESTWOLFCRYPT=1 TESTWOLFCRYPT_DMA=1 DMA=1 WOLFSSL_DIR=../wolfssl run
 
     # Build and test debug build with ASAN and NOCRYPTO
     - name: Build and test ASAN DEBUG NOCRYPTO
       run: cd test && make clean && make DEBUG=1 ASAN=1 NOCRYPTO=1 WOLFSSL_DIR=../wolfssl run
 
-    # Build and test debug build with ASAN
-    - name: Build and test ASAN DEBUG
-      run: cd test && make clean && make DEBUG=1 ASAN=1 WOLFSSL_DIR=../wolfssl run
+    # Build and test debug build with ASAN and DMA
+    - name: Build and test ASAN DEBUG DMA
+      run: cd test && make clean && make DEBUG=1 ASAN=1 DMA=1 WOLFSSL_DIR=../wolfssl run
 
     # Build and test with SHE and ASAN
     - name: Build and test ASAN SHE

test/Makefile

@@ -77,6 +77,11 @@ ifeq ($(NOCRYPTO),1)
 CFLAGS += -DWOLFHSM_CFG_NO_CRYPTO
 endif
 
+# Support a DMA-capable build
+ifeq ($(DMA), 1)
+CFLAGS += -DWOLFHSM_CFG_DMA
+endif
+
 ifeq ($(SHE),1)
 CFLAGS += -DWOLFHSM_CFG_SHE_EXTENSION
 endif
@@ -121,6 +126,13 @@ ifeq ($(TESTWOLFCRYPT),1)
 
     TESTWOLFCRYPT_DEFAULT_DEVID = 0x5748534D
 
+    # If TESTWOLFCRYPT_DMA is defined but DMA is not, error
+    ifneq ($(TESTWOLFCRYPT_DMA),)
+        ifeq ($(DMA),)
+            $(error "TESTWOLFCRYPT_DMA=1 requires DMA=1 to be set")
+        endif
+    endif
+
     # TESTWOLFCRYPT_DEVID and TESTWOLFCRYPT_DMA are mutually exclusive
     ifneq ($(TESTWOLFCRYPT_DMA),)
         ifneq ($(TESTWOLFCRYPT_DEVID),)

test/wolfhsm_cfg.h

@@ -40,7 +40,6 @@
 #define WOLFHSM_CFG_SERVER_DMAADDR_COUNT 8
 #define WOLFHSM_CFG_SERVER_CUSTOMCB_COUNT 6
 
-#define WOLFHSM_CFG_DMA
 #define WOLFHSM_CFG_CERTIFICATE_MANAGER
 #define WOLFHSM_CFG_CERTIFICATE_MANAGER_ACERT
 #endif /* WOLFHSM_CFG_H_ */