OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

xilinx_spips: Make dma transactions as per dma_burst_size

Browse Source 
Qspi dma has a burst length of 64 bytes, So limit the transactions w.r.t
dma-burst-size property.

Signed-off-by: Sai Pavan Boddu <saipava@xilinx.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 1529660880-30376-1-git-send-email-sai.pavan.boddu@xilinx.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Sai Pavan Boddu 2018-06-26 17:50:39 +01:00 committed by Peter Maydell
parent 1f7161d2c8
commit 21d887cde9
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/ssi/xilinx_spips.c
View File

@ -851,12 +851,17 @@ static void xlnx_zynqmp_qspips_notify(void *opaque)
{ {
size_t ret; size_t ret;
uint32_t num; uint32_t num;
const void *rxd = pop_buf(recv_fifo, 4, &num); const void *rxd;
int len;
len = recv_fifo->num >= rq->dma_burst_size ? rq->dma_burst_size :
recv_fifo->num;
rxd = pop_buf(recv_fifo, len, &num);
memcpy(rq->dma_buf, rxd, num); memcpy(rq->dma_buf, rxd, num);
ret = stream_push(rq->dma, rq->dma_buf, 4); ret = stream_push(rq->dma, rq->dma_buf, num);
assert(ret == 4); assert(ret == num);
xlnx_zynqmp_qspips_check_flush(rq); xlnx_zynqmp_qspips_check_flush(rq);
} }
} }
@ -1333,6 +1338,12 @@ static void xlnx_zynqmp_qspips_realize(DeviceState *dev, Error **errp)
XlnxZynqMPQSPIPS *s = XLNX_ZYNQMP_QSPIPS(dev); XlnxZynqMPQSPIPS *s = XLNX_ZYNQMP_QSPIPS(dev);
XilinxSPIPSClass *xsc = XILINX_SPIPS_GET_CLASS(s); XilinxSPIPSClass *xsc = XILINX_SPIPS_GET_CLASS(s);
if (s->dma_burst_size > QSPI_DMA_MAX_BURST_SIZE) {
error_setg(errp,
"qspi dma burst size %u exceeds maximum limit %d",
s->dma_burst_size, QSPI_DMA_MAX_BURST_SIZE);
return;
}
xilinx_qspips_realize(dev, errp); xilinx_qspips_realize(dev, errp);
fifo8_create(&s->rx_fifo_g, xsc->rx_fifo_size); fifo8_create(&s->rx_fifo_g, xsc->rx_fifo_size);
fifo8_create(&s->tx_fifo_g, xsc->tx_fifo_size); fifo8_create(&s->tx_fifo_g, xsc->tx_fifo_size);
@ -1411,6 +1422,11 @@ static const VMStateDescription vmstate_xlnx_zynqmp_qspips = {
} }
}; };
static Property xilinx_zynqmp_qspips_properties[] = {
DEFINE_PROP_UINT32("dma-burst-size", XlnxZynqMPQSPIPS, dma_burst_size, 64),
DEFINE_PROP_END_OF_LIST(),
};
static Property xilinx_qspips_properties[] = { static Property xilinx_qspips_properties[] = {
/* We had to turn this off for 2.10 as it is not compatible with migration. /* We had to turn this off for 2.10 as it is not compatible with migration.
* It can be enabled but will prevent the device to be migrated. * It can be enabled but will prevent the device to be migrated.
@ -1463,6 +1479,7 @@ static void xlnx_zynqmp_qspips_class_init(ObjectClass *klass, void * data)
dc->realize = xlnx_zynqmp_qspips_realize; dc->realize = xlnx_zynqmp_qspips_realize;
dc->reset = xlnx_zynqmp_qspips_reset; dc->reset = xlnx_zynqmp_qspips_reset;
dc->vmsd = &vmstate_xlnx_zynqmp_qspips; dc->vmsd = &vmstate_xlnx_zynqmp_qspips;
dc->props = xilinx_zynqmp_qspips_properties;
xsc->reg_ops = &xlnx_zynqmp_qspips_ops; xsc->reg_ops = &xlnx_zynqmp_qspips_ops;
xsc->rx_fifo_size = RXFF_A_Q; xsc->rx_fifo_size = RXFF_A_Q;
xsc->tx_fifo_size = TXFF_A_Q; xsc->tx_fifo_size = TXFF_A_Q;

5
include/hw/ssi/xilinx_spips.h
View File

@ -37,6 +37,8 @@ typedef struct XilinxSPIPS XilinxSPIPS;
/* Bite off 4k chunks at a time */ /* Bite off 4k chunks at a time */
#define LQSPI_CACHE_SIZE 1024 #define LQSPI_CACHE_SIZE 1024
#define QSPI_DMA_MAX_BURST_SIZE 2048
typedef enum { typedef enum {
READ = 0x3, READ_4 = 0x13, READ = 0x3, READ_4 = 0x13,
FAST_READ = 0xb, FAST_READ_4 = 0x0c, FAST_READ = 0xb, FAST_READ_4 = 0x0c,
@ -95,7 +97,6 @@ typedef struct {
XilinxQSPIPS parent_obj; XilinxQSPIPS parent_obj;
StreamSlave *dma; StreamSlave *dma;
uint8_t dma_buf[4];
int gqspi_irqline; int gqspi_irqline;
uint32_t regs[XLNX_ZYNQMP_SPIPS_R_MAX]; uint32_t regs[XLNX_ZYNQMP_SPIPS_R_MAX];
@ -113,6 +114,8 @@ typedef struct {
uint8_t rx_fifo_g_align; uint8_t rx_fifo_g_align;
uint8_t tx_fifo_g_align; uint8_t tx_fifo_g_align;
bool man_start_com_g; bool man_start_com_g;
uint32_t dma_burst_size;
uint8_t dma_buf[QSPI_DMA_MAX_BURST_SIZE];
} XlnxZynqMPQSPIPS; } XlnxZynqMPQSPIPS;
typedef struct XilinxSPIPSClass { typedef struct XilinxSPIPSClass {