All of lore.kernel.org
 help / color / mirror / Atom feed
From: Michael Tokarev <mjt@tls.msk.ru>
To: qemu-devel@nongnu.org
Cc: qemu-stable@nongnu.org,
	"Philippe Mathieu-Daudé" <philmd@linaro.org>,
	"Peter Maydell" <peter.maydell@linaro.org>,
	"Michael Tokarev" <mjt@tls.msk.ru>
Subject: [Stable-8.2.3 106/116] hw/net/lan9118: Replace magic '2048' value by MIL_TXFIFO_SIZE definition
Date: Thu, 18 Apr 2024 20:49:36 +0300	[thread overview]
Message-ID: <20240418174955.947730-19-mjt@tls.msk.ru> (raw)
In-Reply-To: <qemu-stable-8.2.3-20240418204921@cover.tls.msk.ru>

From: Philippe Mathieu-Daudé <philmd@linaro.org>

The magic 2048 is explained in the LAN9211 datasheet (DS00002414A)
in chapter 1.4, "10/100 Ethernet MAC":

  The MAC Interface Layer (MIL), within the MAC, contains a
  2K Byte transmit and a 128 Byte receive FIFO which is separate
  from the TX and RX FIFOs. [...]

Note, the use of the constant in lan9118_receive() reveals that
our implementation is using the same buffer for both tx and rx.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20240409133801.23503-2-philmd@linaro.org>
(cherry picked from commit a45223467e4e185fff1c76a6483784fa379ded77)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>

diff --git a/hw/net/lan9118.c b/hw/net/lan9118.c
index cf7b8c897a..f0a8a3fa10 100644
--- a/hw/net/lan9118.c
+++ b/hw/net/lan9118.c
@@ -150,6 +150,12 @@ do { printf("lan9118: " fmt , ## __VA_ARGS__); } while (0)
 
 #define GPT_TIMER_EN    0x20000000
 
+/*
+ * The MAC Interface Layer (MIL), within the MAC, contains a 2K Byte transmit
+ * and a 128 Byte receive FIFO which is separate from the TX and RX FIFOs.
+ */
+#define MIL_TXFIFO_SIZE         2048
+
 enum tx_state {
     TX_IDLE,
     TX_B,
@@ -166,7 +172,7 @@ typedef struct {
     int32_t pad;
     int32_t fifo_used;
     int32_t len;
-    uint8_t data[2048];
+    uint8_t data[MIL_TXFIFO_SIZE];
 } LAN9118Packet;
 
 static const VMStateDescription vmstate_lan9118_packet = {
@@ -182,7 +188,7 @@ static const VMStateDescription vmstate_lan9118_packet = {
         VMSTATE_INT32(pad, LAN9118Packet),
         VMSTATE_INT32(fifo_used, LAN9118Packet),
         VMSTATE_INT32(len, LAN9118Packet),
-        VMSTATE_UINT8_ARRAY(data, LAN9118Packet, 2048),
+        VMSTATE_UINT8_ARRAY(data, LAN9118Packet, MIL_TXFIFO_SIZE),
         VMSTATE_END_OF_LIST()
     }
 };
@@ -544,7 +550,7 @@ static ssize_t lan9118_receive(NetClientState *nc, const uint8_t *buf,
         return -1;
     }
 
-    if (size >= 2048 || size < 14) {
+    if (size >= MIL_TXFIFO_SIZE || size < 14) {
         return -1;
     }
 
-- 
2.39.2



  parent reply	other threads:[~2024-04-18 17:54 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-18 17:49 [Stable-8.2.3 v2 000/116] Patch Round-up for stable 8.2.3, freeze on 2024-04-20 Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 088/116] tcg/optimize: Do not attempt to constant fold neg_vec Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 089/116] linux-user: Fix waitid return of siginfo_t and rusage Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 090/116] target/sh4: mac.w: memory accesses are 16-bit words Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 091/116] target/sh4: Merge mach and macl into a union Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 092/116] target/sh4: Fix mac.l with saturation enabled Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 093/116] target/sh4: Fix mac.w " Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 094/116] target/sh4: add missing CHECK_NOT_DELAY_SLOT Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 095/116] target/m68k: Map FPU exceptions to FPSR register Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 096/116] hw/virtio: Introduce virtio_bh_new_guarded() helper Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 097/116] hw/display/virtio-gpu: Protect from DMA re-entrancy bugs Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 098/116] hw/char/virtio-serial-bus: " Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 099/116] hw/virtio/virtio-crypto: " Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 100/116] qemu-options: Fix CXL Fixed Memory Window interleave-granularity typo Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 101/116] hw/block/nand: Factor nand_load_iolen() method out Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 102/116] hw/block/nand: Have blk_load() take unsigned offset and return boolean Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 103/116] hw/block/nand: Fix out-of-bound access in NAND block buffer Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 104/116] hw/misc/applesmc: Fix memory leak in reset() handler Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 105/116] backends/cryptodev: Do not abort for invalid session ID Michael Tokarev
2024-04-18 17:49 ` Michael Tokarev [this message]
2024-04-18 17:49 ` [Stable-8.2.3 107/116] hw/net/lan9118: Fix overflow in MIL TX FIFO Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 108/116] hw/sd/sdhci: Do not update TRNMOD when Command Inhibit (DAT) is set Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 109/116] hw/net/net_tx_pkt: Fix overrun in update_sctp_checksum() Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 110/116] hw/audio/virtio-snd: Remove unused assignment Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 111/116] linux-user/x86_64: Handle the vsyscall page in open_self_maps_{2, 4} Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 112/116] virtio-pci: fix use of a released vector Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 113/116] hw/isa/vt82c686: Keep track of PIRQ/PINT pins separately Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 114/116] hw/pci-host/ppc440_pcix: Do not expose a bridge device on PCI bus Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 115/116] ppc/spapr: Introduce SPAPR_IRQ_NR_IPIS to refer IRQ range for CPU IPIs Michael Tokarev
2024-04-18 17:49 ` [Stable-8.2.3 116/116] ppc/spapr: Initialize max_cpus limit to SPAPR_IRQ_NR_IPIS Michael Tokarev

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240418174955.947730-19-mjt@tls.msk.ru \
    --to=mjt@tls.msk.ru \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-stable@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.