From 5274cd55d5bb893145b8931fdb32cb782517899b Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sun, 18 Jun 2017 21:03:48 +0000 Subject: [PATCH] Create a new option ARM_USE_V6_BUSDMA to force an armv4/5 kernel to use the armv6 busdma interface. This interface uses more memory than the armv4 one, but bounces more data more often so may be more correct than the armv4 one. It is intended for debugging purposes only at the moment. --- sys/conf/files.arm | 4 ++-- sys/conf/options.arm | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/conf/files.arm b/sys/conf/files.arm index f03d2a17471..0b0808d07c2 100644 --- a/sys/conf/files.arm +++ b/sys/conf/files.arm @@ -25,8 +25,8 @@ arm/arm/blockio.S standard arm/arm/bus_space_asm_generic.S standard arm/arm/bus_space_base.c optional fdt arm/arm/bus_space_generic.c standard -arm/arm/busdma_machdep-v4.c optional !armv6 -arm/arm/busdma_machdep-v6.c optional armv6 +arm/arm/busdma_machdep-v4.c optional !armv6 !ARM_USE_V6_BUSDMA +arm/arm/busdma_machdep-v6.c optional armv6 | ARM_USE_V6_BUSDMA arm/arm/copystr.S standard arm/arm/cpufunc.c standard arm/arm/cpufunc_asm.S standard diff --git a/sys/conf/options.arm b/sys/conf/options.arm index 8d19d097872..99c107afc9b 100644 --- a/sys/conf/options.arm +++ b/sys/conf/options.arm @@ -4,7 +4,7 @@ ARM_CACHE_LOCK_ENABLE opt_global.h ARM_KERN_DIRECTMAP opt_vm.h ARM_L2_PIPT opt_global.h ARM_MANY_BOARD opt_global.h -NKPT2PG opt_pmap.h +ARM_USE_V6_BUSDMA opt_global.h ARM_WANT_TP_ADDRESS opt_global.h COUNTS_PER_SEC opt_timer.h CPSW_ETHERSWITCH opt_cpsw.h @@ -35,6 +35,7 @@ KERNVIRTADDR opt_global.h LINUX_BOOT_ABI opt_global.h LOADERRAMADDR opt_global.h MULTIDELAY opt_global.h +NKPT2PG opt_pmap.h PHYSADDR opt_global.h PLATFORM opt_global.h PLATFORM_SMP opt_global.h