From 753fa51b77869eadcc27c00df34f09c3c9239fe2 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Thu, 11 Apr 2019 13:49:41 +0200 Subject: bcm: dont assume PHYSDRAM 0 in dmaaddr(), fix dmaioaddr() --- sys/src/9/bcm/dma.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/src/9/bcm/dma.c b/sys/src/9/bcm/dma.c index 8c3b0bd0a..dfaf73b8f 100644 --- a/sys/src/9/bcm/dma.c +++ b/sys/src/9/bcm/dma.c @@ -100,13 +100,13 @@ static u32int *dmaregs = (u32int*)DMAREGS; uintptr dmaaddr(void *va) { - return soc.busdram | (PTR2UINT(va) & ~KSEGM); + return soc.busdram | (PADDR(va) - PHYSDRAM); } static uintptr dmaioaddr(void *va) { - return soc.busio | (PTR2UINT(va) & ~VIRTIO); + return soc.busio | ((uintptr)va - VIRTIO); } static void -- cgit v1.2.3