ab7fc8ee5b
- target/i386: Introduce SapphireRapids-v3 to add missing features - qtest/fuzz-lsi53c895a-test: set guest RAM to 2G - hw/net/lan9118: Signal TSFL_INT flag when TX FIFO reaches specified level - target/arm: Fix alignment for VLD4.32 - hw/microblaze: pass random seed to fdt - tests/qtest: npcm7xx-emc-test: Skip checking MAC - tests: mark io-command test as skipped if socat is missing - tests: unit: add NULL-pointer check - tests: test-qga: close socket on failure to connect - vdpa:block device capacity expansion online support vdpa block device update capacity. - virtio-net: Ensure queue index fits with RSS(CVE-2024-6505) - nbd/server: CVE-2024-7409: Avoid use-after-free when closing server - ppc/vof: Fix unaligned FDT property access - vvfat: Fix reading files with non-continuous clusters - vvfat: Fix bug in writing to middle of file - savevm: Fix load_snapshot error path crash - hw/dma/xilinx_axidma: Use semicolon at end of statement, not comma - hw/remote/message.c: Don't directly invoke DeviceClass:reset - crypto/tlscredspsk: Free username on finalize - hw/display/vhost-user-gpu.c: fix vhost_user_gpu_chr_read() - virtio: remove virtio_tswap16s() call in vring_packed_event_read() - char-stdio: Restore blocking mode of stdout on exit - hw/ppc: spapr: Use qemu_vfree() to free spapr->htab - smbios: sanitize type from external type before checking have_fields_bitmap - spapr_pci: fix leak in spapr_phb_vfio_get_loc_code - KVM: use store-release to mark dirty pages as harvested - monitor/hmp: print trace as option in help for log command - tpm_crb: Avoid backend startup just before shutdown under Xen - crypto/block-luks: make range overlap check more readable - spapr: Free stdout path - target/rx: Use target_ulong for address in LI - virtio-pci: Fix the use of an uninitialized irqfd - rtl8139: Fix behaviour for old kernels. - virtio-rng: block max-bytes=0 MIME-Version: 1.0 - hw/audio/es1370: Clean up comment - vhost-user-server: do not set memory fd non-blocking - ui: reject extended clipboard message if not activated - virtio-net: Fix vhost virtqueue notifiers for RSS - hw/misc/applesmc: Fix memory leak in reset() handler Signed-off-by: Jiabo Feng <fengjiabo1@huawei.com> (cherry picked from commit db7a5d9a7239db307c8c1454fab5f8a92fd486b8)
50 lines
1.8 KiB
Diff
50 lines
1.8 KiB
Diff
From 8b72b72180276e4f0af962e60fead6bdbe0e0577 Mon Sep 17 00:00:00 2001
|
|
From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
Date: Tue, 10 Sep 2024 11:42:12 +0000
|
|
Subject: [PATCH] hw/net/lan9118: Signal TSFL_INT flag when TX FIFO reaches
|
|
specified level mainline inclusion commit
|
|
895a803ce91704f28c9b49621a4f589273289f1e category: bugfix
|
|
|
|
---------------------------------------------------------------
|
|
|
|
The LAN9118 allows the guest to specify a level for both the TX and
|
|
RX FIFOs at which an interrupt will be generated. We implement the
|
|
RSFL_INT interrupt for the RX FIFO but are missing the handling of
|
|
the equivalent TSFL_INT for the TX FIFO. Add the missing test to set
|
|
the interrupt if the TX FIFO has exceeded the guest-specified level.
|
|
|
|
This flag is required for Micrium lan911x ethernet driver to work.
|
|
|
|
Signed-off-by: Lucas Dietrich <ld.adecy@gmail.com>
|
|
[PMM: Tweaked commit message and comment]
|
|
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
|
|
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
|
|
|
Signed-off-by: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
|
|
---
|
|
hw/net/lan9118.c | 8 ++++++++
|
|
1 file changed, 8 insertions(+)
|
|
|
|
diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
|
|
index fa43758105..9897296c21 100644
|
|
--- a/hw/net/lan9118.c
|
|
+++ b/hw/net/lan9118.c
|
|
@@ -702,6 +702,14 @@ static void do_tx_packet(lan9118_state *s)
|
|
n = (s->tx_status_fifo_head + s->tx_status_fifo_used) & 511;
|
|
s->tx_status_fifo[n] = status;
|
|
s->tx_status_fifo_used++;
|
|
+
|
|
+ /*
|
|
+ * Generate TSFL interrupt if TX FIFO level exceeds the level
|
|
+ * specified in the FIFO_INT TX Status Level field.
|
|
+ */
|
|
+ if (s->tx_status_fifo_used > ((s->fifo_int >> 16) & 0xff)) {
|
|
+ s->int_sts |= TSFL_INT;
|
|
+ }
|
|
if (s->tx_status_fifo_used == 512) {
|
|
s->int_sts |= TSFF_INT;
|
|
/* TODO: Stop transmission. */
|
|
--
|
|
2.41.0.windows.1
|
|
|