mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/net: npcm7xx_emc fix missing queue_flush

Browse Source 
The rx_active boolean change to true should always trigger a try_read
call that flushes the queue.

Signed-off-by: Patrick Venture <venture@google.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20211203221002.1719306-1-venture@google.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Patrick Venture 2021-12-03 14:10:02 -08:00 committed by Peter Maydell
parent 52a9f60935
commit 530cd6c26d
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/net/npcm7xx_emc.c
View File

@ -284,6 +284,12 @@ static void emc_halt_rx(NPCM7xxEMCState *emc, uint32_t mista_flag)
emc_set_mista(emc, mista_flag); emc_set_mista(emc, mista_flag);
} }
static void emc_enable_rx_and_flush(NPCM7xxEMCState *emc)
{
emc->rx_active = true;
qemu_flush_queued_packets(qemu_get_queue(emc->nic));
}
static void emc_set_next_tx_descriptor(NPCM7xxEMCState *emc, static void emc_set_next_tx_descriptor(NPCM7xxEMCState *emc,
const NPCM7xxEMCTxDesc *tx_desc, const NPCM7xxEMCTxDesc *tx_desc,
uint32_t desc_addr) uint32_t desc_addr)
@ -581,13 +587,6 @@ static ssize_t emc_receive(NetClientState *nc, const uint8_t *buf, size_t len1)
return len; return len;
} }
static void emc_try_receive_next_packet(NPCM7xxEMCState *emc)
{
if (emc_can_receive(qemu_get_queue(emc->nic))) {
qemu_flush_queued_packets(qemu_get_queue(emc->nic));
}
}
static uint64_t npcm7xx_emc_read(void *opaque, hwaddr offset, unsigned size) static uint64_t npcm7xx_emc_read(void *opaque, hwaddr offset, unsigned size)
{ {
NPCM7xxEMCState *emc = opaque; NPCM7xxEMCState *emc = opaque;
@ -703,7 +702,7 @@ static void npcm7xx_emc_write(void *opaque, hwaddr offset,
emc->regs[REG_MGSTA] |= REG_MGSTA_RXHA; emc->regs[REG_MGSTA] |= REG_MGSTA_RXHA;
} }
if (value & REG_MCMDR_RXON) { if (value & REG_MCMDR_RXON) {
emc->rx_active = true; emc_enable_rx_and_flush(emc);
} else { } else {
emc_halt_rx(emc, 0); emc_halt_rx(emc, 0);
} }
@ -739,8 +738,7 @@ static void npcm7xx_emc_write(void *opaque, hwaddr offset,
break; break;
case REG_RSDR: case REG_RSDR:
if (emc->regs[REG_MCMDR] & REG_MCMDR_RXON) { if (emc->regs[REG_MCMDR] & REG_MCMDR_RXON) {
emc->rx_active = true; emc_enable_rx_and_flush(emc);
emc_try_receive_next_packet(emc);
} }
break; break;
case REG_MIIDA: case REG_MIIDA: