Skip to content

Commit

Permalink
litepcie/frontend/dma: group loop index and count in loop_status regi…
Browse files Browse the repository at this point in the history
…ster (avoid 2 register reads)
enjoy-digital committed Jul 24, 2015
1 parent d73d750 commit 0a115f6
Showing 3 changed files with 14 additions and 13 deletions.
20 changes: 9 additions & 11 deletions misoclib/com/litepcie/frontend/dma/common.py
Original file line number Diff line number Diff line change
@@ -28,11 +28,9 @@ def __init__(self, depth):
self._value = CSRStorage(aw+lw)
self._we = CSR()
self._loop_prog_n = CSRStorage()
self._index = CSRStatus(log2_int(depth))
self._loop_status = CSRStatus(32)
self._level = CSRStatus(log2_int(depth))
self._loop = CSRStatus(16)
self._flush = CSR()

self.irq = Signal()

# # #
@@ -41,8 +39,8 @@ def __init__(self, depth):
value = self._value.storage
we = self._we.r & self._we.re
loop_prog_n = self._loop_prog_n.storage
index = self._index.status
loop = self._loop.status
loop_index = self._loop_status.status[:log2_int(depth)]
loop_count = self._loop_status.status[16:]
level = self._level.status
flush = self._flush.r & self._flush.re

@@ -83,19 +81,19 @@ def __init__(self, depth):
source.length.eq(fifo.dout.length)
]

# index
# loop_index, loop_count
# used by the software for synchronization in
# "loop" mode
self.sync += \
If(flush,
index.eq(0),
loop.eq(0),
loop_index.eq(0),
loop_count.eq(0),
).Elif(source.stb & source.ack,
If(fifo.dout.start,
index.eq(0),
loop.eq(loop+1)
loop_index.eq(0),
loop_count.eq(loop_count+1)
).Else(
index.eq(index+1)
loop_index.eq(loop_index+1)
)
)

3 changes: 3 additions & 0 deletions misoclib/com/litepcie/software/linux/kernel/flags.h
Original file line number Diff line number Diff line change
@@ -4,4 +4,7 @@
/* dma */
#define DMA_LOOPBACK_ENABLE 0x1

#define DMA_TABLE_LOOP_INDEX 1 << 0
#define DMA_TABLE_LOOP_COUNT 1 << 16

#endif /* __HW_FLAGS_H */
4 changes: 2 additions & 2 deletions misoclib/com/litepcie/software/linux/kernel/main.c
Original file line number Diff line number Diff line change
@@ -268,12 +268,12 @@ static int litepcie_dma_wait(LitePCIeState *s, struct litepcie_ioctl_dma_wait *m
for (;;) {
/* set current buffer */
if (s->tx_dma_started) {
m->tx_buf_num = litepcie_readl(s, CSR_DMA_READER_TABLE_INDEX_ADDR);
m->tx_buf_num = (litepcie_readl(s, CSR_DMA_READER_TABLE_LOOP_STATUS_ADDR) & 0xffff);
} else {
m->tx_buf_num = 0;
}
if (s->rx_dma_started) {
m->rx_buf_num = litepcie_readl(s, CSR_DMA_WRITER_TABLE_INDEX_ADDR);
m->rx_buf_num = (litepcie_readl(s, CSR_DMA_WRITER_TABLE_LOOP_STATUS_ADDR) & 0xfffff);
} else {
m->rx_buf_num = 0;
}

0 comments on commit 0a115f6

Please sign in to comment.