VisionFive2 Linux kernel

StarFive Tech Linux Kernel for VisionFive (JH7110) boards (mirror)

More than 9999 Commits   34 Branches   58 Tags
author: andy.hu <andy.hu@starfivetech.com> 2023-07-12 09:03:04 +0000 committer: andy.hu <andy.hu@starfivetech.com> 2023-07-12 09:03:04 +0000 commit: 2df21cb61bb41326e739e4e82ae925e6e01b321e parent: df23fb955a49a9348b8a8048fb58afcfb37363e3
Commit Summary:
Merge branch 'CR_6466_fix_dma_warning_smain.guo' into 'jh7110-5.15.y-devel'
Diffstat:
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi
index 5616e66d1941..c2a168f1f942 100755
--- a/arch/riscv/boot/dts/starfive/jh7110.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi
@@ -640,7 +640,7 @@
 			snps,num-hs-if = <56>;
 			snps,block-size = <65536 65536 65536 65536>;
 			snps,priority = <0 1 2 3>;
-			snps,axi-max-burst-len = <16>;
+			snps,axi-max-burst-len = <15>;
 			status = "disabled";
 		};
 
diff --git a/drivers/dma/dw-axi-dmac-starfive/dw-axi-dmac-starfive-misc.c b/drivers/dma/dw-axi-dmac-starfive/dw-axi-dmac-starfive-misc.c
index 6b339d6e87b3..eee6d9dba555 100644
--- a/drivers/dma/dw-axi-dmac-starfive/dw-axi-dmac-starfive-misc.c
+++ b/drivers/dma/dw-axi-dmac-starfive/dw-axi-dmac-starfive-misc.c
@@ -190,7 +190,7 @@ static long axidma_unlocked_ioctl(struct file *file, unsigned int cmd,
 		}
 
 		wait_event_interruptible_timeout(wq,
-				&channels[chncfg.chn_num].status,
+				channels[chncfg.chn_num].status,
 				msecs_to_jiffies(DMA_MAX_TIMEOUT_MS));
 #ifdef CONFIG_SOC_STARFIVE_VIC7100
 		/*flush dcache*/