From 9594c5c99a337394e95869cd7099bf0e169d1a65 Mon Sep 17 00:00:00 2001 From: Shen Mintao Date: Thu, 10 Sep 2026 11:26:07 +0800 Subject: [PATCH] fix: sync upstream SUN60IW2P1 USB transfer settings Disable CONFIG_USB_ALIGN_DATA and enable CONFIG_USB_NO_TRANS_DMA_MAP when CONFIG_ARCH_SUN60IW2P1 is set, following the upstream USB controller workaround. Preserve the current defaults on other platforms. Source: radxa-pkg/aic8800 commit 33f19ba, fix-usbc1-controller-wifi-rate-of-sun60iw2p1.patch. Validation: GNU make resolves the expected settings for both platform branches; Linux 6.14, 6.17 and 7.2 module builds succeeded. No SUN60IW2P1 hardware was available for runtime validation. --- drivers/aic8800/aic8800_fdrv/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/aic8800/aic8800_fdrv/Makefile b/drivers/aic8800/aic8800_fdrv/Makefile index a4a6b96..6a80ac9 100644 --- a/drivers/aic8800/aic8800_fdrv/Makefile +++ b/drivers/aic8800/aic8800_fdrv/Makefile @@ -74,7 +74,11 @@ CONFIG_VHT_FOR_OLD_KERNEL = n CONFIG_COEX = y CONFIG_ALIGN_8BYTES = y CONFIG_TXRX_THREAD_PRIO = y +ifdef CONFIG_ARCH_SUN60IW2P1 +CONFIG_USB_ALIGN_DATA = n +else CONFIG_USB_ALIGN_DATA = y +endif CONFIG_RX_TASKLET = n CONFIG_TX_TASKLET = n CONFIG_RX_NETIF_RECV_SKB = y @@ -88,7 +92,11 @@ CONFIG_WOWLAN ?= n CONFIG_USB_RX_AGGR = n CONFIG_USB_TX_AGGR = n +ifdef CONFIG_ARCH_SUN60IW2P1 +CONFIG_USB_NO_TRANS_DMA_MAP = y +else CONFIG_USB_NO_TRANS_DMA_MAP = n +endif CONFIG_GPIO_WAKEUP = n CONFIG_CREATE_TRACE_POINTS = n CONFIG_SUPPORT_REALTIME_CHANGE_MAC = y