Merge pull request #627 from gsomlo/gls-dma-addr-64

RFC: cores/dma, liblitesdcard/sdcard: use 64 bits for dma base address
This commit is contained in:
enjoy-digital 2020-08-10 21:44:02 +02:00 committed by GitHub
commit bb7f33434e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -72,7 +72,7 @@ class WishboneDMAReader(Module, AutoCSR):
self.add_csr() self.add_csr()
def add_csr(self): def add_csr(self):
self._base = CSRStorage(32) self._base = CSRStorage(64)
self._length = CSRStorage(32) self._length = CSRStorage(32)
self._enable = CSRStorage() self._enable = CSRStorage()
self._done = CSRStatus() self._done = CSRStatus()
@ -158,7 +158,7 @@ class WishboneDMAWriter(Module, AutoCSR):
self._sink = self.sink self._sink = self.sink
self.sink = stream.Endpoint([("data", self.bus.data_width)]) self.sink = stream.Endpoint([("data", self.bus.data_width)])
self._base = CSRStorage(32) self._base = CSRStorage(64)
self._length = CSRStorage(32) self._length = CSRStorage(32)
self._enable = CSRStorage() self._enable = CSRStorage()
self._done = CSRStatus() self._done = CSRStatus()

View File

@ -561,7 +561,7 @@ void sdcard_read(uint32_t sector, uint32_t count, uint8_t* buf)
{ {
/* Initialize DMA Writer */ /* Initialize DMA Writer */
sdblock2mem_dma_enable_write(0); sdblock2mem_dma_enable_write(0);
sdblock2mem_dma_base_write((uint32_t) buf); sdblock2mem_dma_base_write((uint64_t) buf);
sdblock2mem_dma_length_write(512*count); sdblock2mem_dma_length_write(512*count);
sdblock2mem_dma_enable_write(1); sdblock2mem_dma_enable_write(1);
@ -594,7 +594,7 @@ void sdcard_write(uint32_t sector, uint32_t count, uint8_t* buf)
while (count--) { while (count--) {
/* Initialize DMA Reader */ /* Initialize DMA Reader */
sdmem2block_dma_enable_write(0); sdmem2block_dma_enable_write(0);
sdmem2block_dma_base_write((uint32_t) buf); sdmem2block_dma_base_write((uint64_t) buf);
sdmem2block_dma_length_write(512); sdmem2block_dma_length_write(512);
sdmem2block_dma_enable_write(1); sdmem2block_dma_enable_write(1);