david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reducing stack frame size in stream_process_mem2s()

Browse Source 
This patch allocates memory for txbuf in struct Stream rather than the stack.
As a result, the stack frame size is reduced of stream_process_mem2s().

Signed-off-by: Rutuja Shah <rutu.shah.26@gmail.com>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Rutuja Shah 2016-10-17 19:22:16 +01:00 committed by Peter Maydell
parent bcf48274ba
commit cabbcca037
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/dma/xilinx_axidma.c
View File

@ -111,6 +111,7 @@ struct Stream {
unsigned int complete_cnt; unsigned int complete_cnt;
uint32_t regs[R_MAX]; uint32_t regs[R_MAX];
uint8_t app[20]; uint8_t app[20];
unsigned char txbuf[16 * 1024];
}; };
struct XilinxAXIDMAStreamSlave { struct XilinxAXIDMAStreamSlave {
@ -256,7 +257,6 @@ static void stream_process_mem2s(struct Stream *s, StreamSlave *tx_data_dev,
StreamSlave *tx_control_dev) StreamSlave *tx_control_dev)
{ {
uint32_t prev_d; uint32_t prev_d;
unsigned char txbuf[16 * 1024];
unsigned int txlen; unsigned int txlen;
if (!stream_running(s) || stream_idle(s)) { if (!stream_running(s) || stream_idle(s)) {
@ -277,17 +277,17 @@ static void stream_process_mem2s(struct Stream *s, StreamSlave *tx_data_dev,
} }
txlen = s->desc.control & SDESC_CTRL_LEN_MASK; txlen = s->desc.control & SDESC_CTRL_LEN_MASK;
if ((txlen + s->pos) > sizeof txbuf) { if ((txlen + s->pos) > sizeof s->txbuf) {
hw_error("%s: too small internal txbuf! %d\n", __func__, hw_error("%s: too small internal txbuf! %d\n", __func__,
txlen + s->pos); txlen + s->pos);
} }
cpu_physical_memory_read(s->desc.buffer_address, cpu_physical_memory_read(s->desc.buffer_address,
txbuf + s->pos, txlen); s->txbuf + s->pos, txlen);
s->pos += txlen; s->pos += txlen;
if (stream_desc_eof(&s->desc)) { if (stream_desc_eof(&s->desc)) {
stream_push(tx_data_dev, txbuf, s->pos); stream_push(tx_data_dev, s->txbuf, s->pos);
s->pos = 0; s->pos = 0;
stream_complete(s); stream_complete(s);
} }