39a0a891d8
- vdpa: move memory listener to the realize stage - vdpa: implement vdpa device migration - vhost: implement post resume bh - vhost: implement migration state notifier for vdpa device - vhost: implement savevm_hanlder for vdpa device - vhost: implement vhost_vdpa_device_suspend/resume - vhost: implement vhost-vdpa suspend/resume - vhost: add vhost_dev_suspend/resume_op - vhost: introduce bytemap for vhost backend logging - vhost-vdpa: add migration log ops for VhostOps - vhost-vdpa: add VHOST_BACKEND_F_BYTEMAPLOG - vhost: fix null pointer access - ui/gtk: prevent ui lock up when dpy_gl_update called again before current draw event occurs - hw/usb: dev-mtp: Use g_mkdir() - target/ppc/cpu-models: Remove the "default" CPU alias - hw/intc/arm_gicv3: ICC_PMR_EL1 high bits should be RAZ - Fixed a QEMU hang when guest poweroff in COLO mode - migration/colo: More accurate update checkpoint time - scripts/entitlement.sh: Use backward-compatible cp flags - block/nvme: fix infinite loop in nvme_free_req_queue_cb() - hw/net: npcm7xx_emc fix missing queue_flush - Add dummy Aspeed AST2600 Display Port MCU (DPMCU) - hw/arm: ast2600: Fix address mapping of second SPI controller - vhost-user-blk: reconnect on any error during realize - vhost-user-blk: propagate error return from generic vhost - hw/riscv: boot: Reduce FDT address alignment constraints - Revert "hw/virtio/virtio-iommu-pci: Enforce the device is plugged on the root bus" - Fix STM32F2XX USART data register readout - block: use 'unsigned' for in_flight field on driver state - sphinx: change default language to 'en' - tests/qtest: Fix two format strings - trivial typos: namesapce - hw/ide/atapi.c: Correct typos (CD-CDROM -> CD-ROM) - hw/virtio/virtio-iommu-pci: Enforce the device is plugged on the root bus - hw/display/next-fb: Fix comment typo - xen/pass-through: merge emulated bits correctly mainline inclusion commit be9c61da9fc57eb7d293f380d0805ca6f46c2657 category: bugfix - tests/qtest/migration-test.c: spelling fix: bandwith - target/i386/cpu: Improve error message for property "vendor" - balloon: Fix a misleading error message - target/arm: Don't set syndrome ISS for loads and stores with writeback mainline inclusion commit 53ae2fdef1f5661cbaa2ea571c517f98e6041cb8 category: bugfix - disas/hppa: Show hexcode of instruction along with disassembly - tcg/loongarch64: Fix tcg_out_mov() Aborted - ui/qmp-cmds: Improve two error messages - qga: Improve guest-exec-status error message - hmp: Improve sync-profile error message - spapr/pci: Correct "does not support hotplugging error messages - xen/pass-through: don't create needless register group mainline inclusion commit c0e86b7624cb9d6db03e0d48cf82659e5b89a6a6 category: bugfix Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com>
76 lines
2.5 KiB
Diff
76 lines
2.5 KiB
Diff
From cf11e02156e202db1be5e9c85b67d5dfaa56ce48 Mon Sep 17 00:00:00 2001
|
|
From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
|
Date: Mon, 4 Dec 2023 10:28:53 +0800
|
|
Subject: [PATCH] hw/net: npcm7xx_emc fix missing queue_flush
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
cherry picked from commit 530cd6c26df47c4f294c6335c9829e6c968fe7a8
|
|
|
|
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>
|
|
Signed-off-by: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/net/npcm7xx_emc.c | 18 ++++++++----------
|
|
1 file changed, 8 insertions(+), 10 deletions(-)
|
|
|
|
diff --git a/hw/net/npcm7xx_emc.c b/hw/net/npcm7xx_emc.c
|
|
index df2efe1bf8..9a2328935c 100644
|
|
--- a/hw/net/npcm7xx_emc.c
|
|
+++ b/hw/net/npcm7xx_emc.c
|
|
@@ -286,6 +286,12 @@ static void emc_halt_rx(NPCM7xxEMCState *emc, uint32_t 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,
|
|
const NPCM7xxEMCTxDesc *tx_desc,
|
|
uint32_t desc_addr)
|
|
@@ -585,13 +591,6 @@ static ssize_t emc_receive(NetClientState *nc, const uint8_t *buf, size_t len1)
|
|
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)
|
|
{
|
|
NPCM7xxEMCState *emc = opaque;
|
|
@@ -707,7 +706,7 @@ static void npcm7xx_emc_write(void *opaque, hwaddr offset,
|
|
emc->regs[REG_MGSTA] |= REG_MGSTA_RXHA;
|
|
}
|
|
if (value & REG_MCMDR_RXON) {
|
|
- emc->rx_active = true;
|
|
+ emc_enable_rx_and_flush(emc);
|
|
} else {
|
|
emc_halt_rx(emc, 0);
|
|
}
|
|
@@ -743,8 +742,7 @@ static void npcm7xx_emc_write(void *opaque, hwaddr offset,
|
|
break;
|
|
case REG_RSDR:
|
|
if (emc->regs[REG_MCMDR] & REG_MCMDR_RXON) {
|
|
- emc->rx_active = true;
|
|
- emc_try_receive_next_packet(emc);
|
|
+ emc_enable_rx_and_flush(emc);
|
|
}
|
|
break;
|
|
case REG_MIIDA:
|
|
--
|
|
2.27.0
|
|
|