diff options
| author | Alistair Francis | 2016-06-27 16:37:32 +0200 |
|---|---|---|
| committer | Peter Maydell | 2016-06-27 16:37:32 +0200 |
| commit | cbdab58d469cc52de30f3d0998a15d32d2fac3a0 (patch) | |
| tree | a35c27f6e9ba22848fc51531189943b423e8e0bf | |
| parent | cadence_gem: Avoid infinite loops with a misconfigured buffer (diff) | |
| download | qemu-cbdab58d469cc52de30f3d0998a15d32d2fac3a0.tar.gz qemu-cbdab58d469cc52de30f3d0998a15d32d2fac3a0.tar.xz qemu-cbdab58d469cc52de30f3d0998a15d32d2fac3a0.zip | |
cadence_gem: Set the last bit when wrap is set
The Cadence GEM data sheet says:
"Wrap - marks last descriptor in transmit buffer descriptor list. This
can be set for any buffer within the frame."
which seems to imply that when the wrap bit is set so is the last bit.
Previously if the wrap bit is set, but the last is not then QEMU will
enter an infinite loop.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Reported-by: Li Qiang <liqiang6-s@360.cn>
Reported-by: P J P <ppandit@redhat.com>
Message-id: eb23f15c67989ea6a53609dc66568399dadf52a7.1466539342.git.alistair.francis@xilinx.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | hw/net/cadence_gem.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c index e5f3c985a4..8a4be1e667 100644 --- a/hw/net/cadence_gem.c +++ b/hw/net/cadence_gem.c @@ -274,6 +274,11 @@ static inline unsigned tx_desc_get_last(unsigned *desc) return (desc[1] & DESC_1_TX_LAST) ? 1 : 0; } +static inline void tx_desc_set_last(unsigned *desc) +{ + desc[1] |= DESC_1_TX_LAST; +} + static inline unsigned tx_desc_get_length(unsigned *desc) { return desc[1] & DESC_1_LENGTH; @@ -939,6 +944,7 @@ static void gem_transmit(CadenceGEMState *s) /* read next descriptor */ if (tx_desc_get_wrap(desc)) { + tx_desc_set_last(desc); packet_desc_addr = s->regs[GEM_TXQBASE]; } else { packet_desc_addr += 8; |